Skip to content

Commit d38d4de

Browse files
authored
Merge pull request #232294 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 3fc8586 + 379e048 commit d38d4de

File tree

11 files changed

+347
-224
lines changed

11 files changed

+347
-224
lines changed

articles/active-directory/conditional-access/location-condition.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ Named locations defined by IPv4/IPv6 address ranges are subject to the following
5252
- Configure up to 195 named locations.
5353
- Configure up to 2000 IP ranges per named location.
5454
- Both IPv4 and IPv6 ranges are supported.
55-
- Private IP ranges can't be configured.
5655
- The number of IP addresses contained in a range is limited. Only CIDR masks greater than /8 are allowed when defining an IP range.
5756

5857
#### Trusted locations

articles/active-directory/hybrid/reference-connect-accounts-permissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ The following table is a summary of the custom settings wizard pages, the creden
135135
>
136136
> For more information, see [Azure AD Connect: Configure AD DS Connector account permission](how-to-connect-configure-ad-ds-connector-account.md).
137137
138-
The account you specify on the **Connect your directories** page must be created in Windows Server AD before installation. Azure AD Connect version 1.1.524.0 and later has the option to let the Azure AD Connect wizard create the AD DS Connector account that's used to connect to Windows Server AD.
138+
The account you specify on the **Connect your directories** page must be created in Windows Server AD as a normal user object (VSA, MSA, or gMSA aren't supported) before installation. Azure AD Connect version 1.1.524.0 and later has the option to let the Azure AD Connect wizard create the AD DS Connector account that's used to connect to Windows Server AD.
139139

140140
The account you specify also must have the required permissions. The installation wizard doesn't verify the permissions, and any issues are found only during the sync process.
141141

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

Lines changed: 288 additions & 183 deletions
Large diffs are not rendered by default.

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

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ If you don't have an Azure subscription, create a [free account] before you begi
3636
3737
## Azure Maps platform overview
3838

39-
Azure Maps provides developers from all industries powerful geospatial capabilities, packed with the freshest mapping data available to provide geographic context for web and mobile applications. Azure Maps is an Azure One API compliant set of REST APIs for Maps, Search, Routing, Traffic, Time Zones, Geofencing, Map Data, Weather Data, and many more services accompanied by both Web and Android SDKs to make development easy, flexible, and portable across multiple platforms. [Azure Maps is also available in Power BI](power-bi-visual-get-started.md).
39+
Azure Maps provides developers from all industries powerful geospatial capabilities, packed with the freshest mapping data available to provide geographic context for web and mobile applications. Azure Maps is an Azure One API compliant set of REST APIs for Maps, Search, Routing, Traffic, Time Zones, Geofencing, Map Data, Weather Data, and many more services accompanied by both Web and Android SDKs to make development easy, flexible, and portable across multiple platforms. [Azure Maps is also available in Power BI].
4040

4141
## High-level platform comparison
4242

43-
The following table provides a high-level list of Bing Maps features and the relative support for those features in Azure Maps. This list doesn’t include additional Azure Maps features such as accessibility, geofencing APIs, traffic services, spatial operations, direct map tile access, and batch services.
43+
The following table provides a high-level list of Bing Maps features and the relative support for those features in Azure Maps. This list doesn’t include other Azure Maps features such as accessibility, geofencing APIs, traffic services, spatial operations, direct map tile access, and batch services.
4444

4545
| Bing Maps feature | Azure Maps support |
4646
|---------------------------------------|:------------------:|
@@ -72,55 +72,55 @@ Bing Maps provides basic key-based authentication. Azure Maps provides both basi
7272

7373
## Licensing considerations
7474

75-
When migrating to Azure Maps from Bing Maps, the following information should be considered with regard to licensing.
75+
When migrating to Azure Maps from Bing Maps, the following information should be considered regarding licensing.
7676

7777
* Azure Maps charges for the usage of interactive maps based on the number of map tiles loaded, whereas Bing Maps charges for the loading of the map control (sessions). To reduce costs for developers, Azure Maps automatically caches map tiles. One Azure Maps transaction is generated for every 15 map tiles that are loaded. The interactive Azure Maps SDKs use 512-pixel tiles, and on average generates one or less transactions per page view.
7878

79-
* Azure Maps allows data from its platform to be stored in Azure. Caching and storing results locally is only permitted when the purpose of caching is to reduce latency times of Customer’s application, see [Microsoft Azure terms of use](https://www.microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&DocumentTypeId=31) for more information.
79+
* Azure Maps allows data from its platform to be stored in Azure. Caching and storing results locally is only permitted when the purpose of caching is to reduce latency times of Customer’s application, see [Microsoft Azure terms of use] for more information.
8080

8181
Here are some licensing-related resources for Azure Maps:
8282

83-
* [Azure Maps pricing page](https://azure.microsoft.com/pricing/details/azure-maps/)
84-
* [Azure pricing calculator](https://azure.microsoft.com/pricing/calculator/?service=azure-maps)
85-
* [Azure Maps term of use](https://www.microsoft.com/licensing/terms/productoffering/MicrosoftAzure/MCA) (Scroll down to the Azure Maps section)
86-
* [Choose the right pricing tier in Azure Maps](./choose-pricing-tier.md)
83+
* [Azure Maps pricing page]
84+
* [Azure pricing calculator]
85+
* [Azure Maps term of use] (Scroll down to the Azure Maps section)
86+
* [Choose the right pricing tier in Azure Maps]
8787

8888
## Suggested migration plan
8989

9090
Here's an example of a high-level migration plan.
9191

9292
1. Take inventory of what Bing Maps SDKs and services your application is using and verify that Azure Maps provides alternative SDKs and services for you to migrate to.
93-
2. Create an Azure subscription (if you don’t already have one) at [azure.com](https://azure.com).
94-
3. Create an Azure Maps account ([documentation](./how-to-manage-account-keys.md))
95-
and authentication key or Azure Active Directory ([documentation](./how-to-manage-authentication.md)).
96-
4. Migrate your application code.
97-
5. Test your migrated application.
98-
6. Deploy your migrated application to production.
93+
1. Create an Azure subscription (if you don’t already have one) at [azure.com]).
94+
1. Create an [Azure Maps account].
95+
1. Setup authentication using an Azure Maps [subscription key] or [Azure Active Directory authentication].
96+
1. Migrate your application code.
97+
1. Test your migrated application.
98+
1. Deploy your migrated application to production.
9999

100100
## Create an Azure Maps account
101101

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

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

109109
## Azure Maps technical resources
110110

111-
Here is a list of useful technical resources for Azure Maps.
111+
Here's a list of useful technical resources for Azure Maps.
112112

113-
* Overview: <https://azure.com/maps>
114-
* Documentation: <https://aka.ms/AzureMapsDocs>
115-
* Web SDK Code Samples: <https://aka.ms/AzureMapsSamples>
116-
* Developer Forums: <https://aka.ms/AzureMapsForums>
117-
* Videos: <https://aka.ms/AzureMapsVideos>
118-
* Blog: <https://aka.ms/AzureMapsBlog>
119-
* Azure Maps Feedback (UserVoice): <https://aka.ms/AzureMapsFeedback>
113+
* [Azure Maps product page]
114+
* [Azure Maps product documentation]
115+
* [Azure Maps code samples]
116+
* [Azure Maps developer forums]
117+
* [Microsoft learning center shows]
118+
* [Azure Maps Blog]
119+
* [Azure Maps Feedback (UserVoice)]
120120

121121
## Migration support
122122

123-
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/).
123+
Developers can seek migration support through the [Azure Maps Q&A] or through one of the many [Azure support options].
124124

125125
## New terminology
126126

@@ -156,5 +156,23 @@ Learn the details of how to migrate your Bing Maps application with these articl
156156
157157
[Azure Maps account]: quick-demo-map-app.md#create-an-azure-maps-account
158158
[subscription key]: quick-demo-map-app.md#get-the-subscription-key-for-your-account
159-
[free account]: https://azure.microsoft.com/free/
159+
[free Azure account]: https://azure.microsoft.com/free/
160+
[Azure portal]: https://portal.azure.com/
160161
[manage authentication in Azure Maps]: how-to-manage-authentication.md
162+
[Azure Maps is also available in Power BI]: power-bi-visual-get-started.md
163+
[Microsoft Azure terms of use]: https://www.microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&DocumentTypeId=31
164+
[Azure Maps pricing page]: https://azure.microsoft.com/pricing/details/azure-maps/
165+
[Azure pricing calculator]: https://azure.microsoft.com/pricing/calculator/?service=azure-maps
166+
[Azure Maps term of use]: https://www.microsoft.com/licensing/terms/productoffering/MicrosoftAzure/MCA
167+
[Choose the right pricing tier in Azure Maps]: choose-pricing-tier.md
168+
[azure.com]: https://azure.com
169+
[Azure Active Directory authentication]: azure-maps-authentication.md#azure-ad-authentication
170+
[Azure Maps Q&A]: /answers/topics/azure-maps.html
171+
[Azure support options]: https://azure.microsoft.com/support/options/
172+
[Azure Maps product page]: https://azure.com/maps
173+
[Azure Maps product documentation]: https://aka.ms/AzureMapsDocs
174+
[Azure Maps code samples]: https://aka.ms/AzureMapsSamples
175+
[Azure Maps developer forums]: https://aka.ms/AzureMapsForums
176+
[Microsoft learning center shows]: https://aka.ms/AzureMapsVideos
177+
[Azure Maps Blog]: https://aka.ms/AzureMapsBlog
178+
[Azure Maps Feedback (UserVoice)]: https://aka.ms/AzureMapsFeedback

articles/azure-maps/tutorial-create-store-locator.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ In this tutorial, you'll learn how to:
4040
4141
## Sample code
4242

43-
In this tutorial, you'll create a store locator for a fictional company named *Contoso Coffee*. Also, this tutorial includes some tips to help you learn about extending the store locator with other optional functionality.
43+
This tutorial demonstrates how to create a store locator for a fictional company named *Contoso Coffee*, along with tips to extend the store locator with additional functionality.
4444

4545
To see a live sample of what you're creating in this tutorial, see [Simple Store Locator] on the **Azure Maps Code Samples** site.
4646

@@ -89,7 +89,7 @@ This section describes how to create a dataset of the stores that you want to di
8989

9090
:::image type="content" source="./media/tutorial-create-store-locator/store-locator-data-spreadsheet.png" alt-text="Screenshot of the store locator data in an Excel workbook.":::
9191

92-
The excel file containing the full dataset for the Contoso Coffee locator sample application can be downloaded from the [data] folder of the _Azure Maps code samples_ repository in GitHub.
92+
Download the excel file containing the full dataset for the Contoso Coffee locator sample application from the [data] folder of the _Azure Maps code samples_ repository in GitHub.
9393

9494
From the above screenshot of the data, we can make the following observations:
9595

@@ -102,7 +102,7 @@ From the above screenshot of the data, we can make the following observations:
102102
103103
## Load Contoso Coffee shop locator dataset
104104

105-
The Contoso Coffee shop locator dataset is small, so we'll convert the Excel worksheet into a tab-delimited text file. This file can then be downloaded by the browser when the application loads.
105+
The Contoso Coffee shop locator dataset is small, so it can be converted into a tab-delimited text file that the browser downloads when the application loads.
106106

107107
> [!TIP]
108108
> If your dataset is too large for client download, or is updated frequently, you might consider storing your dataset in a database. After your data is loaded into a database, you can then set up a web service that accepts queries for the data, then sends the results to the user's browser.
@@ -213,7 +213,7 @@ To create the HTML:
213213
</main>
214214
```
215215

216-
After you finish, *index.html* should look like _[Simple Store Locator.html]_ in the tutorial sample code.
216+
Once completed, *index.html* should look like [Simple Store Locator.html] in the tutorial sample code.
217217

218218
## Define the CSS styles
219219

@@ -429,7 +429,7 @@ The next step is to define the CSS styles. CSS styles define how the application
429429
}
430430
```
431431

432-
Run the application. You'll see the header, search box, and search button. However, the map isn't visible because it hasn't been loaded yet. If you try to do a search, nothing happens. We need to add the JavaScript logic described in the next section. This logic accesses all the functionality of the store locator.
432+
If you run the application at this point, the header, search box, and search button appear. However, the map isn't visible because it hasn't been loaded yet. If you try to do a search, nothing happens. The next section describes adding the JavaScript logic needed to access all the functionality of the store locator.
433433

434434
## Add JavaScript code
435435

@@ -439,7 +439,7 @@ The JavaScript code in the Contoso Coffee shop locator app enables the following
439439

440440
2. When the user selects the search button, or types a location in the search box then presses enter, a fuzzy search against the user's query begins. The code passes in an array of country/region ISO 2 values to the `countrySet` option to limit the search results to those countries/regions. Limiting the countries/regions to search helps increase the accuracy of the results that are returned.
441441

442-
3. Once the search completes, the first location result is used as the center focus of the map. When the user selects the My Location button, the code retrieves the user's location using the *HTML5 Geolocation API* that's built into the browser. After retrieving the location, the code centers the map over the user's location.
442+
3. Once the search completes, the first location result is used as the center focus of the map. When the user selects the My Location button, the code retrieves the user's location using the *HTML5 Geolocation API* that's built into the browser. Once the location is retrieved, the code centers the map over the user's location.
443443

444444
To add the JavaScript:
445445

articles/azure-monitor/essentials/diagnostic-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ This section discusses requirements and limitations.
103103

104104
### Time before telemetry gets to destination
105105

106-
Once you have set up a diagnostic setting, data should start flowing to your selected destination(s) with 90 minutes. If you get no information within 24 hours, then either
106+
Once you have set up a diagnostic setting, data should start flowing to your selected destination(s) within 90 minutes. If you get no information within 24 hours, then either
107107
- no logs are being generated or
108108
- something is wrong in the underlying routing mechanism. Try disabling the configuration and then reenabling it. Contact Azure support through the Azure portal if you continue to have issues.
109109

articles/cosmos-db/gremlin/tutorial-query.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: devx-track-csharp, ignite-2022
1515
# Tutorial: Query Azure Cosmos DB for Gremlin by using Gremlin
1616
[!INCLUDE[Gremlin](../includes/appliesto-gremlin.md)]
1717

18-
The Azure Cosmos DB [API for Gremlin](introduction.md) supports [Gremlin](https://github.com/tinkerpop/gremlin/wiki) queries. This article provides sample documents and queries to get you started. A detailed Gremlin reference is provided in the [Gremlin support](support.md) article.
18+
The Azure Cosmos DB [API for Gremlin](introduction.md) supports [Gremlin](https://tinkerpop.apache.org/gremlin.html) queries. This article provides sample documents and queries to get you started. A detailed Gremlin reference is provided in the [Gremlin support](support.md) article.
1919

2020
This article covers the following tasks:
2121

articles/governance/policy/concepts/attestation-structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Attestations are used by Azure Policy to set compliance states of resources or s
1717

1818
Attestations can be used to set the compliance state of an individual resource for a given manual policy. This means that each applicable resource requires one attestation per manual policy assignment. For ease of management, manual policies should be designed to target the scope which defines the boundary of resources whose compliance state needs to be attested.
1919

20-
For example, suppose an organization divides teams by resource group, and each team is required to attest to development of procedures for handling resources within that resource group. In this scenario, the conditions of the policy rule should specify that type equals `Microsoft.Resources/resourceGroups`. This way, one attestation is required for the resource group, rather than for each individual resource within. Similarly, if the organization deivides teams by subscriptions, the policy rule should target `Microsoft.Resources/subscriptions`.
20+
For example, suppose an organization divides teams by resource group, and each team is required to attest to development of procedures for handling resources within that resource group. In this scenario, the conditions of the policy rule should specify that type equals `Microsoft.Resources/resourceGroups`. This way, one attestation is required for the resource group, rather than for each individual resource within. Similarly, if the organization divides teams by subscriptions, the policy rule should target `Microsoft.Resources/subscriptions`.
2121

2222
Typically, the provided evidence should correspond with relevant scopes of the organizational structure. This pattern prevents the need to duplicate evidence across many attestations. Such duplications would make manual policies difficult to manage, and indicate that the policy definition targets the wrong resource(s).
2323

articles/iot-hub/iot-hub-dev-guide-sas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ using System.Net.Http;
151151
using System.Security.Cryptography;
152152
using System.Text;
153153

154-
public static string generateSasToken(string resourceUri, string key, string policyName, int expiryInSeconds = 3600)
154+
public static string GenerateSasToken(string resourceUri, string key, string policyName, int expiryInSeconds = 3600)
155155
{
156156
TimeSpan fromEpochStart = DateTime.UtcNow - new DateTime(1970, 1, 1);
157157
string expiry = Convert.ToString((int)fromEpochStart.TotalSeconds + expiryInSeconds);

articles/machine-learning/how-to-monitor-online-endpoints.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Split on the following dimensions:
7777
- Deployment
7878
- Status Code
7979
- Status Code Class
80+
- Model Status Code
8081

8182
**Bandwidth throttling**
8283

0 commit comments

Comments
 (0)