Skip to content

Commit 5d28d5e

Browse files
authored
Merge pull request #57904 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents a373393 + bf1e13f commit 5d28d5e

21 files changed

+60
-30
lines changed

articles/active-directory-b2c/active-directory-b2c-setup-commonaad-custom.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.component: B2C
1717

1818
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
1919

20-
This article shows you how to enable sign-in for users using the multi-tenant endpoint for Azure Active Directory (Azure AD) by using [custom policies](active-directory-b2c-overview-custom.md) in Azure AD B2c. This allows users from multiple Azure AD tenants to sign into Azure AD B2C without configuring a technical provider for each tenant. However, guest members in any of these tenants **will not** be able to sign in. For that, you need to [individually configure each tenant](active-directory-b2c-setup-aad-custom.md).
20+
This article shows you how to enable sign-in for users using the multi-tenant endpoint for Azure Active Directory (Azure AD) by using [custom policies](active-directory-b2c-overview-custom.md) in Azure AD B2C. This allows users from multiple Azure AD tenants to sign into Azure AD B2C without configuring a technical provider for each tenant. However, guest members in any of these tenants **will not** be able to sign in. For that, you need to [individually configure each tenant](active-directory-b2c-setup-aad-custom.md).
2121

2222
>[!NOTE]
2323
>`Contoso.com` is used for the organizational Azure AD tenant and `fabrikamb2c.onmicrosoft.com` is used as the Azure AD B2C tenant in the following instructions.
@@ -181,7 +181,7 @@ Now that you have a button in place, you need to link it to an action. The actio
181181
182182
## Create an Azure AD B2C application
183183
184-
Communication with Azure AD B2c occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
184+
Communication with Azure AD B2C occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
185185
186186
1. Sign in to the [Azure portal](https://portal.azure.com).
187187
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.

articles/active-directory-b2c/saml-technical-profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Azure Active Directory (Azure AD) B2C provides support for the SAML 2.0 identity
2121

2222
## Metadata exchange
2323

24-
Metadata is information used in the SAML protocol to expose the configuration of a SAML party, such as a service provider or identity provider. Metadata defines the location of the services, such as sign-in and sign-out, certificates, sign-in method, and more. The identity provider uses the metadata to know how to communicate with Azure AD B2C. The metadata is configured in XML format and may be signed with a digital signature so that the other party can validate the integrity of the metadata. When Azure AD B2C federates with a SAML identity provider, it acts as a service provider initiating a SAML request and waiting for a SAML response. And, in some cases, excepts unsolicited SAML authentication, which is also known as identity provider initiated.
24+
Metadata is information used in the SAML protocol to expose the configuration of a SAML party, such as a service provider or identity provider. Metadata defines the location of the services, such as sign-in and sign-out, certificates, sign-in method, and more. The identity provider uses the metadata to know how to communicate with Azure AD B2C. The metadata is configured in XML format and may be signed with a digital signature so that the other party can validate the integrity of the metadata. When Azure AD B2C federates with a SAML identity provider, it acts as a service provider initiating a SAML request and waiting for a SAML response. And, in some cases, accepts unsolicited SAML authentication, which is also known as identity provider initiated.
2525

2626
The metadata can be configured in both parties as "Static Metadata" or "Dynamic Metadata". In static mode, you copy the entire metadata from one party and set it in the other party. In dynamic mode, you set the URL to the metadata while the other party reads the configuration dynamically. The principles are the same, you set the metadata of the Azure AD B2C technical profile in your identity provider and set the metadata of the identity provider in Azure AD B2C.
2727

articles/active-directory/saas-apps/slack-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Before configuring and enabling the provisioning service, you will need to decid
5454

5555
This section guides you through connecting your Azure AD to Slack's user account provisioning API, and configuring the provisioning service to create, update and disable assigned user accounts in Slack based on user and group assignment in Azure AD.
5656

57-
**Tip:** You may also choose to enabled SAML-based Single Sign-On for Slack, following the instructions provided in (Azure portal)[https://portal.azure.com]. Single sign-on can be configured independently of automatic provisioning, though these two features compliment each other.
57+
**Tip:** You may also choose to enabled SAML-based Single Sign-On for Slack, following the instructions provided in [Azure portal](https://portal.azure.com). Single sign-on can be configured independently of automatic provisioning, though these two features compliment each other.
5858

5959

6060
### To configure automatic user account provisioning to Slack in Azure AD:

articles/aks/view-master-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ To help analyze the log data, the following table details the schema used for ea
112112
| *resourceId* | Azure resource that produced the log |
113113
| *time* | Timestamp of when the log was uploaded |
114114
| *category* | Name of container/component generating the log |
115-
| *operationName* | Always *Microsoft.ContainerService/managedClusters/diagnositicLogs/Read* |
115+
| *operationName* | Always *Microsoft.ContainerService/managedClusters/diagnosticLogs/Read* |
116116
| *properties.log* | Full text of the log from the component |
117117
| *properties.stream* | *stderr* or *stdout* |
118118
| *properties.pod* | Pod name that the log came from |

articles/api-management/import-api-app-as-api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ In this article, you learn how to:
3030
## Prerequisites
3131

3232
+ Complete the following quickstart: [Create an Azure API Management instance](get-started-create-service-instance.md)
33-
+ Make sure there is an API App in your subscription. For more information, see [App Service Documentation][https://docs.microsoft.com/azure/app-service/]
33+
+ Make sure there is an API App in your subscription. For more information, see [App Service Documentation](https://docs.microsoft.com/azure/app-service/)
3434

3535
[!INCLUDE [api-management-navigate-to-instance.md](../../includes/api-management-navigate-to-instance.md)]
3636

@@ -39,7 +39,7 @@ In this article, you learn how to:
3939
1. Select **APIs** from under **API MANAGEMENT**.
4040
2. Select **API App** from the **Add a new API** list.
4141

42-
!(API app)[./media/import-api-app-as-api/api-app.png]
42+
![API app](./media/import-api-app-as-api/api-app.png)
4343
3. Press **Browse** to see the list of API Apps in your subscription.
4444
4. Select the app. APIM finds the swagger associated with the selected app, fetches it, and imports it.
4545

@@ -90,4 +90,4 @@ Operations can also be called **Developer portal** to test APIs.
9090
## Next steps
9191

9292
> [!div class="nextstepaction"]
93-
> [Transform and protect a published API](transform-api.md)
93+
> [Transform and protect a published API](transform-api.md)

articles/app-service/web-sites-staged-publishing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Set up staging environments for web apps in Azure App Service | Microsoft Docs
33
description: Learn how to use staged publishing for web apps in Azure App Service.
44
services: app-service
@@ -21,7 +21,7 @@ ms.author: cephalin
2121
# Set up staging environments in Azure App Service
2222
<a name="Overview"></a>
2323

24-
When you deploy your web app, web app on Linux, mobile back end, and API app to [App Service](https://go.microsoft.com/fwlink/?LinkId=529714), you can deploy to a separate deployment slot instead of the default production slot when running in the **Standard** or **Premium** App Service plan tier. Deployment slots are actually live apps with their own hostnames. App content and configurations elements can be swapped between two deployment slots, including the production slot. Deploying your application to a deployment slot has the following benefits:
24+
When you deploy your web app, web app on Linux, mobile back end, and API app to [App Service](https://go.microsoft.com/fwlink/?LinkId=529714), you can deploy to a separate deployment slot instead of the default production slot when running in the **Standard**, **Premium**, or **Isolated** App Service plan tier. Deployment slots are actually live apps with their own hostnames. App content and configurations elements can be swapped between two deployment slots, including the production slot. Deploying your application to a deployment slot has the following benefits:
2525

2626
* You can validate app changes in a staging deployment slot before swapping it with the production slot.
2727
* Deploying an app to a slot first and swapping it into production ensures that all instances of the slot are warmed up before being swapped into production. This eliminates downtime when you deploy your app. The traffic redirection is seamless, and no requests are dropped as a result of swap operations. This entire workflow can be automated by configuring [Auto Swap](#Auto-Swap) when pre-swap validation is not needed.
@@ -32,15 +32,15 @@ Each App Service plan tier supports a different number of deployment slots. To f
3232
<a name="Add"></a>
3333

3434
## Add a deployment slot
35-
The app must be running in the **Standard** or **Premium** tier in order for you to enable multiple deployment slots.
35+
The app must be running in the **Standard**, **Premium**, or **Isolated* tier in order for you to enable multiple deployment slots.
3636

3737
1. In the [Azure Portal](https://portal.azure.com/), open your app's [resource blade](../azure-resource-manager/resource-group-portal.md#manage-resources).
3838
2. Choose the **Deployment slots** option, then click **Add Slot**.
3939

4040
![Add a new deployment slot][QGAddNewDeploymentSlot]
4141

4242
> [!NOTE]
43-
> If the app is not already in the **Standard** or **Premium** tier, you will receive a message indicating the supported tiers for enabling staged publishing. At this point, you have the option to select **Upgrade** and navigate to the **Scale** tab of your app before continuing.
43+
> If the app is not already in the **Standard**, **Premium**, or **Isolated* tier, you will receive a message indicating the supported tiers for enabling staged publishing. At this point, you have the option to select **Upgrade** and navigate to the **Scale** tab of your app before continuing.
4444
>
4545
>
4646
3. In the **Add a slot** blade, give the slot a name, and select whether to clone app configuration from another existing deployment slot. Click the check mark to continue.

articles/azure-databricks/databricks-sentiment-analysis-cognitive-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ After you have finished running the tutorial, you can terminate the cluster. To
574574

575575
![Stop a Databricks cluster](./media/databricks-sentiment-analysis-cognitive-services/terminate-databricks-cluster.png "Stop a Databricks cluster")
576576

577-
If you do not manually terminate the cluster it will automatically stop, provided you selected the **Terminate after __ minutes of inactivity** checkbox while creating the cluster. In such a case, the cluster will automatically stop if it has been inactive for the specified time.
577+
If you do not manually terminate the cluster it will automatically stop, provided you selected the **Terminate after \_\_ minutes of inactivity** checkbox while creating the cluster. In such a case, the cluster will automatically stop if it has been inactive for the specified time.
578578

579579
## Next steps
580580
In this tutorial, you learned how to use Azure Databricks to stream data into Azure Event Hubs and then read the streaming data from Event Hubs in real time. You learned how to:

articles/backup/backup-upgrade-to-vm-backup-stack-v2.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,42 @@ Run the following cmdlets from an elevated PowerShell terminal:
8181
```
8282
PS C:> Register-AzureRmProviderFeature -FeatureName "InstantBackupandRecovery" –ProviderNamespace Microsoft.RecoveryServices
8383
```
84+
### CLI
85+
Run the following commands from a shell:
86+
1. Sign in to your Azure account:
87+
88+
```
89+
az login
90+
```
91+
92+
2. Select the subscription that you want to register:
93+
94+
```
95+
az account set --subscription "Subscription Name"
96+
```
97+
98+
3. Register this subscription:
99+
100+
```
101+
az feature register --namespace Microsoft.RecoveryServices --name InstantBackupandRecovery
102+
```
84103

85104
## Verify that the upgrade is finished
105+
### PowerShell
86106
From an elevated PowerShell terminal, run the following cmdlet:
87107

88108
```
89109
Get-AzureRmProviderFeature -FeatureName "InstantBackupandRecovery" –ProviderNamespace Microsoft.RecoveryServices
90110
```
91111

92-
If it says "Registered," then your subscription is upgraded to VM backup stack Resource Manager deployment model.
112+
### CLI
113+
From ashell, run the following command:
114+
115+
```
116+
az feature show --namespace Microsoft.RecoveryServices --name InstantBackupandRecovery
117+
```
118+
119+
If it says "Registered," then your subscription is upgraded to V2 backup stack.
93120

94121
## Frequently asked questions
95122

articles/cosmos-db/change-feed-functions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Azure Functions polls the change feed for changes continuously, with a maximum d
3737

3838
If your document receives multiple changes in the same interval that took the Trigger to poll for new changes, you might receive the latest version of the document and not the intermediate one.
3939

40-
If you want to to poll change feed for less than 5 seconds, for example, for every second, you can configure the polling time "feedPollDelay", see [the complete configuration](https://docs.microsoft.com/dotnet/api/microsoft.azure.documents.client.connectionpolicy.preferredlocations?view=azure-dotnet#Microsoft_Azure_Documents_Client_ConnectionPolicy_PreferredLocations). It is defined in milliseconds with a default of 5000. Polling for less than 1 second is possible but it's not advised because you will start using more CPU memory.
40+
If you want to poll change feed for less than 5 seconds, for example, for every second, you can configure the polling time "feedPollDelay", see [the complete configuration](https://docs.microsoft.com/dotnet/api/microsoft.azure.documents.client.connectionpolicy.preferredlocations?view=azure-dotnet#Microsoft_Azure_Documents_Client_ConnectionPolicy_PreferredLocations). It is defined in milliseconds with a default of 5000. Polling for less than 1 second is possible but it's not advised because you will start using more CPU memory.
4141

4242
### Can multiple Azure Functions read one container’s change feed?
4343

@@ -63,4 +63,4 @@ You can now proceed to learn more about change feed in the following articles:
6363
* [Ways to read change feed](read-change-feed.md)
6464
* [Using change feed processor library](change-feed-processor.md)
6565
* [How to work with change feed processor library](change-feed-processor.md)
66-
* [Serverless database computing using Azure Cosmos DB and Azure Functions](serverless-computing-database.md)
66+
* [Serverless database computing using Azure Cosmos DB and Azure Functions](serverless-computing-database.md)

articles/cosmos-db/database-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Let's dig into each one in detail.
7777
|Encryption at rest|All data stored into Azure Cosmos DB is encrypted at rest. Learn more in [Azure Cosmos DB encryption at rest](.\database-encryption-at-rest.md)|
7878
|Patched servers|As a managed database, Azure Cosmos DB eliminates the need to manage and patch servers, that's done for you, automatically.|
7979
|Administrative accounts with strong passwords|It's hard to believe we even need to mention this requirement, but unlike some of our competitors, it's impossible to have an administrative account with no password in Azure Cosmos DB.<br><br> Security via SSL and HMAC secret based authentication is baked in by default.|
80-
|Security and data protection certifications|For the most up to data list of certifications see the overall (Azure Compliance site)[https://www.microsoft.com/en-us/trustcenter/compliance/complianceofferings] as well as the lastest (Azure Compliance Document)[https://gallery.technet.microsoft.com/Overview-of-Azure-c1be3942] with all certifications (search for Cosmos). For a more focused read check out the April 25th, 2018 post (Azure #CosmosDB: Secure, private, compliant)[https://azure.microsoft.com/blog/azure-cosmosdb-secure-private-compliant/] which includes SOCS 1/2 Type 2, HITRUST, PCI DSS Level 1, ISO 27001, HIPPAA, FedRAMP High, and many others.
80+
|Security and data protection certifications|For the most up to data list of certifications see the overall [Azure Compliance site](https://www.microsoft.com/en-us/trustcenter/compliance/complianceofferings) as well as the lastest [Azure Compliance Document](https://gallery.technet.microsoft.com/Overview-of-Azure-c1be3942) with all certifications (search for Cosmos). For a more focused read check out the April 25th, 2018 post [Azure #CosmosDB: Secure, private, compliant](https://azure.microsoft.com/blog/azure-cosmosdb-secure-private-compliant/) which includes SOCS 1/2 Type 2, HITRUST, PCI DSS Level 1, ISO 27001, HIPPAA, FedRAMP High, and many others.
8181

8282
The following screenshot shows Active directory integration (RBAC) using access control (IAM) in the Azure portal:
8383
![Access control (IAM) in the Azure portal - demonstrating database security](./media/database-security/nosql-database-security-identity-access-management-iam-rbac.png)

0 commit comments

Comments
 (0)