Skip to content

Commit b959bd3

Browse files
authored
Merge pull request #191352 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 21ab9f2 + 6708e7f commit b959bd3

24 files changed

+60
-58
lines changed

articles/active-directory/hybrid/concept-azure-ad-connect-sync-architecture.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ When sync engine finds a staging object that matches by distinguished name but n
170170
* If the object located in the connector space has no anchor, then sync engine removes this object from the connector space and marks the metaverse object it is linked to as **retry provisioning on next synchronization run**. Then it creates the new import object.
171171
* If the object located in the connector space has an anchor, then sync engine assumes that this object has either been renamed or deleted in the connected directory. It assigns a temporary, new distinguished name for the connector space object so that it can stage the incoming object. The old object then becomes **transient**, waiting for the Connector to import the rename or deletion to resolve the situation.
172172

173+
Transient objects are not always a problem, and you might see them even in a healthy environment. With [Azure AD Connect sync V2 endpoint API](how-to-connect-sync-endpoint-api-v2.md), transient objects should auto-resolve in subsequent delta synchronization cycles. A common example where you might find transient objects being generated occurs on Azure AD Connect servers installed in staging mode, when an admin permanently deletes an object directly in Azure AD using PowerShell and later synchronizes the object again.
174+
173175
If sync engine locates a staging object that corresponds to the object specified in the Connector, it determines what kind of changes to apply. For example, sync engine might rename or delete the object in the connected data source, or it might only update the object’s attribute values.
174176

175177
Staging objects with updated data are marked as pending import. Different types of pending imports are available. Depending on the result of the import process, a staging object in the connector space has one of the following pending import types:
Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Tutorial: Azure AD SSO integration with BetterWorks'
3-
description: Learn how to configure single sign-on between Azure Active Directory and BetterWorks.
2+
title: 'Tutorial: Azure AD SSO integration with Betterworks'
3+
description: Learn how to configure single sign-on between Azure Active Directory and Betterworks.
44
services: active-directory
55
author: jeevansd
66
manager: CelesteDG
@@ -13,59 +13,59 @@ ms.date: 10/07/2021
1313
ms.author: jeedes
1414
---
1515

16-
# Tutorial: Azure AD SSO integration with BetterWorks
16+
# Tutorial: Azure AD SSO integration with Betterworks
1717

18-
In this tutorial, you'll learn how to integrate BetterWorks with Azure Active Directory (Azure AD). When you integrate BetterWorks with Azure AD, you can:
18+
In this tutorial, you'll learn how to integrate Betterworks with Azure Active Directory (Azure AD). When you integrate Betterworks with Azure AD, you can:
1919

20-
* Control in Azure AD who has access to BetterWorks.
21-
* Enable your users to be automatically signed-in to BetterWorks with their Azure AD accounts.
20+
* Control in Azure AD who has access to Betterworks.
21+
* Enable your users to be automatically signed-in to Betterworks with their Azure AD accounts.
2222
* Manage your accounts in one central location - the Azure portal.
2323

2424
## Prerequisites
2525

2626
To get started, you need the following items:
2727

2828
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
29-
* BetterWorks single sign-on (SSO) enabled subscription.
29+
* Betterworks single sign-on (SSO) enabled subscription.
3030

3131
## Scenario description
3232

3333
In this tutorial, you configure and test Azure AD SSO in a test environment.
3434

35-
* BetterWorks supports **SP and IDP** initiated SSO.
35+
* Betterworks supports **SP and IDP** initiated SSO.
3636

3737
> [!NOTE]
3838
> Identifier of this application is a fixed string value so only one instance can be configured in one tenant.
3939
40-
## Add BetterWorks from the gallery
40+
## Add Betterworks from the gallery
4141

42-
To configure the integration of BetterWorks into Azure AD, you need to add BetterWorks from the gallery to your list of managed SaaS apps.
42+
To configure the integration of Betterworks into Azure AD, you need to add Betterworks from the gallery to your list of managed SaaS apps.
4343

4444
1. Sign in to the Azure portal using either a work or school account, or a personal Microsoft account.
4545
1. On the left navigation pane, select the **Azure Active Directory** service.
4646
1. Navigate to **Enterprise Applications** and then select **All Applications**.
4747
1. To add new application, select **New application**.
48-
1. In the **Add from the gallery** section, type **BetterWorks** in the search box.
49-
1. Select **BetterWorks** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
48+
1. In the **Add from the gallery** section, type **Betterworks** in the search box.
49+
1. Select **Betterworks** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
5050

51-
## Configure and test Azure AD SSO for BetterWorks
51+
## Configure and test Azure AD SSO for Betterworks
5252

53-
Configure and test Azure AD SSO with BetterWorks using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in BetterWorks.
53+
Configure and test Azure AD SSO with Betterworks using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Betterworks.
5454

55-
To configure and test Azure AD SSO with BetterWorks, perform the following steps:
55+
To configure and test Azure AD SSO with Betterworks, perform the following steps:
5656

5757
1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
5858
1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
5959
1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
60-
1. **[Configure BetterWorks SSO](#configure-betterworks-sso)** - to configure the single sign-on settings on application side.
61-
1. **[Create BetterWorks test user](#create-betterworks-test-user)** - to have a counterpart of B.Simon in BetterWorks that is linked to the Azure AD representation of user.
60+
1. **[Configure Betterworks SSO](#configure-betterworks-sso)** - to configure the single sign-on settings on application side.
61+
1. **[Create Betterworks test user](#create-betterworks-test-user)** - to have a counterpart of B.Simon in Betterworks that is linked to the Azure AD representation of user.
6262
1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
6363

6464
## Configure Azure AD SSO
6565

6666
Follow these steps to enable Azure AD SSO in the Azure portal.
6767

68-
1. In the Azure portal, on the **BetterWorks** application integration page, find the **Manage** section and select **single sign-on**.
68+
1. In the Azure portal, on the **Betterworks** application integration page, find the **Manage** section and select **single sign-on**.
6969
1. On the **Select a single sign-on method** page, select **SAML**.
7070
1. On the **Set up single sign-on with SAML** page, click the pencil icon for **Basic SAML Configuration** to edit the settings.
7171

@@ -85,13 +85,13 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8585
`https://app.betterworks.com`
8686

8787
> [!NOTE]
88-
> If you're a European Union customer of BetterWorks, please use `eu.betterworks.com` as the domain name instead of `app.betterworks.com` in these URLs.
88+
> If you're a European Union customer of Betterworks, please use `eu.betterworks.com` as the domain name instead of `app.betterworks.com` in these URLs.
8989
9090
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Federation Metadata XML** and select **Download** to download the certificate and save it on your computer.
9191

9292
![The Certificate download link](common/metadataxml.png)
9393

94-
1. On the **Set up BetterWorks** section, copy the appropriate URL(s) based on your requirement.
94+
1. On the **Set up Betterworks** section, copy the appropriate URL(s) based on your requirement.
9595

9696
![Copy configuration URLs](common/copy-configuration-urls.png)
9797

@@ -109,40 +109,40 @@ In this section, you'll create a test user in the Azure portal called B.Simon.
109109

110110
### Assign the Azure AD test user
111111

112-
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to BetterWorks.
112+
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Betterworks.
113113

114114
1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
115-
1. In the applications list, select **BetterWorks**.
115+
1. In the applications list, select **Betterworks**.
116116
1. In the app's overview page, find the **Manage** section and select **Users and groups**.
117117
1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
118118
1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
119119
1. If you're expecting any role value in the SAML assertion, in the **Select Role** dialog, select the appropriate role for the user from the list and then click the **Select** button at the bottom of the screen.
120120
1. In the **Add Assignment** dialog, click the **Assign** button.
121121

122-
## Configure BetterWorks SSO
122+
## Configure Betterworks SSO
123123

124-
To configure single sign-on on **BetterWorks** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [BetterWorks support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
124+
To configure single sign-on on **Betterworks** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [Betterworks support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
125125

126-
### Create BetterWorks test user
126+
### Create Betterworks test user
127127

128-
In this section, you create a user called Britta Simon in BetterWorks. Work with [BetterWorks support team](mailto:[email protected]) to add the users in the BetterWorks platform. Users must be created and activated before you use single sign-on.
128+
In this section, you create a user called Britta Simon in Betterworks. Work with [Betterworks support team](mailto:[email protected]) to add the users in the Betterworks platform. Users must be created and activated before you use single sign-on.
129129

130130
## Test SSO
131131

132132
In this section, you test your Azure AD single sign-on configuration with following options.
133133

134134
#### SP initiated:
135135

136-
* Click on **Test this application** in Azure portal. This will redirect to BetterWorks Sign on URL where you can initiate the login flow.
136+
* Click on **Test this application** in Azure portal. This will redirect to Betterworks Sign on URL where you can initiate the login flow.
137137

138-
* Go to BetterWorks Sign-on URL directly and initiate the login flow from there.
138+
* Go to Betterworks Sign-on URL directly and initiate the login flow from there.
139139

140140
#### IDP initiated:
141141

142-
* Click on **Test this application** in Azure portal and you should be automatically signed in to the BetterWorks for which you set up the SSO.
142+
* Click on **Test this application** in Azure portal and you should be automatically signed in to the Betterworks for which you set up the SSO.
143143

144-
You can also use Microsoft My Apps to test the application in any mode. When you click the BetterWorks tile in the My Apps, if configured in SP mode you would be redirected to the application sign on page for initiating the login flow and if configured in IDP mode, you should be automatically signed in to the BetterWorks for which you set up the SSO. For more information about the My Apps, see [Introduction to the My Apps](../user-help/my-apps-portal-end-user-access.md).
144+
You can also use Microsoft My Apps to test the application in any mode. When you click the Betterworks tile in the My Apps, if configured in SP mode you would be redirected to the application sign on page for initiating the login flow and if configured in IDP mode, you should be automatically signed in to the Betterworks for which you set up the SSO. For more information about the My Apps, see [Introduction to the My Apps](../user-help/my-apps-portal-end-user-access.md).
145145

146146
## Next steps
147147

148-
Once you configure BetterWorks you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Defender for Cloud Apps](/cloud-app-security/proxy-deployment-aad).
148+
Once you configure Betterworks you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Defender for Cloud Apps](/cloud-app-security/proxy-deployment-aad).

articles/data-lake-analytics/data-lake-analytics-u-sql-develop-with-python-r-csharp-in-vscode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Register Python and, R extensions assemblies for your ADL account.
2222
3. Select **Install U-SQL Extensions**.
2323
4. Confirmation message is displayed after the U-SQL extensions are installed.
2424

25-
![Set up the environment for python and R](./media/data-lake-analytics-data-lake-tools-for-vscode/setup-the-enrionment-for-python-and-r.png)
25+
![Set up the environment for Python and R](./media/data-lake-analytics-data-lake-tools-for-vscode/setup-the-enrionment-for-python-and-r.png)
2626

2727
> [!Note]
2828
> For best experiences on Python and R language service, please install VSCode Python and R extension.

articles/data-lake-analytics/data-lake-analytics-u-sql-python-extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ All the standard Python modules are included.
7676

7777
### Additional Python modules
7878

79-
Besides the standard Python libraries, several commonly used python libraries are included:
79+
Besides the standard Python libraries, several commonly used Python libraries are included:
8080

8181
* pandas
8282
* numpy

articles/genomics/quickstart-input-bam.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ output_storage_account_container: outputs
7878
Submit the `config.txt` file with this invocation: `msgen submit -f config.txt`
7979

8080
## Next steps
81-
In this article, you uploaded a BAM file into Azure Storage and submitted a workflow to the Microsoft Genomics service through the `msgen` python client. For additional information regarding workflow submission and other commands you can use with the Microsoft Genomics service, see our [FAQ](frequently-asked-questions-genomics.yml).
81+
In this article, you uploaded a BAM file into Azure Storage and submitted a workflow to the Microsoft Genomics service through the `msgen` Python client. For additional information regarding workflow submission and other commands you can use with the Microsoft Genomics service, see our [FAQ](frequently-asked-questions-genomics.yml).

articles/genomics/quickstart-input-multiple.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ output_storage_account_container: outputs
152152
Submit the `config.txt` file with this invocation: `msgen submit -f config.txt`
153153

154154
## Next steps
155-
In this article, you uploaded multiple BAM files or paired FASTQ files into Azure Storage and submitted a workflow to the Microsoft Genomics service through the `msgen` python client. For more information regarding workflow submission and other commands you can use with the Microsoft Genomics service, see the [FAQ](frequently-asked-questions-genomics.yml).
155+
In this article, you uploaded multiple BAM files or paired FASTQ files into Azure Storage and submitted a workflow to the Microsoft Genomics service through the `msgen` Python client. For more information regarding workflow submission and other commands you can use with the Microsoft Genomics service, see the [FAQ](frequently-asked-questions-genomics.yml).

articles/genomics/quickstart-input-pair-fastq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ output_storage_account_container: outputs
7878
Submit the `config.txt` file with this invocation: `msgen submit -f config.txt`
7979

8080
## Next steps
81-
In this article, you uploaded a pair of FASTQ files into Azure Storage and submitted a workflow to the Microsoft Genomics service through the `msgen` python client. To learn more about workflow submission and other commands you can use with the Microsoft Genomics service, see our [FAQ](frequently-asked-questions-genomics.yml).
81+
In this article, you uploaded a pair of FASTQ files into Azure Storage and submitted a workflow to the Microsoft Genomics service through the `msgen` Python client. To learn more about workflow submission and other commands you can use with the Microsoft Genomics service, see our [FAQ](frequently-asked-questions-genomics.yml).

articles/hdinsight/hadoop/apache-hadoop-hive-java-udf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ This problem may be caused by the line endings in the Python file. Many Windows
256256
You can use the following PowerShell statements to remove the CR characters before uploading the file to HDInsight:
257257

258258
```PowerShell
259-
# Set $original_file to the python file path
259+
# Set $original_file to the Python file path
260260
$text = [IO.File]::ReadAllText($original_file) -replace "`r`n", "`n"
261261
[IO.File]::WriteAllText($original_file, $text)
262262
```

articles/hdinsight/hadoop/python-udf-hdinsight.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ In the commands below, replace `sshuser` with the actual username if different.
113113
114114
```
115115
116-
3. From the SSH session, add the python files uploaded previously to the storage for the cluster.
116+
3. From the SSH session, add the Python files uploaded previously to the storage for the cluster.
117117
118118
```bash
119119
hdfs dfs -put hiveudf.py /hiveudf.py
@@ -369,7 +369,7 @@ In the commands below, replace `sshuser` with the actual username if different.
369369
370370
```
371371
372-
3. From the SSH session, add the python files uploaded previously to the storage for the cluster.
372+
3. From the SSH session, add the Python files uploaded previously to the storage for the cluster.
373373
374374
```bash
375375
hdfs dfs -put pigudf.py /pigudf.py

articles/hdinsight/hdinsight-for-vscode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Using the PySpark interactive command to submit the queries, follow these steps:
208208

209209
:::image type="content" source="./media/hdinsight-for-vscode/select-interpreter-to-start-jupyter-server.png" alt-text="select interpreter to start jupyter server":::
210210

211-
8. Select the python option below.
211+
8. Select the Python option below.
212212

213213
:::image type="content" source="./media/hdinsight-for-vscode/choose-the-below-option.png" alt-text="choose the below option":::
214214

0 commit comments

Comments
 (0)