Skip to content

Commit 3288624

Browse files
authored
Merge pull request #101107 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 c8e4240 + e28a187 commit 3288624

File tree

34 files changed

+502
-967
lines changed

34 files changed

+502
-967
lines changed

articles/active-directory-b2c/contentdefinitions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The following example shows the content definition identifier and the definition
3333
<Metadata>
3434
<Item Key="DisplayName">Local account sign up page</Item>
3535
</Metadata>
36-
<LoalizedResourcesReferences MergeBehavior="Prepend">
36+
<LocalizedResourcesReferences MergeBehavior="Prepend">
3737
<LocalizedResourcesReference Language="en" LocalizedResourcesReferenceId="api.localaccountsignup.en" />
3838
<LocalizedResourcesReference Language="es" LocalizedResourcesReferenceId="api.localaccountsignup.es" />
3939
...

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ The following Windows distributions are currently supported during the preview o
4646
- Windows Server 2019 Datacenter
4747
- Windows 10 1809 and later
4848

49+
> [!IMPORTANT]
50+
> Remote connection to VMs joined to Azure AD is only allowed from Windows 10 PCs that are Azure AD joined or hybrid Azure AD joined to the **same** directory as the VM.
51+
4952
The following Azure regions are currently supported during the preview of this feature:
5053

5154
- All Azure global regions

articles/active-directory/saas-apps/adobe-creative-cloud-tutorial.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ ms.collection: M365-identity-device-management
2222

2323
# Tutorial: Azure Active Directory single sign-on (SSO) integration with Adobe Creative Cloud
2424

25+
> [!NOTE]
26+
> This article describes Adobe Admin Console's custom SAML-based setup for Azure Active Directory (Azure AD). For brand-new configurations, we recommend that you use the [Azure AD Connector](https://helpx.adobe.com/enterprise/using/sso-setup-azure.html). Azure AD Connector can be set up in minutes and shortens the process of domain claim, single sign-on setup, and user sync.
27+
2528
In this tutorial, you'll learn how to integrate Adobe Creative Cloud with Azure Active Directory (Azure AD). When you integrate Adobe Creative Cloud with Azure AD, you can:
2629

2730
* Control in Azure AD who has access to Adobe Creative Cloud.
@@ -108,7 +111,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
108111
> [!NOTE]
109112
> Users need to have a valid Office 365 ExO license for email claim value to be populated in the SAML response.
110113

111-
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
114+
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Federation Data XML**, and then select **Download** to download the XML metadata file and save it on your computer.
112115

113116
![The Certificate download link](common/certificatebase64.png)
114117

@@ -148,31 +151,26 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
148151

149152
## Configure Adobe Creative Cloud SSO
150153

151-
1. In a different web browser window, sign-in to [Adobe Admin Console](https://adminconsole.adobe.com) as an administrator.
152-
153-
2. Go to **Settings** on the top navigation bar and then choose **Identity**. The list of domains opens. Click **Configure** link against your domain. Then perform the following steps on **Single Sign On Configuration Required** section. For more information, see [Setup a domain](https://helpx.adobe.com/enterprise/using/set-up-domain.html)
154-
155-
![Settings](https://helpx.adobe.com/content/dam/help/en/enterprise/using/configure-microsoft-azure-with-adobe-sso/_jcr_content/main-pars/procedure_719391630/proc_par/step_3/step_par/image/edit-sso-configuration.png "Settings")
154+
1. In a different web browser window, sign in to [Adobe Admin Console](https://adminconsole.adobe.com) as a system administrator.
156155

157-
a. Click **Browse** to upload the downloaded certificate from Azure AD to **IDP Certificate**.
156+
1. Go to **Settings** on the top navigation bar, and then choose **Identity**. The list of directories opens. Select the Federated directory you want.
158157

159-
b. In the **IDP issuer** textbox, paste the value of **Azure AD Identifier** which you copied from Azure portal.
158+
1. On the **Directory Details** page, select **Configure**.
160159

161-
c. In the **IDP Login URL** textbox, paste the value of **Login URL** which you copied from Azure portal.
160+
1. Copy the Entity ID and the ACS URL (Assertion Consumer Service URL or Reply URL). Enter the URLs at the appropriate fields in the Azure portal.
162161

163-
d. Select **HTTP - Redirect** as **IDP Binding**.
162+
![Configure single sign-on on the app side](./media/adobe-creative-cloud-tutorial/tutorial_adobe-creative-cloud_003.png)
164163

165-
e. Select **Email Address** as **User Login Setting**.
164+
a. Use the Entity ID value Adobe provided you for **Identifier** in the **Configure App Settings** dialog box.
166165

167-
f. Click **Save** button.
166+
b. Use the ACS URL (Assertion Consumer Service URL) value Adobe provided you for **Reply URL** in the **Configure App Settings** dialog box.
168167

169-
3. The dashboard will now present the XML **"Download Metadata"** file. It contains Adobe’s EntityDescriptor URL and AssertionConsumerService URL. Please open the file and configure them in the Azure AD application.
168+
1. Near the bottom of the page, upload the **Federation Data XML** file that you downloaded from the Azure portal.
170169

171-
![Configure Single Sign-On On App Side](./media/adobe-creative-cloud-tutorial/tutorial_adobe-creative-cloud_003.png)
170+
![Federation Data XML file](https://helpx.adobe.com/content/dam/help/en/enterprise/kb/configure-microsoft-azure-with-adobe-sso/jcr_content/main-pars/procedure/proc_par/step_228106403/step_par/image_copy/saml_signinig_certificate.png "IdP Metadata XML")
172171

173-
a. Use the EntityDescriptor value Adobe provided you for **Identifier** on the **Configure App Settings** dialog.
172+
1. Select **Save**.
174173

175-
b. Use the AssertionConsumerService value Adobe provided you for **Reply URL** on the **Configure App Settings** dialog.
176174

177175
### Create Adobe Creative Cloud test user
178176

@@ -205,7 +203,7 @@ When you click the Adobe Creative Cloud tile in the Access Panel, you should be
205203

206204
- [Try Adobe Creative Cloud with Azure AD](https://aad.portal.azure.com/)
207205

208-
- [Set up a domain (adobe.com)](https://helpx.adobe.com/enterprise/using/set-up-domain.html)
206+
- [Set up an identity (adobe.com)](https://helpx.adobe.com/enterprise/using/set-up-identity.html)
209207

210208
- [Configure Azure for use with Adobe SSO (adobe.com)](https://helpx.adobe.com/enterprise/kb/configure-microsoft-azure-with-adobe-sso.html)
211209

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,15 @@ To configure Azure AD single sign-on with &frankly, perform the following steps:
122122

123123
![The Certificate download link](common/metadataxml.png)
124124

125-
7. On the **Set up &frankly** section, copy the appropriate URL(s) as per your requirement.
126125

127-
![Copy configuration URLs](common/copy-configuration-urls.png)
126+
### Configure &frankly single sign-on
128127

129-
a. Login URL
128+
To enable single sign-on in &frankly:
130129

131-
b. Azure Ad Identifier
132-
133-
c. Logout URL
134-
135-
### Configure &frankly Single Sign-On
136-
137-
To configure single sign-on on **&frankly** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [&frankly support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
130+
1. Log in to &frankly. Go to **Account** > **User Management**.
131+
1. Change the authentication mechanism from the default to **Enterprise Sign-on (SAML)**.
132+
1. Upload the **Federation Metadata XML** that you downloaded in step 6 in the preceding section.
133+
1. Select **Save**.
138134

139135
### Create an Azure AD test user
140136

@@ -203,4 +199,4 @@ When you click the &frankly tile in the Access Panel, you should be automaticall
203199

204200
- [What is application access and single sign-on with Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
205201

206-
- [What is Conditional Access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
202+
- [What is Conditional Access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)

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

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,24 +61,8 @@ To get started, you need the following items:
6161
As of now, following versions of Confluence are supported:
6262

6363
- Confluence: 5.0 to 5.10
64-
- Confluence: 6.0.1
65-
- Confluence: 6.1.1
66-
- Confluence: 6.2.1
67-
- Confluence: 6.3.4
68-
- Confluence: 6.4.0
69-
- Confluence: 6.5.0
70-
- Confluence: 6.6.2
71-
- Confluence: 6.7.0
72-
- Confluence: 6.8.1
73-
- Confluence: 6.9.0
74-
- Confluence: 6.10.0
75-
- Confluence: 6.10.3
76-
- Confluence: 6.11.0
77-
- Confluence: 6.12.0
78-
- Confluence: 6.13.5
79-
- Confluence: 6.15.3
80-
- Confluence: 6.15.4
81-
- Confluence: 6.15.8
64+
- Confluence: 6.0.1 to 6.15.9
65+
- Confluence: 7.0.1 to 7.1.0
8266

8367
> [!NOTE]
8468
> Please note that our Confluence Plugin also works on Ubuntu Version 16.04
@@ -283,4 +267,4 @@ When you click the Confluence SAML SSO by Microsoft tile in the Access Panel, yo
283267

284268
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
285269

286-
- [Try Confluence SAML SSO by Microsoft with Azure AD](https://aad.portal.azure.com/)
270+
- [Try Confluence SAML SSO by Microsoft with Azure AD](https://aad.portal.azure.com/)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8989

9090
### Configure Kallidus
9191

92-
To configure single sign-on on **Kallidus** side, you need to send the **App Federation Metadata Url** to [Kallidus support team](https://kallidus.zendesk.com). They set this setting to have the SAML SSO connection set properly on both sides.
92+
To configure single sign-on on **Kallidus** side, you need to send the **App Federation Metadata Url** and a copy of the **Signing Certificate (Public)** to [Kallidus support team](https://kallidus.zendesk.com). They set this setting to have the SAML SSO connection set properly on both sides.
9393

9494
### Create an Azure AD test user
9595

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ To configure Azure AD single sign-on with Snowflake, perform the following steps
115115

116116
In the **Sign-on URL** text box, type a URL using the following pattern:
117117
`https://<SNOWFLAKE-URL>.snowflakecomputing.com`
118+
119+
In the **Logout URL** text box, type a URL using the following pattern:
120+
`https://<SNOWFLAKE-URL>.snowflakecomputing.com/fed/logout`
118121

119122
> [!NOTE]
120123
> These values are not real. Update these values with the actual Identifier, Reply URL and Sign-on URL. Contact [Snowflake Client support team](https://support.snowflake.net/s/) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.

articles/aks/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ For more information, see [Plan IP addressing for your cluster](configure-azure-
4141
There might be various reasons for the pod being stuck in that mode. You might look into:
4242

4343
* The pod itself, by using `kubectl describe pod <pod-name>`.
44-
* The logs, by using `kubectl log <pod-name>`.
44+
* The logs, by using `kubectl logs <pod-name>`.
4545

4646
For more information on how to troubleshoot pod problems, see [Debug applications](https://kubernetes.io/docs/tasks/debug-application-cluster/debug-application/#debugging-pods).
4747

articles/api-management/api-management-howto-protect-backend-with-aad.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ You can use the [Validate JWT](api-management-access-restriction-policies.md#Val
203203
</required-claims>
204204
</validate-jwt>
205205
```
206+
> [!NOTE]
207+
> This `openid-config` URL corresponds to the v1 endpoint. For the v2 `openid-config`endpoint, use
208+
> `https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration`.
206209
207210
## Build an application to call the API
208211

articles/automation/automation-hybrid-runbook-worker.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ If you have an Automation account that's defined for a specific region, you can
118118
| South East Asia |sea-jobruntimedata-prod-su1.azure-automation.net</br>sea-agentservice-prod-1.azure-automation.net|
119119
| Central India |cid-jobruntimedata-prod-su1.azure-automation.net</br>cid-agentservice-prod-1.azure-automation.net |
120120
| Japan East |jpe-jobruntimedata-prod-su1.azure-automation.net</br>jpe-agentservice-prod-1.azure-automation.net |
121+
| Australia Central |ac-jobruntimedata-prod-su1.azure-automation.net</br>ac-agentservice-prod-1.azure-automation.net |
121122
| Australia East |ae-jobruntimedata-prod-su1.azure-automation.net</br>ae-agentservice-prod-1.azure-automation.net |
122123
| Australia South East |ase-jobruntimedata-prod-su1.azure-automation.net</br>ase-agentservice-prod-1.azure-automation.net |
123124
| UK South | uks-jobruntimedata-prod-su1.azure-automation.net</br>uks-agentservice-prod-1.azure-automation.net |

0 commit comments

Comments
 (0)