Skip to content

Commit cfda572

Browse files
authored
Merge pull request #159317 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 2dd2044 + c5c18d2 commit cfda572

File tree

14 files changed

+33
-101
lines changed

14 files changed

+33
-101
lines changed

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

Lines changed: 10 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ To learn more about SaaS app integration with Azure AD, see [What is application
2828
To get started, you need the following items:
2929

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

3333
## Scenario description
3434

35-
In this tutorial, you configure and test Azure AD SSO in a test environment. Displayr supports **SP** initiated SSO.
35+
In this tutorial, you will learn to configure Azure AD SSO in your Displayr company. Displayr supports **SP** initiated SSO.
3636

3737
## Adding Displayr from the gallery
3838

@@ -45,17 +45,13 @@ To configure the integration of Displayr into Azure AD, you need to add Displayr
4545
1. In the **Add from the gallery** section, type **Displayr** in the search box.
4646
1. Select **Displayr** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
4747

48-
## Configure and test Azure AD single sign-on
48+
## Configure Azure AD single sign-on
4949

50-
Configure and test Azure AD SSO with Displayr using a test user called **Britta Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Displayr.
51-
52-
To configure and test Azure AD SSO with Displayr, complete the following building blocks:
50+
To configure Azure AD SSO with Displayr, complete the following building blocks:
5351

5452
1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** to enable your users to use this feature.
5553
2. **[Configure Displayr](#configure-displayr)** to configure the SSO settings on application side.
56-
3. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** to test Azure AD single sign-on with Britta Simon.
57-
4. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** to enable Britta Simon to use Azure AD single sign-on.
58-
5. **[Create Displayr test user](#create-displayr-test-user)** to have a counterpart of Britta Simon in Displayr that is linked to the Azure AD representation of user.
54+
4. **[Restrict access to specific users](#restrict-access-to-specific-users)** to restrict which of your Azure AD users can sign in to Displayr.
5955
6. **[Test SSO](#test-sso)** to verify whether the configuration works.
6056

6157
### Configure Azure AD SSO
@@ -100,10 +96,6 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
10096

10197
c. Select **Source Attribute** of **Group ID**.
10298

103-
d. Check **Customize the name of the group claim**.
104-
105-
e. Check **Emit groups as role claims**.
106-
10799
f. Click **Save**.
108100

109101
1. On the **Set-up Displayr** section, copy the appropriate URL(s) based on your requirement.
@@ -122,11 +114,11 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
122114

123115
3. If you want to set up Displayr manually, open a new web browser window and sign into your Displayr company site as an administrator and perform the following steps:
124116

125-
4. Click on **Settings** then navigate to **Account**.
117+
4. Click on the **User** icon, then navigate to **Account settings**.
126118

127119
![Screenshot that shows the "Settings" icon and "Account" selected.](./media/displayr-tutorial/config01.png)
128120

129-
5. Switch to **Settings** from the top menu and scroll down the page for clicking **Configure Single Sign On (SAML)**.
121+
5. Switch to **Settings** from the top menu and scroll down the page to click on **Configure Single Sign On (SAML)**.
130122

131123
![Screenshot that shows the "Settings" tab selected and the "Configure Single Sign On (S A M L)" action selected.](./media/displayr-tutorial/config02.png)
132124

@@ -148,67 +140,13 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
148140

149141
g. Click **Save**.
150142

151-
### Create an Azure AD test user
152-
153-
In this section, you'll create a test user in the Azure portal called Britta Simon.
154-
155-
1. From the left pane in the Azure portal, select **Azure Active Directory**, select **Users**, and then select **All users**.
156-
1. Select **New user** at the top of the screen.
157-
1. In the **User** properties, follow these steps:
158-
1. In the **Name** field, enter `Britta Simon`.
159-
1. In the **User name** field, enter the [email protected]. For example, `[email protected]`.
160-
1. Select the **Show password** check box, and then write down the value that's displayed in the **Password** box.
161-
1. Click **Create**.
162-
163-
### Assign the Azure AD test user
164-
165-
In this section, you'll enable Britta Simon to use Azure single sign-on by granting access to Displayr.
166-
167-
1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
168-
1. In the applications list, select **Displayr**.
169-
1. In the app's overview page, find the **Manage** section and select **Users and groups**.
170-
171-
![The "Users and groups" link](common/users-groups-blade.png)
172-
173-
1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
174-
175-
![The Add User link](common/add-assign-user.png)
176-
177-
1. In the **Users and groups** dialog, select **Britta Simon** from the Users list, then click the **Select** button at the bottom of the screen.
178-
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.
179-
1. In the **Add Assignment** dialog, click the **Assign** button.
180-
181-
### Create Displayr test user
143+
### Restrict access to specific users
182144

183-
To enable Azure AD users, sign in to Displayr, they must be provisioned into Displayr. In Displayr, provisioning is a manual task.
184-
185-
**To provision a user account, perform the following steps:**
186-
187-
1. Sign in to Displayr as an Administrator.
188-
189-
2. Click on **Settings** then navigate to **Account**.
190-
191-
![Screenshot that shows the "Settings (cog)" icon with "Account" selected.](./media/displayr-tutorial/config01.png)
192-
193-
3. Switch to **Settings** from the top menu and scroll down the page, until **Users** section then click on **New User**.
194-
195-
![Screenshot that shows the "Settings" tab with "Users" highlighted and the "New User" button selected.](./media/displayr-tutorial/config07.png)
196-
197-
4. On the **New User** page, perform the following steps:
198-
199-
![Displayr Configuration](./media/displayr-tutorial/config06.png)
200-
201-
a. In **Name** text box, enter the name of user like **Brittasimon**.
202-
203-
b. In **Email** text box, enter the email of user like `[email protected]`.
204-
205-
c. Select your appropriate **Group membership**.
206-
207-
d. Click **Save**.
145+
By default, all users in the tenant where you added the Displayr application can log in to Displayr by using SSO. If you want to restrict access to specific users or groups, see [Restrict your Azure AD app to a set of users in an Azure AD tenant](../develop/howto-restrict-your-app-to-a-set-of-users.md).
208146

209147
### Test SSO
210148

211-
When you select the Displayr tile in the Access Panel, you should be automatically signed in to the Displayr for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](../user-help/my-apps-portal-end-user-access.md).
149+
When you select the Displayr tile in the Access Panel, you should be automatically signed in to the Displayr company for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](../user-help/my-apps-portal-end-user-access.md).
212150

213151
## Additional Resources
214152

-2.54 KB
Loading
Binary file not shown.
-6.75 KB
Loading
Binary file not shown.
Binary file not shown.

articles/azure-percept/how-to-select-update-package.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,14 @@ To ensure you apply the correct update package to your dev kit, you must first d
4040
Using the **model** and **swVersion** identified in the previous section, check the table below to determine which update package to download.
4141

4242

43-
|model |swVersion |Update method |Download links |
44-
|---------|---------|---------|---------|
45-
|PE-101 |2020.108.101.105, <br>2020.108.114.120, <br>2020.109.101.122, <br>2020.109.116.120, <br>2021.101.106.118 |**USB only** |[USB update package](https://go.microsoft.com/fwlink/?linkid=2155734) |
46-
|PE-101 |2021.102.108.112, <br> |OTA or USB |[OTA manifest](https://go.microsoft.com/fwlink/?linkid=2155625)<br>[OTA update package](https://go.microsoft.com/fwlink/?linkid=2161538)<br>[USB update package](https://go.microsoft.com/fwlink/?linkid=2155734) |
47-
|APDK-101 |All swVersions |OTA or USB | [OTA manifest](https://go.microsoft.com/fwlink/?linkid=2162292)<br>[OTA update package](https://go.microsoft.com/fwlink/?linkid=2161538)<br>[USB update package](https://go.microsoft.com/fwlink/?linkid=2155734) |
48-
43+
|model |swVersion |Update method |Download links |Note |
44+
|---------|---------|---------|---------|---------|
45+
|PE-101 |2020.108.101.105, <br>2020.108.114.120, <br>2020.109.101.122, <br>2020.109.116.120, <br>2021.101.106.118 |**USB only** |[2021.104.110.103 USB update package](https://go.microsoft.com/fwlink/?linkid=2155734) |Public Preview major release |
46+
|PE-101 |2021.102.108.112, <br> |OTA or USB |[2021.104.110.103 OTA manifest](https://go.microsoft.com/fwlink/?linkid=2155625)<br>[2021.104.110.103 OTA update package](https://go.microsoft.com/fwlink/?linkid=2161538)<br>[2021.104.110.103 USB update package](https://go.microsoft.com/fwlink/?linkid=2155734) |Public Preview major release |
47+
|APDK-101 |All swVersions |OTA or USB | [2021.105.111.112 OTA manifest](https://go.microsoft.com/fwlink/?linkid=2163554)<br>[2021.105.111.112 OTA update package](https://go.microsoft.com/fwlink/?linkid=2163456)<br>[2021.105.111.112 USB update package](https://go.microsoft.com/fwlink/?linkid=2163555) |Latest monthly release (May) |
4948

5049

5150
## Next steps
5251
Update your dev kits via the methods and update packages determined in the previous section.
5352
- [Update your Azure Percept DK over-the-air](https://docs.microsoft.com/azure/azure-percept/how-to-update-over-the-air)
5453
- [Update your Azure Percept DK via USB](https://docs.microsoft.com/azure/azure-percept/how-to-update-via-usb)
55-

articles/azure-resource-manager/management/azure-subscription-service-limits.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ The latest values for Azure Purview quotas can be found in the [Azure Purview qu
361361

362362
For SQL Database limits, see [SQL Database resource limits for single databases](../../azure-sql/database/resource-limits-vcore-single-databases.md), [SQL Database resource limits for elastic pools and pooled databases](../../azure-sql/database/resource-limits-vcore-elastic-pools.md), and [SQL Database resource limits for SQL Managed Instance](../../azure-sql/managed-instance/resource-limits.md).
363363

364+
The maximum number of private endpoints per Azure SQL Database logical server is 250.
365+
364366
## Azure Synapse Analytics limits
365367

366368
[!INCLUDE [synapse-analytics-limits](../../../includes/synapse-analytics-limits.md)]

articles/cognitive-services/form-recognizer/includes/create-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ Go to the Azure portal and <a href="https://ms.portal.azure.com/#create/Microsof
1818
| **Pricing tier** | The cost of your resource depends on the pricing tier you choose and your usage. For more information, see the API [pricing details](https://azure.microsoft.com/pricing/details/cognitive-services/).
1919

2020
> [!NOTE]
21-
> When you create a Cognitive Service resource in the Azure portal, you have the option to create a multi-service subscription key (used across multiple cognitive services) or a single-service subscription key (used only with a specific cognitive service). Currently, Form Recognizer is not included in the multi-service subscription.
21+
> When you create a Cognitive Service resource in the Azure portal, you have the option to create a multi-service subscription key (used across multiple Cognitive Services) or a single-service subscription key (used only with a specific Cognitive Service). Currently, Form Recognizer is not included in the multi-service subscription.
2222
2323
When your Form Recognizer resource finishes deploying, find and select it from the **All resources** list in the portal. Your key and endpoint will be located on the resource's key and endpoint page, under resource management. Save both of these to a temporary location before going forward.

articles/static-web-apps/publish-jekyll.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ To configure environment variables, such as `JEKYLL_ENV`, add an `env` section t
150150
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
151151
app_location: "/" # App source code path
152152
api_location: "" # Api source code path - optional
153-
output_location: "_site_" # Built app content directory - optional
153+
output_location: "_site" # Built app content directory - optional
154154
###### End of Repository/Build Configurations ######
155155
env:
156156
JEKYLL_ENV: production

0 commit comments

Comments
 (0)