Skip to content

Commit 1e3202a

Browse files
authored
Merge pull request #295629 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 15a32f4 + 80dec49 commit 1e3202a

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

articles/azure-maps/migrate-get-imagery-metadata.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ The following table lists the fields that can appear in the HTTP response when r
7575

7676
| Bing Maps response field | Azure Maps response field | Description |
7777
|-----------------------------------------|---------------------------------|-------------|
78-
| imageHeight (Json)<BR>ImageWidth (XML)  | Not supported  | Azure Maps Get Map Tile API provides the map tile image directly in the HTML response (binary image string) and offers 256 x 256 and 512 x 512 pixel tile sizes.  |
79-
| imageUrl (Json)<BR>ImageUrl (XML)       | Not supported  | Azure Maps Get Map Tile API provides the map tile image directly in the HTML response (binary image string), as opposed to an image URL. |
80-
| imageUrlSubdomains (Json)<BR>ImageUrlSubdomains (XML)  | Not supported  | Azure Maps Get Map Tile API provides the map tile image directly in the HTML response (binary image string), as opposed to an image URL. |
81-
| imageWidth (Json)<BR>ImageWidth (XML)   | Not supported  | Azure Maps Get Map Tile API provides the map tile image directly in the HTML response (binary image string) and offers 256 x 256 and 512 x 512 pixel tile sizes.  |
82-
| vintageEnd (Json)<BR>VintageEnd (XML)    | Not supported  | Azure Maps Get Map Tile API provides map tile vintage information in the response header (Data-Capture-Date-Range<SUP>**1**</SUP>), rather than in the response body. |
83-
| vintageStart (Json)<BR>VintageStart (XML)| Not supported  | Azure Maps Get Map Tile API provides map tile vintage information in the response header (Data-Capture-Date-Range<SUP>**1**</SUP>), rather than in the response body. |
84-
| zoomMax (Json)<BR>ZoonMax (XML)          | Not supported  | For information on zoom levels and maximum zoom supported by map tile styles, see [Zoom levels and tile grid] and [TilesetID].|
85-
| zoomMin (Json)<BR>ZoomMin (XML)          | Not supported  | For information on zoom levels and maximum zoom supported by map tile styles, see [Zoom levels and tile grid] and [TilesetID].  |
78+
| imageHeight (JSON)<BR>ImageWidth (XML)  | Not supported  | Azure Maps Get Map Tile API provides the map tile image directly in the HTML response (binary image string) and offers 256 x 256 and 512 x 512 pixel tile sizes.  |
79+
| imageUrl (JSON)<BR>ImageUrl (XML)       | Not supported  | Azure Maps Get Map Tile API provides the map tile image directly in the HTML response (binary image string), as opposed to an image URL. |
80+
| imageUrlSubdomains (JSON)<BR>ImageUrlSubdomains (XML)  | Not supported  | Azure Maps Get Map Tile API provides the map tile image directly in the HTML response (binary image string), as opposed to an image URL. |
81+
| imageWidth (JSON)<BR>ImageWidth (XML)   | Not supported  | Azure Maps Get Map Tile API provides the map tile image directly in the HTML response (binary image string) and offers 256 x 256 and 512 x 512 pixel tile sizes.  |
82+
| vintageEnd (JSON)<BR>VintageEnd (XML)    | Not supported  | Azure Maps Get Map Tile API provides map tile vintage information in the response header (Data-Capture-Date-Range<SUP>**1**</SUP>), rather than in the response body. |
83+
| vintageStart (JSON)<BR>VintageStart (XML)| Not supported  | Azure Maps Get Map Tile API provides map tile vintage information in the response header (Data-Capture-Date-Range<SUP>**1**</SUP>), rather than in the response body. |
84+
| zoomMax (JSON)<BR>ZoonMax (XML)          | Not supported  | For information on zoom levels and maximum zoom supported by map tile styles, see [Zoom levels and tile grid] and [TilesetID].|
85+
| zoomMin (JSON)<BR>ZoomMin (XML)          | Not supported  | For information on zoom levels and maximum zoom supported by map tile styles, see [Zoom levels and tile grid] and [TilesetID].  |
8686

8787
<SUP>**1**</SUP> When using Azure Maps API to obtain RGB satellite images, you can also retrieve information about the acquisition date. The HTTP response includes a header called **Data-Capture-Date-Range**, which provides a date range indicating when the image was captured. For instance, it might appear as “7/31/2022-9/1/2023”. Keep in mind that satellite imagery often spans a date range due to batch processing and the stitching together of multiple images from different dates to create seamless maps. So, while a single date isn’t always applicable, the date range gives you insight into when the image data was collected.
8888

articles/private-link/availability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ The following tables list the Private Link services and the regions where they'r
101101
|Supported services |Available regions | Other considerations | Status |
102102
|:-------------------|:-----------------|:----------------|:--------|
103103
| Azure Key Vault | All public regions<br/> All Government regions | | GA <br/> [Learn how to create a private endpoint for Azure Key Vault.](/azure/key-vault/general/private-link-service) |
104-
|Azure App Configuration | All public regions | | GA </br> [Learn how to create a private endpoint for Azure App Configuration](../azure-app-configuration/concept-private-endpoint.md) |
104+
|Azure App Configuration | All public regions<br/> All Government regions<br/>All China regions | | GA </br> [Learn how to create a private endpoint for Azure App Configuration](../azure-app-configuration/concept-private-endpoint.md) |
105105
|Azure Application Gateway | All public regions | | GA </br> [Azure Application Gateway Private Link](../application-gateway/private-link.md) |
106106

107107

articles/private-link/private-endpoint-dns.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ You can use the following options to configure your DNS settings for private end
2424

2525
- **Use the host file (only recommended for testing)**. You can use the host file on a virtual machine to override the DNS.
2626

27-
- **Use a private DNS zone**. You can use [private DNS zones](../dns/private-dns-privatednszone.md) to override the DNS resolution for a private endpoint. A private DNS zone can be linked to your virtual network to resolve specific domains.
27+
- **Use a private DNS zone**. You can use [Private DNS Zones](../dns/private-dns-privatednszone.md) to override the DNS resolution for a private endpoint. A private DNS zone can be linked to your virtual network to resolve specific domains.
2828

2929
- **Use Azure Private Resolver (optional)**. You can use Azure Private Resolver to override the DNS resolution for a private link resource. For more information about Azure Private Resolver, see [What is Azure Private Resolver?](../dns/dns-private-resolver-overview.md).
3030

@@ -43,7 +43,10 @@ Connection URLs for your existing applications don't change. Client DNS requests
4343
> Azure File Shares must be remounted if connected to the public endpoint.
4444
4545
> [!CAUTION]
46-
> * Private networks already using the private DNS zone for a given type, can only connect to public resources if they don't have any private endpoint connections, otherwise a corresponding DNS configuration is required on the private DNS zone in order to complete the DNS resolution sequence. The corresponding DNS configuration is a manually entered A-record that points to the public IP address of the resource. This procedure isn't recommended as the IP address of the A record won't be automatically updated if the corresponding public IP address changes.
46+
> * Private networks using a Private DNS Zone for any given resource type (for example, privatelink.blob.core.windows.net/Storage Account) can only resolve DNS Queries to public resources/Public IPs if those public resources don't have any existing Private Endpoint Connections. If this applies, an additional DNS configuration is required on the Private DNS Zone to complete the DNS resolution sequence. Otherwise, the Private DNS Zone will respond to the DNS query with a NXDOMAIN as no matching DNS record would be found in the Private DNS Zone.
47+
>
48+
> > * [Fallback to Internet](../dns/private-dns-fallback.md) for Private DNS Zone Virtual Network Links can be implemented for proper DNS Resolution for the Public IP of the public resource. This allows DNS queries that reach Private DNS Zones to be forwarded to Azure DNS for public resolution.
49+
> > * Alternatively, a manually entered A-record in the Private DNS Zone that contains the Public IP of the public resource would allow for proper DNS resolution. This procedure isn't recommended as the Public IP of the A record in the Private DNS Zone won't be automatically updated if the corresponding public IP address changes for the public resource.
4750
>
4851
> * Private endpoint private DNS zone configurations will only automatically generate if you use the recommended naming scheme in the following tables.
4952
@@ -96,7 +99,7 @@ For Azure services, use the recommended zone names as described in the following
9699
>| Private link resource type | Subresource | Private DNS zone name | Public DNS zone forwarders |
97100
>|---|---|---|---|
98101
>| Azure Kubernetes Service - Kubernetes API (Microsoft.ContainerService/managedClusters) | management | privatelink.{regionName}.azmk8s.io </br> {subzone}.privatelink.{regionName}.azmk8s.io | {regionName}.azmk8s.io |
99-
| Azure Container Apps (Microsoft.App/ManagedEnvironments) | managedEnvironment | privatelink.{regionName}.azurecontainerapps.io | azurecontainerapps.io |
102+
| Azure Container Apps (Microsoft.App/ManagedEnvironments) | managedEnvironments | privatelink.{regionName}.azurecontainerapps.io | azurecontainerapps.io |
100103
>| Azure Container Registry (Microsoft.ContainerRegistry/registries) | registry | privatelink.azurecr.io </br> {regionName}.data.privatelink.azurecr.io | azurecr.io </br> {regionName}.data.azurecr.io |
101104
102105
### Databases

articles/stream-analytics/data-errors.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ See [Troubleshoot Azure Stream Analytics by using diagnostics logs](monitor-azur
2323
"Source": "InputTelemetryData",
2424
"Type": "DataError",
2525
"DataErrorType": "InputDeserializerError.InvalidData",
26-
"BriefMessage": "Json input stream should either be an array of objects or line separated objects. Found token type: Integer",
26+
"BriefMessage": "JSON input stream should either be an array of objects or line separated objects. Found token type: Integer",
2727
"Message": "Input Message Id: https:\\/\\/exampleBlob.blob.core.windows.net\\/inputfolder\\/csv.txt Error: JSON input stream should either be an array of objects or line separated objects. Found token type: Integer",
2828
"ExampleEvents": "[\"1,2\\\\u000d\\\\u000a3,4\\\\u000d\\\\u000a5,6\"]",
2929
"FromTimestamp": "2019-03-22T22:34:18.5664937Z",
@@ -119,11 +119,11 @@ See [Troubleshoot Azure Stream Analytics by using diagnostics logs](monitor-azur
119119
**Error messages**
120120

121121
```json
122-
"BriefMessage": "Json input stream should either be an array of objects or line separated objects. Found token type: String"
122+
"BriefMessage": "JSON input stream should either be an array of objects or line separated objects. Found token type: String"
123123
```
124124

125125
```json
126-
"Message": "Json input stream should either be an array of objects or line separated objects. Found token type: String"
126+
"Message": "JSON input stream should either be an array of objects or line separated objects. Found token type: String"
127127
```
128128

129129
### InvalidInputTimeStamp

0 commit comments

Comments
 (0)