Skip to content

Commit b92e037

Browse files
authored
Merge pull request #185585 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents eb63696 + 57da365 commit b92e037

File tree

5 files changed

+52
-48
lines changed

5 files changed

+52
-48
lines changed

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

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Tutorial: Azure Active Directory single sign-on (SSO) integration with Workplace by Facebook | Microsoft Docs'
3-
description: Learn how to configure single sign-on between Azure Active Directory and Workplace by Facebook.
2+
title: 'Tutorial: Azure Active Directory single sign-on (SSO) integration with Workplace by Meta | Microsoft Docs'
3+
description: Learn how to configure single sign-on between Azure Active Directory and Workplace by Meta.
44
services: active-directory
55
author: jeevansd
66
manager: CelesteDG
@@ -13,12 +13,12 @@ ms.date: 06/15/2021
1313
ms.author: jeedes
1414
---
1515

16-
# Tutorial: Azure Active Directory single sign-on (SSO) integration with Workplace by Facebook
16+
# Tutorial: Azure Active Directory single sign-on (SSO) integration with Workplace by Meta
1717

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

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

2424

@@ -27,50 +27,50 @@ In this tutorial, you'll learn how to integrate Workplace by Facebook with Azure
2727
To get started, you need the following items:
2828

2929
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
30-
* Workplace by Facebook single sign-on (SSO) enabled subscription.
30+
* Workplace by Meta single sign-on (SSO) enabled subscription.
3131

3232
> [!NOTE]
33-
> Facebook has two products, Workplace Standard (free) and Workplace Premium (paid). Any Workplace Premium tenant can configure SCIM and SSO integration with no other implications to cost or licenses required. SSO and SCIM are not available in Workplace Standard instances.
33+
> Meta has two products, Workplace Standard (free) and Workplace Premium (paid). Any Workplace Premium tenant can configure SCIM and SSO integration with no other implications to cost or licenses required. SSO and SCIM are not available in Workplace Standard instances.
3434
3535
## Scenario description
3636

3737
In this tutorial, you configure and test Azure AD SSO in a test environment.
3838

39-
* Workplace by Facebook supports **SP** initiated SSO.
40-
* Workplace by Facebook supports **just-in-time provisioning**.
41-
* Workplace by Facebook supports **[automatic User Provisioning](workplace-by-facebook-provisioning-tutorial.md)**.
42-
* Workplace by Facebook Mobile application can now be configured with Azure AD for enabling SSO. In this tutorial, you configure and test Azure AD SSO in a test environment.
39+
* Workplace by Meta supports **SP** initiated SSO.
40+
* Workplace by Meta supports **just-in-time provisioning**.
41+
* Workplace by Meta supports **[automatic User Provisioning](workplace-by-facebook-provisioning-tutorial.md)**.
42+
* Workplace by Meta Mobile application can now be configured with Azure AD for enabling SSO. In this tutorial, you configure and test Azure AD SSO in a test environment.
4343

4444

45-
## Adding Workplace by Facebook from the gallery
45+
## Adding Workplace by Meta from the gallery
4646

47-
To configure the integration of Workplace by Facebook into Azure AD, you need to add Workplace by Facebook from the gallery to your list of managed SaaS apps.
47+
To configure the integration of Workplace by Meta into Azure AD, you need to add Workplace by Meta from the gallery to your list of managed SaaS apps.
4848

4949
1. Sign in to the Azure portal using either a work or school account, or a personal Microsoft account.
5050
1. On the left navigation pane, select the **Azure Active Directory** service.
5151
1. Navigate to **Enterprise Applications** and then select **All Applications**.
5252
1. To add new application, select **New application**.
53-
1. In the **Add from the gallery** section, type **Workplace by Facebook** in the search box.
54-
1. Select **Workplace by Facebook** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
53+
1. In the **Add from the gallery** section, type **Workplace by Meta** in the search box.
54+
1. Select **Workplace by Meta** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
5555

56-
## Configure and test Azure AD SSO for Workplace by Facebook
56+
## Configure and test Azure AD SSO for Workplace by Meta
5757

58-
Configure and test Azure AD SSO with Workplace by Facebook 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 Workplace by Facebook.
58+
Configure and test Azure AD SSO with Workplace by Meta 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 Workplace by Meta.
5959

60-
To configure and test Azure AD SSO with Workplace by Facebook, perform the following steps:
60+
To configure and test Azure AD SSO with Workplace by Meta, perform the following steps:
6161

6262
1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
6363
1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
6464
1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
65-
2. **[Configure Workplace by Facebook SSO](#configure-workplace-by-facebook-sso)** - to configure the Single Sign-On settings on application side.
66-
1. **[Create Workplace by Facebook test user](#create-workplace-by-facebook-test-user)** - to have a counterpart of B.Simon in Workplace by Facebook that is linked to the Azure AD representation of user.
65+
2. **[Configure Workplace by Meta SSO](#configure-workplace-by-meta-sso)** - to configure the Single Sign-On settings on application side.
66+
1. **[Create Workplace by Meta test user](#create-workplace-by-meta-test-user)** - to have a counterpart of B.Simon in Workplace by Meta that is linked to the Azure AD representation of user.
6767
3. **[Test SSO](#test-sso)** - to verify whether the configuration works.
6868

6969
## Configure Azure AD SSO
7070

7171
Follow these steps to enable Azure AD SSO in the Azure portal.
7272

73-
1. In the Azure portal, on the **Workplace by Facebook** application integration page, find the **Manage** section and select **Single sign-on**.
73+
1. In the Azure portal, on the **Workplace by Meta** application integration page, find the **Manage** section and select **Single sign-on**.
7474
1. On the **Select a Single sign-on method** page, select **SAML**.
7575
1. On the **Set up Single Sign-On with SAML** page, click the pencil icon for **Basic SAML Configuration** to edit the settings.
7676

@@ -79,13 +79,13 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
7979
1. On the **Basic SAML Configuration** section, enter the values for the following fields:
8080

8181
a. In the **Sign on URL** (found in WorkPlace as the Recipient URL) text box, type a URL using the following pattern:
82-
`https://.facebook.com/work/saml.php`
82+
`https://.workplace.com/work/saml.php`
8383

8484
b. In the **Identifier (Entity ID)** (found in WorkPlace as the Audience URL) text box, type a URL using the following pattern:
85-
`https://www.facebook.com/company/`
85+
`https://www.workplace.com/company/`
8686

8787
c. In the **Reply URL** (found in WorkPlace as the Assertion Consumer Service) text box, type a URL using the following pattern:
88-
`https://.facebook.com/work/saml.php`
88+
`https://.workplace.com/work/saml.php`
8989

9090
> [!NOTE]
9191
> These values are not the real. Update these values with the actual Sign-On URL, Identifier and Reply URL. See the Authentication page of the Workplace Company Dashboard for the correct values for your Workplace community, this is explained later in the tutorial.
@@ -94,7 +94,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
9494

9595
![The Certificate download link](common/certificatebase64.png)
9696

97-
1. On the **Set up Workplace by Facebook** section, copy the appropriate URL(s) based on your requirement.
97+
1. On the **Set up Workplace by Meta** section, copy the appropriate URL(s) based on your requirement.
9898

9999
![Copy configuration URLs](common/copy-configuration-urls.png)
100100

@@ -112,27 +112,27 @@ In this section, you'll create a test user in the Azure portal called B.Simon.
112112

113113
### Assign the Azure AD test user
114114

115-
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Workplace by Facebook.
115+
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Workplace by Meta.
116116

117117
1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
118-
1. In the applications list, select **Workplace by Facebook**.
118+
1. In the applications list, select **Workplace by Meta**.
119119
1. In the app's overview page, find the **Manage** section and select **Users and groups**.
120120
1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
121121
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.
122122
1. If you are expecting a role to be assigned to the users, you can select it from the **Select a role** dropdown. If no role has been set up for this app, you see "Default Access" role selected.
123123
1. In the **Add Assignment** dialog, click the **Assign** button.
124124

125-
## Configure Workplace by Facebook SSO
125+
## Configure Workplace by Meta SSO
126126

127-
1. To automate the configuration within Workplace by Facebook, you need to install **My Apps Secure Sign-in browser extension** by clicking **Install the extension**.
127+
1. To automate the configuration within Workplace by Meta, you need to install **My Apps Secure Sign-in browser extension** by clicking **Install the extension**.
128128

129129
![My apps extension](common/install-myappssecure-extension.png)
130130

131-
1. After adding extension to the browser, click on **Set up Workplace by Facebook** will direct you to the Workplace by Facebook application. From there, provide the admin credentials to sign into Workplace by Facebook. The browser extension will automatically configure the application for you and automate steps 3-5.
131+
1. After adding extension to the browser, click on **Set up Workplace by Meta** will direct you to the Workplace by Meta application. From there, provide the admin credentials to sign into Workplace by Meta. The browser extension will automatically configure the application for you and automate steps 3-5.
132132

133133
![Setup configuration](common/setup-sso.png)
134134

135-
1. If you want to setup Workplace by Facebook manually, open a new web browser window and sign into your Workplace by Facebook company site as an administrator and perform the following steps:
135+
1. If you want to setup Workplace by Meta manually, open a new web browser window and sign into your Workplace by Meta company site as an administrator and perform the following steps:
136136

137137
> [!NOTE]
138138
> As part of the SAML authentication process, Workplace may utilize query strings of up to 2.5 kilobytes in size in order to pass parameters to Azure AD.
@@ -188,28 +188,28 @@ You can configure Workplace to prompt for a SAML check every day, three days, we
188188
189189
You can also force a SAML reset for all users using the button: Require SAML authentication for all users now.
190190

191-
### Create Workplace by Facebook test user
191+
### Create Workplace by Meta test user
192192

193-
In this section, a user called B.Simon is created in Workplace by Facebook. Workplace by Facebook supports just-in-time provisioning, which is enabled by default.
193+
In this section, a user called B.Simon is created in Workplace by Meta. Workplace by Meta supports just-in-time provisioning, which is enabled by default.
194194

195-
There is no action for you in this section. If a user doesn't exist in Workplace by Facebook, a new one is created when you attempt to access Workplace by Facebook.
195+
There is no action for you in this section. If a user doesn't exist in Workplace by Meta, a new one is created when you attempt to access Workplace by Meta.
196196

197197
>[!Note]
198-
>If you need to create a user manually, Contact [Workplace by Facebook Client support team](https://www.workplace.com/help/work/).
198+
>If you need to create a user manually, Contact [Workplace by Meta Client support team](https://www.workplace.com/help/work/).
199199
200200
## Test SSO
201201

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

204-
* Click on **Test this application** in Azure portal. This will redirect to Workplace by Facebook Sign-on URL where you can initiate the login flow.
204+
* Click on **Test this application** in Azure portal. This will redirect to Workplace by Meta Sign-on URL where you can initiate the login flow.
205205

206-
* Go to Workplace by Facebook Sign-on URL directly and initiate the login flow from there.
206+
* Go to Workplace by Meta Sign-on URL directly and initiate the login flow from there.
207207

208-
* You can use Microsoft My Apps. When you click the Workplace by Facebook tile in the My Apps, this will redirect to Workplace by Facebook Sign-on URL. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
208+
* You can use Microsoft My Apps. When you click the Workplace by Meta tile in the My Apps, this will redirect to Workplace by Meta Sign-on URL. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
209209

210-
## Test SSO for Workplace by Facebook (mobile)
210+
## Test SSO for Workplace by Meta (mobile)
211211

212-
1. Open Workplace by Facebook Mobile application. On the sign in page, click on **LOG IN**.
212+
1. Open Workplace by Meta Mobile application. On the sign in page, click on **LOG IN**.
213213

214214
![The sign in](./media/workplacebyfacebook-tutorial/test05.png)
215215

@@ -231,4 +231,4 @@ In this section, you test your Azure AD single sign-on configuration with follow
231231

232232
## Next steps
233233

234-
Once you configure Workplace by Facebook 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).
234+
Once you configure Workplace by Meta 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/cognitive-services/LUIS/whats-new.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Learn what's new in the service. These items include release notes, videos, blog
1313

1414
## Release notes
1515

16+
### January 2022
17+
* [Updated text recognizer](https://github.com/microsoft/Recognizers-Text/releases/tag/dotnet-v1.8.2) to v1.8.2
18+
* Added [English-British](luis-language-support.md) to supported languages.
19+
1620
### December 2021
1721
* [Updated text recognizer](https://github.com/microsoft/Recognizers-Text/releases/tag/dotnet-v1.8.1) to v1.8.1
1822
* Jio India west [publishing region](luis-reference-regions.md#other-publishing-regions)

articles/cognitive-services/language-service/custom-classification/how-to/call-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,13 @@ First you will need to get your resource key and endpoint
157157
4. After you've installed the client library, use the following samples on GitHub to start calling the API.
158158

159159
Single label classification:
160-
* [C#](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample10_SingleCategoryClassify.cs)
160+
* [C#](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/textanalytics/Azure.AI.TextAnalytics/samples/Sample10_SingleCategoryClassify.md)
161161
* [Java](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/ClassifyDocumentSingleCategory.java)
162162
* [JavaScript](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/textanalytics/ai-text-analytics/samples/v5/javascript/customText.js)
163163
* [Python](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py)
164164

165165
Multiple label classification:
166-
* [C#](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample11_MultiCategoryClassify.cs)
166+
* [C#](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/textanalytics/Azure.AI.TextAnalytics/samples/Sample11_MultiCategoryClassify.md)
167167
* [Java](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/ClassifyDocumentMultiCategory.java)
168168
* [JavaScript](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/textanalytics/ai-text-analytics/samples/v5/javascript/customText.js)
169169
* [Python](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py)

articles/cognitive-services/language-service/custom-named-entity-recognition/how-to/call-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ First you will need to get your resource key and endpoint
163163

164164
4. After you've installed the client library, use the following samples on GitHub to start calling the API.
165165

166-
* [C#](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample9_RecognizeCustomEntitiesConvenience.cs)
166+
* [C#](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/textanalytics/Azure.AI.TextAnalytics/samples/Sample9_RecognizeCustomEntities.md)
167167
* [Java](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/RecognizeCustomEntities.java)
168168
* [JavaScript](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/textanalytics/ai-text-analytics/samples/v5/javascript/customText.js)
169169
* [Python](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py)

articles/synapse-analytics/spark/apache-spark-external-metastore.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@ After setting up storage connections, you can query the existing tables in the H
178178

179179
## Known limitations
180180

181-
- Synapse Studio object explorer will continue to show objects in managed Synapse metastore instead of the external HMS, we are improving the experience of this.
181+
- Synapse Studio object explorer will continue to show objects in managed Synapse metastore instead of the external HMS.
182182
- [SQL <-> Spark synchronization](../sql/develop-storage-files-spark-tables.md) doesn't work when using external HMS.
183183
- Only Azure SQL Database and Azure Database for MySQL are supported as external Hive Metastore database. Only SQL authorization is supported.
184-
- Currently Spark only works on external Hive tables and non-transactional/non-ACID managed Hive tables. It doesn't support Hive ACID/transactional tables now.
185-
- Apache Ranger integration is not supported as of now.
184+
- Currently Spark only works on external Hive tables and non-transactional/non-ACID managed Hive tables. It doesn't support Hive ACID/transactional tables.
185+
- Apache Ranger integration is not supported.
186186

187187
## Troubleshooting
188188
### See below error when querying a Hive table with data stored in Blob Storage

0 commit comments

Comments
 (0)