Skip to content

Commit 014406e

Browse files
authored
Merge pull request #232885 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 35d7d49 + 5bd84fa commit 014406e

13 files changed

+83
-52
lines changed

articles/active-directory/develop/registration-config-change-token-lifetime-how-to.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This article shows how to use Azure AD PowerShell to set an access token lifetim
2626
To set an access token lifetime policy, download the [Azure AD PowerShell Module](https://www.powershellgallery.com/packages/AzureADPreview).
2727
Run the **Connect-AzureAD -Confirm** command.
2828

29-
Here’s an example policy that requires users to authenticate more frequently in your web app. This policy sets the lifetime of the access to the service principal of your web app. Create the policy and assign it to your service principal. You also need to get the ObjectId of your service principal.
29+
Here’s an example policy that requires users to authenticate less frequently in your web app. This policy sets the lifetime of the access to the service principal of your web app. Create the policy and assign it to your service principal. You also need to get the ObjectId of your service principal.
3030

3131
```powershell
3232
$policy = New-AzureADPolicy -Definition @('{"TokenLifetimePolicy":{"Version":1,"AccessTokenLifetime":"02:00:00"}}') -DisplayName "WebPolicyScenario" -IsOrganizationDefault $false -Type "TokenLifetimePolicy"

articles/active-directory/governance/customize-workflow-email.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ Emails sent out using Lifecycle workflows can be customized to have your own com
9494
- A verified domain. To add a custom domain, see: [Managing custom domain names in your Azure Active Directory](../enterprise-users/domains-manage.md)
9595
- Custom Branding set within Azure AD if you want to have your custom branding used in emails. To set organizational branding within your Azure tenant, see: [Configure your company branding (preview)](../fundamentals/how-to-customize-branding.md).
9696

97+
> [!NOTE]
98+
> The recommendation is to use a domain that has the appropriate DNS records to facilitate email validation, like SPF, DKIM, DMARC, and MX as this then complies with the [RFC compliance](https://www.ietf.org/rfc/rfc2142.txt) for sending and receiving email. Please see [Learn more about Exchange Online Email Routing](/exchange/mail-flow-best-practices/mail-flow-best-practices) for more information.
99+
97100
After these prerequisites are satisfied, you'd follow these steps:
98101

99102
1. On the Lifecycle workflows page, select **Workflow settings (Preview)**.

articles/aks/configure-kubenet.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,16 @@ az aks create \
147147
--docker-bridge-address 172.17.0.1/16 \
148148
--vnet-subnet-id $SUBNET_ID
149149
```
150-
* The *--service-cidr* is optional. This address is used to assign internal services in the AKS cluster an IP address. This IP address range should be an address space that isn't in use elsewhere in your network environment, including any on-premises network ranges if you connect, or plan to connect, your Azure virtual networks using Express Route or a Site-to-Site VPN connection.
150+
* The *--service-cidr* is optional. This address is used to assign internal services in the AKS cluster an IP address. This IP address range should be an address space that isn't in use elsewhere in your network environment, including any on-premises network ranges if you connect, or plan to connect, your Azure virtual networks using Express Route or a Site-to-Site VPN connection. The default value is 10.0.0.0/16.
151151

152-
* The *--dns-service-ip* is optional. The address should be the *.10* address of your service IP address range.
152+
* The *--dns-service-ip* is optional. The address should be the *.10* address of your service IP address range. The default value is 10.0.0.10.
153153

154-
* The *--pod-cidr* is optional. This address should be a large address space that isn't in use elsewhere in your network environment. This range includes any on-premises network ranges if you connect, or plan to connect, your Azure virtual networks using Express Route or a Site-to-Site VPN connection.
154+
* The *--pod-cidr* is optional. This address should be a large address space that isn't in use elsewhere in your network environment. This range includes any on-premises network ranges if you connect, or plan to connect, your Azure virtual networks using Express Route or a Site-to-Site VPN connection. The default value is 10.244.0.0/16.
155155
* This address range must be large enough to accommodate the number of nodes that you expect to scale up to. You can't change this address range once the cluster is deployed if you need more addresses for additional nodes.
156156
* The pod IP address range is used to assign a */24* address space to each node in the cluster. In the following example, the *--pod-cidr* of *10.244.0.0/16* assigns the first node *10.244.0.0/24*, the second node *10.244.1.0/24*, and the third node *10.244.2.0/24*.
157157
* As the cluster scales or upgrades, the Azure platform continues to assign a pod IP address range to each new node.
158158

159-
* The *--docker-bridge-address* is optional. The address lets the AKS nodes communicate with the underlying management platform. This IP address must not be within the virtual network IP address range of your cluster, and shouldn't overlap with other address ranges in use on your network.
159+
* The *--docker-bridge-address* is optional. The address lets the AKS nodes communicate with the underlying management platform. This IP address must not be within the virtual network IP address range of your cluster, and shouldn't overlap with other address ranges in use on your network. The default value is 172.17.0.1/16.
160160

161161
> [!Note]
162162
> If you wish to enable an AKS cluster to include a [Calico network policy][calico-network-policies] you can use the following command.
@@ -254,7 +254,6 @@ az aks create \
254254
--node-count 3 \
255255
--network-plugin kubenet \
256256
--vnet-subnet-id $SUBNET_ID \
257-
--enable-managed-identity \
258257
--assign-identity <identity-resource-id>
259258
```
260259

articles/aks/use-wasi-node-pools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ spec:
169169
runtimeClassName: wasmtime-slight-v1
170170
containers:
171171
- name: hello-slight
172-
image: ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:latest
172+
image: ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:v0.3.3
173173
command: ["/"]
174174
resources:
175175
requests:

articles/azure-maps/drawing-requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ Below is the manifest file for the sample drawing package. Go to the [Sample dra
421421

422422
You can convert uploaded drawing packages into map data by using the Azure Maps [Conversion service]. This article describes the drawing package requirements for the Conversion API. To view a sample package, you can download the [sample drawing package v2].
423423

424-
For a guide on how to prepare your drawing package, see [Conversion Drawing Package Guide].
424+
For a guide on how to prepare your drawing package, see [Drawing Package Guide].
425425

426426
## Changes and Revisions
427427

@@ -667,7 +667,7 @@ The JSON in this example shows the manifest file for the sample drawing package.
667667

668668
## Next steps
669669

670-
For a guide on how to prepare your drawing package, see [Conversion Drawing Package Guide].
670+
For a guide on how to prepare your drawing package, see the drawing package guide.
671671

672672
> [!div class="nextstepaction"]
673673
> [Drawing Package Guide]

articles/azure-maps/migrate-from-bing-maps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ Learn the details of how to migrate your Bing Maps application with these articl
169169
[Choose the right pricing tier in Azure Maps]: choose-pricing-tier.md
170170
[azure.com]: https://azure.com
171171
[Azure Active Directory authentication]: azure-maps-authentication.md#azure-ad-authentication
172-
[Azure Maps Q&A]: /answers/topics/azure-maps.html
172+
[Azure Maps Q&A]: /answers/topics/azure-maps.html
173173
[Azure support options]: https://azure.microsoft.com/support/options/
174174
[Azure Maps product page]: https://azure.com/maps
175175
[Azure Maps product documentation]: https://aka.ms/AzureMapsDocs
176176
[Azure Maps code samples]: https://aka.ms/AzureMapsSamples
177177
[Azure Maps developer forums]: https://aka.ms/AzureMapsForums
178178
[Microsoft learning center shows]: https://aka.ms/AzureMapsVideos
179-
[Azure Maps Blog]: https://aka.ms/AzureMapsBlog
179+
[Azure Maps Blog]: https://aka.ms/AzureMapsTechBlog
180180
[Azure Maps Feedback (UserVoice)]: https://aka.ms/AzureMapsFeedback

articles/azure-maps/migrate-from-google-maps.md

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.custom:
1212

1313
# Tutorial: Migrate from Google Maps to Azure Maps
1414

15-
This article provides insights on how to migrate web, mobile and server-based applications from Google Maps to the Microsoft Azure Maps platform. This tutorial includes comparative code samples, migration suggestions, and best practices for migrating to Azure Maps. In this tutorial, you'll learn:
15+
This article provides insights on how to migrate web, mobile and server-based applications from Google Maps to the Microsoft Azure Maps platform. This tutorial includes comparative code samples, migration suggestions, and best practices for migrating to Azure Maps. This tutorial demonstrates:
1616

1717
> [!div class="checklist"]
1818
> * High-level comparison for equivalent Google Maps features available in Azure Maps.
@@ -28,15 +28,15 @@ If you don't have an Azure subscription, create a [free account] before you begi
2828
* A [subscription key]
2929

3030
> [!NOTE]
31-
> For more information on authentication in Azure Maps, see [manage authentication in Azure Maps].
31+
> For more information on authentication in Azure Maps, see [Manage authentication in Azure Maps].
3232
3333
## Azure Maps platform overview
3434

3535
Azure Maps provides developers from all industries powerful geospatial capabilities. The capabilities are packed with regularly updated map data to provide geographic context for web, and mobile applications. Azure Maps has an Azure One API compliant set of REST APIs. The REST APIs offer Maps Rendering, Search, Routing, Traffic, Time Zones, Geolocation, Geofencing, Map Data, Weather, and Spatial Operations. Operations are accompanied by both Web and Android SDKs to make development easy, flexible, and portable across multiple platforms.
3636

3737
## High-level platform comparison
3838

39-
The table provides a high-level list of Azure Maps features, which correspond to Google Maps features. This list doesn't show all Azure Maps features. Additional Azure Maps features include: accessibility, geofencing, isochrones, spatial operations, direct map tile access, batch services, and data coverage comparisons (that is, imagery coverage).
39+
The table provides a high-level list of Azure Maps features, which correspond to Google Maps features. This list doesn't show all Azure Maps features. Other Azure Maps features include: accessibility, geofencing, isochrones, spatial operations, direct map tile access, batch services, and data coverage comparisons (that is, imagery coverage).
4040

4141
| Google Maps feature | Azure Maps support |
4242
|-----------------------------|:--------------------------------------:|
@@ -62,7 +62,7 @@ The table provides a high-level list of Azure Maps features, which correspond to
6262
| Maps Embedded API | N/A |
6363
| Map URLs | N/A |
6464

65-
<sup>1</sup> Azure Maps [Elevation services](/rest/api/maps/elevation) have been [deprecated](https://azure.microsoft.com/updates/azure-maps-elevation-apis-and-render-v2-dem-tiles-will-be-retired-on-5-may-2023). For more information how to include this functionality in your Azure Maps, see [Create elevation data & services](elevation-data-services.md).
65+
<sup>1</sup> Azure Maps [Elevation services] have been [deprecated]. For more information how to include this functionality in your Azure Maps, see [Create elevation data & services].
6666

6767
Google Maps provides basic key-based authentication. Azure Maps provides both basic key-based authentication and Azure Active Directory authentication. Azure Active Directory authentication provides more security features, compared to the basic key-based authentication.
6868

@@ -72,23 +72,22 @@ When migrating to Azure Maps from Google Maps, consider the following points abo
7272

7373
* Azure Maps charges for the usage of interactive maps, which is based on the number of loaded map tiles. On the other hand, Google Maps charges for loading the map control. In the interactive Azure Maps SDKs, map tiles are automatically cached to reduce the development cost. One Azure Maps transaction is generated for every 15 map tiles that are loaded. The interactive Azure Maps SDKs uses 512-pixel tiles, and on average, it generates one or less transactions per page view.
7474
* Often, it's more cost effective to replace static map images from Google Maps web services with the Azure Maps Web SDK. The Azure Maps Web SDK uses map tiles. Unless the user pans and zooms the map, the service often generates only a fraction of a transaction per map load. The Azure Maps web SDK has options for disabling panning and zooming, if desired. Additionally, the Azure Maps web SDK provides a lot more visualization options than the static map web service.
75-
* Azure Maps allows data from its platform to be stored in Azure. Also, data can be cached elsewhere for up to six months as per the [terms of use](https://www.microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&DocumentTypeId=46).
75+
* Azure Maps allows data from its platform to be stored in Azure. Also, data can be cached elsewhere for up to six months as per the [terms of use].
7676

7777
Here are some related resources for Azure Maps:
7878

79-
* [Azure Maps pricing page](https://azure.microsoft.com/pricing/details/azure-maps/)
80-
* [Azure pricing calculator](https://azure.microsoft.com/pricing/calculator/?service=azure-maps)
81-
* [Azure Maps term of use](https://www.microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&DocumentTypeId=46)
82-
(included in the Microsoft Online Services Terms)
83-
* [Choose the right pricing tier in Azure Maps](./choose-pricing-tier.md)
79+
* [Azure Maps pricing page]
80+
* [Azure pricing calculator]
81+
* [Choose the right pricing tier in Azure Maps]
82+
* [Azure Maps term of use] - included in the Microsoft Online Services Terms.
8483

8584
## Suggested migration plan
8685

87-
The following is a high-level migration plan.
86+
A high-level migration plan includes.
8887

8988
1. Take inventory of the Google Maps SDKs and services that your application uses. Verify that Azure Maps provides alternative SDKs and services.
90-
2. If you don't already have one, create an Azure subscription at [https://azure.com](https://azure.com).
91-
3. Create an Azure Maps account ([documentation](./how-to-manage-account-keys.md)) and authentication key or Azure Active Directory ([documentation](./how-to-manage-authentication.md)).
89+
2. If you don't already have one, create an [Azure subscription].
90+
3. Create an [Azure Maps account] and [subscription key] or [Azure Active Directory authentication].
9291
4. Migrate your application code.
9392
5. Test your migrated application.
9493
6. Deploy your migrated application to production.
@@ -97,28 +96,26 @@ The following is a high-level migration plan.
9796

9897
To create an Azure Maps account and get access to the Azure Maps platform, follow these steps:
9998

100-
1. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
101-
2. Sign in to the [Azure portal](https://portal.azure.com/).
102-
3. Create an [Azure Maps account](./how-to-manage-account-keys.md).
103-
4. [Get your Azure Maps subscription key](./how-to-manage-authentication.md#view-authentication-details) or setup Azure Active Directory authentication for enhanced security.
99+
1. If you don't have an Azure subscription, create a [free account] before you begin.
100+
2. Sign in to the [Azure portal].
101+
3. Create an [Azure Maps account].
102+
4. Get your Azure Maps [subscription key] or [Azure Active Directory authentication] for enhanced security.
104103

105104
## Azure Maps technical resources
106105

107106
Here's a list of useful technical resources for Azure Maps.
108107

109-
- Overview: [https://azure.com/maps](https://azure.com/maps)
110-
- Documentation: [https://aka.ms/AzureMapsDocs](./index.yml)
111-
- Web SDK Code Samples: [https://aka.ms/AzureMapsSamples](https://aka.ms/AzureMapsSamples)
112-
- Developer Forums: [https://aka.ms/AzureMapsForums](/answers/topics/azure-maps.html)
113-
- Videos: [https://aka.ms/AzureMapsVideos](/shows/)
114-
- Blog: [https://aka.ms/AzureMapsBlog](https://aka.ms/AzureMapsBlog)
115-
- Tech Blog: [https://aka.ms/AzureMapsTechBlog](https://aka.ms/AzureMapsTechBlog)
116-
- Azure Maps Feedback (UserVoice): [https://aka.ms/AzureMapsFeedback](/answers/topics/25319/azure-maps.html)
117-
- [Azure Maps Jupyter Notebook](https://github.com/Azure-Samples/Azure-Maps-Jupyter-Notebook)
108+
* [Azure Maps product page]
109+
* [Azure Maps product documentation]
110+
* [Azure Maps Web SDK code samples]
111+
* [Azure Maps developer forums]
112+
* [Microsoft learning center shows]
113+
* [Azure Maps Blog]
114+
* [Azure Maps Q&A]
118115

119116
## Migration support
120117

121-
Developers can seek migration support through the [forums](/answers/topics/azure-maps.html) or through one of the many Azure support options: [https://azure.microsoft.com/support/options](https://azure.microsoft.com/support/options)
118+
Developers can seek migration support through the [Azure Maps developer forums] or through one of the many [Azure support options].
122119

123120
## Clean up resources
124121

@@ -134,4 +131,27 @@ Learn the details of how to migrate your Google Maps application with these arti
134131
[Azure Maps account]: quick-demo-map-app.md#create-an-azure-maps-account
135132
[subscription key]: quick-demo-map-app.md#get-the-subscription-key-for-your-account
136133
[free account]: https://azure.microsoft.com/free/
137-
[manage authentication in Azure Maps]: how-to-manage-authentication.md
134+
[Azure subscription]: https://azure.com
135+
[Azure portal]: https://portal.azure.com/
136+
[Manage authentication in Azure Maps]: how-to-manage-authentication.md
137+
[Azure Active Directory authentication]: azure-maps-authentication.md#azure-ad-authentication
138+
[terms of use]: https://www.microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&DocumentTypeId=46
139+
[Azure Maps pricing page]: https://azure.microsoft.com/pricing/details/azure-maps/
140+
[Azure pricing calculator]: https://azure.microsoft.com/pricing/calculator/?service=azure-maps
141+
[Azure Maps term of use]: https://www.microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&DocumentTypeId=46
142+
[Choose the right pricing tier in Azure Maps]: choose-pricing-tier.md
143+
144+
[Azure Maps product page]: https://azure.com/maps
145+
[Azure Maps product documentation]: https://aka.ms/AzureMapsDocs
146+
[Azure Maps Web SDK code samples]: https://aka.ms/AzureMapsSamples
147+
[Azure Maps developer forums]: https://aka.ms/AzureMapsForums
148+
[Microsoft learning center shows]: https://aka.ms/AzureMapsVideos
149+
[Azure Maps Blog]: https://aka.ms/AzureMapsBlog
150+
[Azure Maps Q&A]: https://aka.ms/AzureMapsFeedback
151+
152+
[Azure support options]: https://azure.microsoft.com/support/options
153+
154+
<!---------------------------------------------------->
155+
[Elevation services]: /rest/api/maps/elevation
156+
[deprecated]: https://azure.microsoft.com/updates/azure-maps-elevation-apis-and-render-v2-dem-tiles-will-be-retired-on-5-may-2023
157+
[Create elevation data & services]: elevation-data-services.md

articles/machine-learning/resource-limits-capacity.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ This section lists basic limits and throttling thresholds in Azure Machine Learn
5656
| Number of input datasets |200 |
5757
| Number of output datasets |20 |
5858

59+
## Custom environments
60+
| Limit | Value |
61+
| --- | --- |
62+
| Number of files in Docker build context | 100 |
63+
| Total files size in Docker build context | 1 MB |
64+
5965
## Metrics
6066
| Limit | Value |
6167
| --- | --- |

0 commit comments

Comments
 (0)