Skip to content

Commit a813c02

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-az-region-uae-north-v2
2 parents 48060aa + 032b9f9 commit a813c02

File tree

2 files changed

+42
-13
lines changed

2 files changed

+42
-13
lines changed

articles/azure-government/compliance/azure-services-in-fedramp-auditscope.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.topic: article
55
ms.service: azure-government
66
ms.custom: references_regions
77
recommendations: false
8-
ms.date: 06/21/2022
8+
ms.date: 08/15/2022
99
---
1010

1111
# Azure, Dynamics 365, Microsoft 365, and Power Platform services compliance scope
@@ -50,7 +50,7 @@ For current Azure Government regions and available services, see [Products avail
5050
This article provides a detailed list of Azure, Dynamics 365, Microsoft 365, and Power Platform cloud services in scope for FedRAMP High, DoD IL2, DoD IL4, DoD IL5, and DoD IL6 authorizations across Azure, Azure Government, and Azure Government Secret cloud environments. For other authorization details in Azure Government Secret and Azure Government Top Secret, contact your Microsoft account representative.
5151

5252
## Azure public services by audit scope
53-
*Last updated: February 2022*
53+
*Last updated: August 2022*
5454

5555
### Terminology used
5656

@@ -194,6 +194,7 @@ This article provides a detailed list of Azure, Dynamics 365, Microsoft 365, and
194194
| [Notification Hubs](../../notification-hubs/index.yml) | ✅ | ✅ |
195195
| [Open Datasets](../../open-datasets/index.yml) | ✅ | ✅ |
196196
| [Peering Service](../../peering-service/index.yml) | ✅ | ✅ |
197+
| [Planned Maintenance for VMs](../../virtual-machines/maintenance-and-updates.md) | ✅ | ✅ |
197198
| [Power Apps](/powerapps/) | ✅ | ✅ |
198199
| [Power Apps Portal](https://powerapps.microsoft.com/portals/) | ✅ | ✅ |
199200
| [Power Automate](/power-automate/) (formerly Microsoft Flow) | ✅ | ✅ |
@@ -205,6 +206,8 @@ This article provides a detailed list of Azure, Dynamics 365, Microsoft 365, and
205206
| [Public IP](../../virtual-network/ip-services/public-ip-addresses.md) | ✅ | ✅ |
206207
| [Resource Graph](../../governance/resource-graph/index.yml) | ✅ | ✅ |
207208
| **Service** | **FedRAMP High** | **DoD IL2** |
209+
| [Resource Mover](../../resource-mover/index.yml) | ✅ | ✅ |
210+
| [Route Server](../../route-server/index.yml) | ✅ | ✅ |
208211
| [Scheduler](../../scheduler/index.yml) (replaced by [Logic Apps](../../logic-apps/index.yml)) | ✅ | ✅ |
209212
| [Service Bus](../../service-bus-messaging/index.yml) | ✅ | ✅ |
210213
| [Service Fabric](../../service-fabric/index.yml) | ✅ | ✅ |
@@ -242,7 +245,7 @@ This article provides a detailed list of Azure, Dynamics 365, Microsoft 365, and
242245
****** FedRAMP High authorization for Azure Databricks is applicable to limited regions in Azure. To configure Azure Databricks for FedRAMP High use, contact your Microsoft or Databricks representative.
243246

244247
## Azure Government services by audit scope
245-
*Last updated: June 2022*
248+
*Last updated: August 2022*
246249

247250
### Terminology used
248251

@@ -298,6 +301,7 @@ This article provides a detailed list of Azure, Dynamics 365, Microsoft 365, and
298301
| [Azure Sign-up portal](https://signup.azure.com/) | ✅ | ✅ | | | |
299302
| [Azure Stack Bridge](/azure-stack/operator/azure-stack-usage-reporting) | ✅ | ✅ | ✅ | ✅ | ✅ |
300303
| [Azure Stack Edge](../../databox-online/index.yml) (formerly Data Box Edge) ***** | ✅ | ✅ | ✅ | ✅ | ✅ |
304+
| [Azure Video Indexer](../../azure-video-indexer/index.yml) | ✅ | ✅ | | | |
301305
| [Azure Virtual Desktop](../../virtual-desktop/index.yml) (formerly Windows Virtual Desktop) | ✅ | ✅ | ✅ | ✅ | ✅ |
302306
| [Backup](../../backup/index.yml) | ✅ | ✅ | ✅ | ✅ | ✅ |
303307
| [Bastion](../../bastion/index.yml) | ✅ | ✅ | ✅ | ✅ | |

articles/cognitive-services/Translator/sovereign-clouds.md

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: translator-text
1010
ms.topic: reference
11-
ms.date: 02/24/2022
11+
ms.date: 08/15/2022
1212
ms.author: lajanuar
1313
---
1414

@@ -30,6 +30,8 @@ The following table lists the base URLs for Azure sovereign cloud endpoints:
3030
| Azure portal for US Government | `https://portal.azure.us` |
3131
| Azure portal China operated by 21 Vianet | `https://portal.azure.cn` |
3232

33+
<!-- markdownlint-disable MD033 -->
34+
3335
## Translator: sovereign clouds
3436

3537
### [Azure US Government](#tab/us)
@@ -41,7 +43,7 @@ The following table lists the base URLs for Azure sovereign cloud endpoints:
4143
|Azure portal | <ul><li>[Azure Government Portal](https://portal.azure.us/)</li></ul>|
4244
| Available regions</br></br>The region-identifier is a required header when using Translator for the government cloud. | <ul><li>`usgovarizona` </li><li> `usgovvirginia`</li></ul>|
4345
|Available pricing tiers|<ul><li>Free (F0) and Standard (S0). See [Translator pricing](https://azure.microsoft.com/pricing/details/cognitive-services/translator/)</li></ul>|
44-
|Supported Features | <ul><li>Text Translation</li><li>Document Translation</li><li>Custom Translation</li></ul>|
46+
|Supported Features | <ul><li>[Text Translation](https://docs.azure.cn/cognitive-services/translator/reference/v3-0-reference)</li><li>[Document Translation](document-translation/overview.md)</li><li>[Custom Translator](custom-translator/overview.md)</li></ul>|
4547
|Supported Languages| <ul><li>[Translator language support](language-support.md)</li></ul>|
4648

4749
<!-- markdownlint-disable MD036 -->
@@ -77,10 +79,8 @@ https://api.cognitive.microsofttranslator.us/
7779

7880
#### Document Translation custom endpoint
7981

80-
Replace the `<your-custom-domain>` parameter with your [custom domain endpoint](document-translation/get-started-with-document-translation.md#what-is-the-custom-domain-endpoint).
81-
8282
```http
83-
https://<your-custom-domain>.cognitiveservices.azure.us/
83+
https://<NAME-OF-YOUR-RESOURCE>.cognitiveservices.azure.us/translator/text/batch/v1.0
8484
```
8585

8686
#### Custom Translator portal
@@ -122,7 +122,7 @@ The Azure China cloud is a physical and logical network-isolated instance of clo
122122
|---|---|
123123
|Azure portal |<ul><li>[Azure China 21 Vianet Portal](https://portal.azure.cn/)</li></ul>|
124124
|Regions <br></br>The region-identifier is a required header when using a multi-service resource. | <ul><li>`chinanorth` </li><li> `chinaeast2`</li></ul>|
125-
|Supported Feature|<ul><li>[Text Translation](https://docs.azure.cn/cognitive-services/translator/reference/v3-0-reference)</li></ul>|
125+
|Supported Feature|<ul><li>[Text Translation](https://docs.azure.cn/cognitive-services/translator/reference/v3-0-reference)</li><li>[Document Translation](document-translation/overview.md)</li></ul>|
126126
|Supported Languages|<ul><li>[Translator language support.](https://docs.azure.cn/cognitive-services/translator/language-support)</li></ul>|
127127

128128
<!-- markdownlint-disable MD036 -->
@@ -152,7 +152,7 @@ https://<region-identifier>.api.cognitive.azure.cn/sts/v1.0/issueToken
152152
https://api.translator.azure.cn/translate
153153
```
154154

155-
### Example API translation request
155+
### Example text translation request
156156

157157
Translate a single sentence from English to Simplified Chinese.
158158

@@ -174,12 +174,37 @@ curl -X POST "https://api.translator.azure.cn/translate?api-version=3.0&from=en&
174174
]
175175
```
176176

177-
> [!div class="nextstepaction"]
178-
> [Azure China: Translator Text reference](https://docs.azure.cn/cognitive-services/translator/reference/v3-0-reference)
177+
#### Document Translation custom endpoint
178+
179+
#### Document Translation custom endpoint
180+
181+
```http
182+
https://<NAME-OF-YOUR-RESOURCE>.cognitiveservices.azure.us/translator/text/batch/v1.0
183+
```
184+
185+
### Example batch translation request
186+
187+
```json
188+
{
189+
"inputs": [
190+
{
191+
"source": {
192+
"sourceUrl": "https://my.blob.core.windows.net/source-en?sv=2019-12-12&st=2021-03-05T17%3A45%3A25Z&se=2021-03-13T17%3A45%3A00Z&sr=c&sp=rl&sig=SDRPMjE4nfrH3csmKLILkT%2Fv3e0Q6SWpssuuQl1NmfM%3D"
193+
},
194+
"targets": [
195+
{
196+
"targetUrl": "https://my.blob.core.windows.net/target-zh-Hans?sv=2019-12-12&st=2021-03-05T17%3A49%3A02Z&se=2021-03-13T17%3A49%3A00Z&sr=c&sp=wdl&sig=Sq%2BYdNbhgbq4hLT0o1UUOsTnQJFU590sWYo4BOhhQhs%3D",
197+
"language": "zh-Hans"
198+
}
199+
]
200+
}
201+
]
202+
}
203+
```
179204

180205
---
181206

182-
## Next step
207+
## Next steps
183208

184209
> [!div class="nextstepaction"]
185210
> [Learn more about Translator](index.yml)

0 commit comments

Comments
 (0)