Skip to content

Commit 9d237a8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into updateKeyScreen
2 parents e9f6e0d + fc4bd7a commit 9d237a8

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

articles/active-directory/authentication/concept-authentication-oath-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Users may have a combination of up to five OATH hardware tokens or authenticator
6363

6464
.[!IMPORTANT]
6565
>Make sure to only assign each token to a single user.
66-
In the future, support for the assignment of a single token to multiple users will stop to prevent a security risk.
66+
>In the future, support for the assignment of a single token to multiple users will stop to prevent a security risk.
6767
6868

6969
## Determine OATH token registration type in mysecurityinfo

articles/azure-government/compare-azure-government-global-azure.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: stevevi
77
ms.author: stevevi
88
ms.custom: references_regions
99
recommendations: false
10-
ms.date: 02/10/2023
10+
ms.date: 02/13/2023
1111
---
1212

1313
# Compare Azure Government and global Azure
@@ -136,7 +136,7 @@ The following Azure Bot Service **features aren't currently available** in Azure
136136
- Microsoft Search Channel (Preview)
137137
- Kik Channel (deprecated)
138138

139-
For more information, see [How do I create a bot that uses US Government data center](/azure/bot-service/bot-service-resources-faq-ecosystem#how-do-i-create-a-bot-that-uses-the-us-government-data-center).
139+
For information on how to deploy Bot Framework and Azure Bot Service bots to Azure Government, see [Configure Bot Framework bots for US Government customers](/azure/bot-service/how-to-deploy-gov-cloud-high).
140140

141141
### [Azure Machine Learning](../machine-learning/index.yml)
142142

@@ -203,18 +203,20 @@ The following Azure Database for MySQL **features aren't currently available** i
203203

204204
### [Azure Database for PostgreSQL](../postgresql/index.yml)
205205

206+
For Flexible Server availability in Azure Government regions, see [Azure Database for PostgreSQL – Flexible Server](../postgresql/flexible-server/overview.md#azure-regions).
207+
206208
The following Azure Database for PostgreSQL **features aren't currently available** in Azure Government:
207209

208-
- Hyperscale (Citus) deployment option
209-
- The following features of the Single server deployment option
210+
- Azure Cosmos DB for PostgreSQL, formerly Azure Database for PostgreSQL – Hyperscale (Citus). For more information about supported regions, see [Regional availability for Azure Cosmos DB for PostgreSQL](../cosmos-db/postgresql/resources-regions.md).
211+
- The following features of the Single Server deployment option
210212
- Advanced Threat Protection
211213
- Backup with long-term retention
212214

213215
### [Azure SQL Managed Instance](/azure/azure-sql/managed-instance/sql-managed-instance-paas-overview)
214216

215217
The following Azure SQL Managed Instance **features aren't currently available** in Azure Government:
216218

217-
- Long-term retention
219+
- Long-term backup retention
218220

219221
## Developer tools
220222

0 commit comments

Comments
 (0)