Skip to content

Commit a6718e2

Browse files
authored
Merge pull request #89693 from MicrosoftDocs/master
9/25 AM Publish
2 parents 263a69b + 7815bf0 commit a6718e2

File tree

82 files changed

+1266
-740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1266
-740
lines changed

.openpublishing.redirection.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,6 +1715,66 @@
17151715
"redirect_url": "/azure/cosmos-db/manage-with-powershell",
17161716
"redirect_document_id": true
17171717
},
1718+
{
1719+
"source_path": "articles/cosmos-db/scripts/create-cassandra-database-account-cli.md",
1720+
"redirect_url": "/azure/cosmos-db/scripts/cli/cassandra/create",
1721+
"redirect_document_id": false
1722+
},
1723+
{
1724+
"source_path": "articles/cosmos-db/scripts/create-database-account-collections-cli.md",
1725+
"redirect_url": "/azure/cosmos-db/scripts/cli/sql/create",
1726+
"redirect_document_id": false
1727+
},
1728+
{
1729+
"source_path": "articles/cosmos-db/scripts/create-firewall-cli.md",
1730+
"redirect_url": "/azure/cosmos-db/scripts/cli/common/ipfirewall",
1731+
"redirect_document_id": false
1732+
},
1733+
{
1734+
"source_path": "articles/cosmos-db/scripts/create-gremlin-database-account-cli.md",
1735+
"redirect_url": "/azure/cosmos-db/scripts/cli/gremlin/create",
1736+
"redirect_document_id": false
1737+
},
1738+
{
1739+
"source_path": "articles/cosmos-db/scripts/create-mongodb-database-account-cli.md",
1740+
"redirect_url": "/azure/cosmos-db/scripts/cli/mongodb/create",
1741+
"redirect_document_id": false
1742+
},
1743+
{
1744+
"source_path": "articles/cosmos-db/scripts/create-table-database-account-cli.md",
1745+
"redirect_url": "/azure/cosmos-db/scripts/cli/table/create",
1746+
"redirect_document_id": false
1747+
},
1748+
{
1749+
"source_path": "articles/cosmos-db/scripts/ha-failover-policy.md",
1750+
"redirect_url": "/azure/cosmos-db/scripts/cli/common/regions",
1751+
"redirect_document_id": false
1752+
},
1753+
{
1754+
"source_path": "articles/cosmos-db/scripts/scale-collection-throughput-cli.md",
1755+
"redirect_url": "/azure/cosmos-db/scripts/cli/sql/throughput",
1756+
"redirect_document_id": false
1757+
},
1758+
{
1759+
"source_path": "articles/cosmos-db/scripts/scale-multiregion-cli.md",
1760+
"redirect_url": "/azure/cosmos-db/scripts/cli/common/regions",
1761+
"redirect_document_id": false
1762+
},
1763+
{
1764+
"source_path": "articles/cosmos-db/scripts/secure-get-account-key-cli.md",
1765+
"redirect_url": "/azure/cosmos-db/scripts/cli/common/keys",
1766+
"redirect_document_id": false
1767+
},
1768+
{
1769+
"source_path": "articles/cosmos-db/scripts/secure-mongo-connection-string.md",
1770+
"redirect_url": "/azure/cosmos-db/scripts/cli/common/keys",
1771+
"redirect_document_id": false
1772+
},
1773+
{
1774+
"source_path": "articles/cosmos-db/scripts/secure-generate-key-cli.md",
1775+
"redirect_url": "/azure/cosmos-db/scripts/cli/common/keys",
1776+
"redirect_document_id": false
1777+
},
17181778
{
17191779
"source_path": "articles/cosmos-db/programming.md",
17201780
"redirect_url": "/azure/cosmos-db/storedprocedures-triggers-udfs",
Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Region availability & data residency in Azure Active Directory B2C | Microsoft Docs
2+
title: Region availability & data residency in Azure Active Directory B2C
33
description: A topic on the types of Azure Active Directory B2C tenants.
44
services: active-directory-b2c
55
author: mmacy
@@ -8,50 +8,59 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 04/10/2017
11+
ms.date: 09/26/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
1515

1616
# Azure Active Directory B2C: Region availability & data residency
17-
Region availability and data residency are two very different concepts that apply differently to Azure AD B2C from the rest of Azure. This article will explain the differences between these two concepts and compare how they apply to Azure versus Azure AD B2C.
1817

19-
## Summary
20-
Azure AD B2C is **generally available worldwide** with the option for **data residency in United States or Europe**.
18+
Region availability and data residency are two very different concepts that apply differently to Azure AD B2C from the rest of Azure. This article explains the differences between these two concepts, and compares how they apply to Azure versus Azure AD B2C.
2119

22-
## Concepts
23-
* **Region availability** refers to where a service is available for use.
24-
* **Data residency** refers to where user data is stored.
20+
Azure AD B2C is **generally available worldwide** with the option for **data residency** in the **United States, Europe, or Asia Pacific**.
21+
22+
[Region availability](#region-availability) refers to where a service is available for use.
23+
24+
[Data residency](#data-residency) refers to where user data is stored.
2525

2626
## Region availability
27-
Azure AD B2C is available worldwide via the Azure public cloud.
2827

29-
This differs from the model most other Azure services follow which couple availability with data residency. You can see examples of this in both Azure's [Products Available By Region](https://azure.microsoft.com/regions/services/) page and the [Active Directory B2C pricing calculator](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
28+
Azure AD B2C is available worldwide via the Azure public cloud.
29+
30+
This differs from the model followed by most other Azure services, which typically couple *availability* with *data residency*. You can see examples of this in both Azure's [Products Available By Region](https://azure.microsoft.com/regions/services/) page and the [Active Directory B2C pricing calculator](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
3031

3132
## Data residency
32-
Azure AD B2C stores user data in either United States or Europe.
3333

34-
Data residency is determined based on which country/region is selected when [creating an Azure AD B2C tenant](active-directory-b2c-get-started.md).
34+
Azure AD B2C stores user data in either United States, Europe, or the Asia Pacific region.
35+
36+
Data residency is determined by the country/region you select when you [create an Azure AD B2C tenant](active-directory-b2c-get-started.md):
3537

3638
![Screenshot of a preview tenant](./media/active-directory-b2c-reference-tenant-type/data-residency-b2c-tenant.png)
3739

38-
Data resides in the United States for the following countries/regions:
40+
Data resides in the **United States** for the following countries/regions:
3941

4042
> United States, Canada, Costa Rica, Dominican Republic, El Salvador, Guatemala, Mexico, Panama, Puerto Rico and Trinidad & Tobago
4143
42-
Data resides in Europe for the following countries/regions:
44+
Data resides in **Europe** for the following countries/regions:
4345

44-
> Algeria, Austria, Azerbaijan, Bahrain, Belarus, Belgium, Bulgaria, Croatia, Cyprus, Czech Republic, Denmark, Egypt, Estonia, Finland, France, Germany, Greece, Hungary, Iceland, Ireland, Israel, Italy, Jordan, Kazakhstan, Kenya, Kuwait, Lativa, Lebanon, Liechtenstein, Lithuania, Luxembourg, North Macedonia, Malta, Montenegro, Morocco, Netherlands, Nigeria, Norway, Oman, Pakistan, Poland, Portugal, Qatar, Romania, Russia, Saudi Arabia, Serbia, Slovakia, Slovenia, South Africa, Spain, Sweden, Switzerland, Tunisia, Turkey, Ukraine, United Arab Emirates and United Kingdom.
46+
> Algeria, Austria, Azerbaijan, Bahrain, Belarus, Belgium, Bulgaria, Croatia, Cyprus, Czech Republic, Denmark, Egypt, Estonia, Finland, France, Germany, Greece, Hungary, Iceland, Ireland, Israel, Italy, Jordan, Kazakhstan, Kenya, Kuwait, Latvia, Lebanon, Liechtenstein, Lithuania, Luxembourg, North Macedonia, Malta, Montenegro, Morocco, Netherlands, Nigeria, Norway, Oman, Pakistan, Poland, Portugal, Qatar, Romania, Russia, Saudi Arabia, Serbia, Slovakia, Slovenia, South Africa, Spain, Sweden, Switzerland, Tunisia, Turkey, Ukraine, United Arab Emirates and United Kingdom.
4547
46-
The remaining countries/regions are in the process of being added to the list. For now, you can still use Azure AD B2C by picking any of the countries/regions above.
48+
Data resides in **Asia Pacific** for the following countries/regions:
4749

48-
> Afghanistan, Argentina, Australia, Brazil, Chile, Colombia, Ecuador, Hong Kong SAR, India, Indonesia, Iraq, Japan, Korea, Malaysia, New Zealand, Paraguay, Peru, Philippines, Singapore, Sri Lanka, Taiwan, Thailand, Uruguay and Venezuela.
50+
> Afghanistan, Hong Kong SAR, India, Indonesia, Japan, Korea, Malaysia, Philippines, Singapore, Sri Lanka, Taiwan, and Thailand.
51+
52+
The following countries/regions are in the process of being added to the list. For now, you can still use Azure AD B2C by picking any of the countries/regions above.
53+
54+
> Argentina, Australia, Brazil, Chile, Colombia, Ecuador, Iraq, New Zealand, Paraguay, Peru, Uruguay, and Venezuela.
4955
5056
## Preview tenant
51-
If you had created a B2C tenant during Azure AD B2C's preview period, it is likely that your **Tenant type** says **Preview tenant**. If this is the case, you MUST use your tenant only for development and testing purposes, and NOT for production apps.
5257

53-
> [!IMPORTANT]
54-
> There is no migration path from a preview B2C tenant to a production-scale B2C tenant. Note that there are known issues when you delete a preview B2C tenant and re-create a production-scale B2C tenant with the same domain name. You have to create a production-scale B2C tenant with a different domain name.
58+
If you had created a B2C tenant during Azure AD B2C's preview period, it's likely that your **Tenant type** says **Preview tenant**.
59+
60+
If this is the case, you must use your tenant ONLY for development and testing purposes. DO NOT use a preview tenant for production applications.
61+
62+
**There is no migration path** from a preview B2C tenant to a production-scale B2C tenant. You must create a new B2C tenant for your production applications.
5563

64+
There are known issues when you delete a preview B2C tenant and create a production-scale B2C tenant with the same domain name. *You must create a production-scale B2C tenant with a different domain name*.
5665

57-
![Screenshot of a preview tenant](./media/active-directory-b2c-reference-tenant-type/preview-b2c-tenant.png)
66+
![Screenshot of a preview tenant](./media/active-directory-b2c-reference-tenant-type/preview-b2c-tenant.png)
-64.8 KB
Loading

articles/active-directory/develop/authentication-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Depending on how your client is built, it can use one (or several) of the authen
6565
|-----|----------|----------|--------------|---------------|--------------------|
6666
|[Authorization code flow](v2-oauth2-auth-code-flow.md) | | x | x | x | x|
6767
|[Implicit flow](v2-oauth2-implicit-grant-flow.md) | | x | x | | |
68-
|[Hybrid OIDC flow](v2-protocols-oidc.md#get-access-tokens)| | x | | | | x|
68+
|[Hybrid OIDC flow](v2-protocols-oidc.md#get-access-tokens)| | x | | | x |
6969
|[Refresh token redemption](v2-oauth2-auth-code-flow.md#refresh-the-access-token) | refresh token | x | x | x| |
7070
|[On-behalf-of flow](v2-oauth2-on-behalf-of-flow.md) | access token| x| x| x| |
7171
|[Device code flow](v2-oauth2-device-code.md) | | x| x| x| |

articles/active-directory/fundamentals/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ If you need additional permissions or resources supported, which you don’t cur
8787
New provisioning logs are available to help you monitor and troubleshoot the user and group provisioning deployment. These new log files include information about:
8888

8989
- What groups were successfully created in [ServiceNow](https://docs.microsoft.com/azure/active-directory/saas-apps/servicenow-provisioning-tutorial)
90-
- What roles were imported from [Amazon Web Services (AWS)](https://docs.microsoft.com/azure/active-directory/saas-apps/amazon-web-service-tutorial#configure-and-test-azure-ad-single-sign-on)
90+
- What roles were imported from [Amazon Web Services (AWS)](https://docs.microsoft.com/azure/active-directory/saas-apps/amazon-web-service-tutorial#configure-and-test-azure-ad-single-sign-on-for-amazon-web-services-aws)
9191
- What employees weren't imported from [Workday](https://docs.microsoft.com/azure/active-directory/saas-apps/workday-inbound-tutorial)
9292

9393
For more information, see [Provisioning reports in the Azure Active Directory portal (preview)](https://docs.microsoft.com/azure/active-directory/reports-monitoring/concept-provisioning-logs).

articles/active-directory/saas-apps/idc-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
9191
1. Click **Set additional URLs** and perform the following steps if you wish to configure the application in **SP** initiated mode:
9292

9393
In the **Sign-on URL** text box, type a URL:
94-
`https://cas.idc.com/saml-welcome/AzureAppDirectory`
94+
`https://www.idc.com/saml-welcome/<SamlWelcomeCode>`
9595

9696
> [!NOTE]
9797
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [IDC Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
@@ -140,7 +140,7 @@ To configure single sign-on on **IDC** side, you need to send the downloaded **F
140140

141141
### Create IDC test user
142142

143-
In this section, you create a user called Britta Simon in IDC. Work with [IDC support team](mailto:[email protected]) to add the users in the IDC platform. Users must be created and activated before you use single sign-on.
143+
A user does not have to be created in IDC in advance. The user will created automatically once he uses single sign-on for the first time.
144144

145145
## Test SSO
146146

articles/api-management/api-management-access-restriction-policies.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ The `rate-limit` policy prevents API usage spikes on a per subscription basis by
118118

119119
| Name | Description | Required |
120120
| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
121-
| set-limit | Root element. | Yes |
121+
| rate-limit | Root element. | Yes |
122122
| api | Add one or more of these elements to impose a call rate limit on APIs within the product. Product and API call rate limits are applied independently. API can be referenced either via `name` or `id`. If both attributes are provided, `id` will be used and `name` will be ignored. | No |
123123
| operation | Add one or more of these elements to impose a call rate limit on operations within an API. Product, API, and operation call rate limits are applied independently. Operation can be referenced either via `name` or `id`. If both attributes are provided, `id` will be used and `name` will be ignored. | No |
124124

@@ -181,9 +181,9 @@ In the following example, the rate limit is keyed by the caller IP address.
181181

182182
### Elements
183183

184-
| Name | Description | Required |
185-
| --------- | ------------- | -------- |
186-
| set-limit | Root element. | Yes |
184+
| Name | Description | Required |
185+
| ----------------- | ------------- | -------- |
186+
| rate-limit-by-key | Root element. | Yes |
187187

188188
### Attributes
189189

articles/azure-cache-for-redis/cache-java-get-started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: cache
1515
ms.workload: tbd
1616
ms.date: 05/23/2018
1717
ms.author: yegu
18-
ms.custom: mvc, seo-java-august2019
18+
ms.custom: mvc, seo-java-august2019, seo-java-september2019
1919
#Customer intent: As a Java developer, new to Azure Cache for Redis, I want to create a new Java app that uses Azure Cache for Redis.
2020
---
2121

@@ -132,7 +132,7 @@ mvn exec:java -D exec.mainClass=example.demo.App
132132

133133
In the example below, you can see the `Message` key previously had a cached value, which was set using the Redis Console in the Azure portal. The app updated that cached value. The app also executed the `PING` and `CLIENT LIST` commands.
134134

135-
![Cache app completed](./media/cache-java-get-started/cache-app-complete.png)
135+
![Azure Cache for Redis app completed](./media/cache-java-get-started/azure-cache-redis-complete.png)
136136

137137
## Clean up resources
138138

@@ -148,7 +148,7 @@ Otherwise, if you are finished with the quickstart sample application, you can d
148148

149149
1. In the **Filter by name** textbox, type the name of your resource group. The instructions for this article used a resource group named *TestResources*. On your resource group in the result list, select **...** then **Delete resource group**.
150150

151-
![Delete](./media/cache-java-get-started/cache-delete-resource-group.png)
151+
![Azure resource group deleted](./media/cache-java-get-started/azure-cache-redis-delete-resource-group.png)
152152

153153
1. You will be asked to confirm the deletion of the resource group. Type the name of your resource group to confirm, and select **Delete**.
154154

0 commit comments

Comments
 (0)