Skip to content

Commit 1e0abef

Browse files
authored
Merge pull request #112243 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 e622d2b + 62396ff commit 1e0abef

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

articles/active-directory/devices/overview.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ To get a device in Azure AD, you have multiple options:
5252

5353
![Devices displayed in Azure AD Devices blade](./media/overview/azure-active-directory-devices-all-devices.png)
5454

55+
> [!NOTE]
56+
> A hybrid state refers to more than just the state of a device. For a hybrid state to be valid, a valid Azure AD user also is required.
57+
5558
## Device management
5659

5760
Devices in Azure AD can be managed using Mobile Device Management (MDM) tools like Microsoft Intune, Microsoft Endpoint Configuration Manager, Group Policy (hybrid Azure AD join), Mobile Application Management (MAM) tools, or other third-party tools.
@@ -63,6 +66,8 @@ Registering and joining devices to Azure AD gives your users Seamless Sign-on (S
6366
> [!NOTE]
6467
> Device-based Conditional Access policies require either hybrid Azure AD joined devices or compliant Azure AD joined or Azure AD registered devices.
6568
69+
The primary refresh token (PRT) contains information about the device and is required for SSO. If you have a device-based Conditional Access policy set on an application, without the PRT, access is denied. Hybrid Conditional Access policies require a hybrid state device and a valid user who is signed in.
70+
6671
Devices that are Azure AD joined or hybrid Azure AD joined benefit from SSO to your organization's on-premises resources as well as cloud resources. More information can be found in the article, [How SSO to on-premises resources works on Azure AD joined devices](azuread-join-sso.md).
6772

6873
## Device security

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8181
1. On the **Basic SAML Configuration** section, if you wish to configure the application in **IDP** initiated mode, enter the values for the following fields:
8282

8383
a. In the **Identifier** text box, type a URL using the following pattern:
84-
`https://app.ally.io/saml/consume/<CUSTOM_GUID>`
84+
`https://app.ally.io/saml/consume/<CUSTOM_UUID>`
8585

8686
b. In the **Reply URL** text box, type a URL using the following pattern:
87-
`https://app.ally.io/saml/consume/<CUSTOM_GUID>`
87+
`https://app.ally.io/saml/consume/<CUSTOM_UUID>`
8888

8989
1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
9090

9191
In the **Sign-on URL** text box, type a URL:
92-
`https://app.ally.io/saml/consume/<CUSTOM_GUID>`
92+
`https://app.ally.io/saml/consume/<CUSTOM_UUID>`
9393

9494
> [!NOTE]
9595
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [Ally 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.

articles/active-directory/saas-apps/mongodb-cloud-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To learn more about software as a service (SaaS) app integration with Azure AD,
3434
To get started, you need:
3535

3636
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
37-
* A MongoDB Cloud subscription that is enabled for single sign-on (SSO).
37+
* A MongoDB Cloud organization that is enabled for single sign-on (SSO), you can signup for a [free cluster](https://www.mongodb.com/cloud)
3838

3939
## Scenario description
4040

@@ -146,7 +146,7 @@ In this section, you enable B.Simon to use Azure single sign-on by granting acce
146146

147147
## Configure MongoDB Cloud SSO
148148

149-
To configure single sign-on on the MongoDB Cloud side, you need the appropriate URLs copied from the Azure portal. You also need to configure the Federation Application for your MongoDB Cloud Organization. Follow the instructions in the [MongoDB Cloud documentation](https://docs.atlas.mongodb.com/security/federated-authentication/index.html). If you have a problem, contact the [MongoDB Cloud support team](https://support.mongodb.com/).
149+
To configure single sign-on on the MongoDB Cloud side, you need the appropriate URLs copied from the Azure portal. You also need to configure the Federation Application for your MongoDB Cloud Organization. Follow the instructions in the [MongoDB Cloud documentation](https://docs.atlas.mongodb.com/security/federated-auth-azure-ad/). If you have a problem, contact the [MongoDB Cloud support team](https://support.mongodb.com/).
150150

151151
### Create a MongoDB Cloud test user
152152

articles/aks/use-managed-identity.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ AKS creates two managed identities:
2020
- **System-assigned managed identity**: The identity that the Kubernetes cloud provider uses to create Azure resources on behalf of the user. The life cycle of the system-assigned identity is tied to that of the cluster. The identity is deleted when the cluster is deleted.
2121
- **User-assigned managed identity**: The identity that's used for authorization in the cluster. For example, the user-assigned identity is used to authorize AKS to use Azure Container Registries (ACRs), or to authorize the kubelet to get metadata from Azure.
2222

23-
Add-ons also authenticate using a managed identity. For each add-on, a managed identity is created by AKS and lasts for the life of the add-on. For creating and using your own VNet, static IP address, or attached Azure disk where the resources are outside of the MC_* resource group, use the PrincipalID of the cluster to perform a role assignment. For more information on role assignment, see [Delegate access to other Azure resources](kubernetes-service-principal.md#delegate-access-to-other-azure-resources).
23+
Add-ons also authenticate using a managed identity. For each add-on, a managed identity is created by AKS and lasts for the life of the add-on.
2424

2525
## Before you begin
2626

@@ -54,6 +54,9 @@ A successful cluster creation using managed identities contains this service pri
5454
}
5555
```
5656

57+
> [!NOTE]
58+
> For creating and using your own VNet, static IP address, or attached Azure disk where the resources are outside of the MC_* resource group, use the PrincipalID of the cluster System Assigned Managed Identity to perform a role assignment. For more information on role assignment, see [Delegate access to other Azure resources](kubernetes-service-principal.md#delegate-access-to-other-azure-resources).
59+
5760
Finally, get credentials to access the cluster:
5861

5962
```azurecli-interactive

articles/dns/dns-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Navigate to your DNS Zone and click **+ Record set**. Fill out the following inf
129129
|TTL unit | Hours | Hours are used as the time measurement |
130130
|Alias | asverify.adatumfunctiona9ed.blob.core.windows.net | The DNS name you are creating the alias for, in this example it is the asverify.adatumfunctiona9ed.blob.core.windows.net DNS name provided by default to the storage account. |
131131

132-
Navigate back to your storage account by clicking **Storage** > **Storage Accounts**, select your storage account and click **Custom domain**. Type in the alias you created without the asverify prefix in the text box, check **Use indirect CNAME validation, and click **Save**. Once this step is complete, return to your DNS zone and create a CNAME record without the asverify prefix. After that point, you are safe to delete the CNAME record with the cdnverify prefix.
132+
Navigate back to your storage account by clicking **Storage** > **Storage Accounts**, select your storage account and click **Custom domain**. Type in the alias you created without the asverify prefix in the text box, check **Use indirect CNAME validation**, and click **Save**. Once this step is complete, return to your DNS zone and create a CNAME record without the asverify prefix. After that point, you are safe to delete the CNAME record with the cdnverify prefix.
133133

134134
![blob storage custom domain](./media/dns-custom-domain/indirectvalidate.png)
135135

articles/machine-learning/how-to-schedule-pipelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ If the pipeline was constructed with a [DataPath](https://docs.microsoft.com/pyt
8888
```python
8989
datastore = Datastore(workspace=ws, name="workspaceblobstore")
9090

91-
reactive_schedule = Schedule.create(ws, name="MyReactiveSchedule", description="Based on time",
91+
reactive_schedule = Schedule.create(ws, name="MyReactiveSchedule", description="Based on input file change.",
9292
pipeline_id=pipeline_id, experiment_name=experiment_name, datastore=datastore, data_path_parameter_name="input_data")
9393
```
9494

0 commit comments

Comments
 (0)