Skip to content

Commit e707732

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into self-service-working
2 parents 742f208 + 8300e70 commit e707732

File tree

21 files changed

+216
-48
lines changed

21 files changed

+216
-48
lines changed

articles/active-directory/saas-apps/github-enterprise-managed-user-tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: saas-app-tutorial
99
ms.workload: identity
1010
ms.topic: tutorial
11-
ms.date: 03/15/2021
11+
ms.date: 09/27/2022
1212
ms.author: jeedes
1313

1414
---
@@ -122,9 +122,9 @@ In this section, you'll take the information provided from AAD above and enter t
122122
1. Click on Sign In at the top-right corner
123123
1. Enter the credentials for the first administrator user account. The login handle should be in the format: `<your enterprise short code>_admin`
124124
1. Navigate to `https://github.com/enterprises/` `<your enterprise name>`. This information should be provided by your Solutions Engineering contact.
125-
1. On the navigation menu on the left, select **Settings**, then **Security**.
126-
1. Click on the checkbox **Enable SAML authentication**
127-
1. Enter the Sign on URL. This URL is the Login URL that you copied from AAD above.
125+
1. On the navigation menu on the left, select **Settings**, then **Authentication security**.
126+
1. Click on the checkbox **Require SAML authentication**
127+
1. Enter the Sign-on URL. This URL is the Login URL that you copied from AAD above.
128128
1. Enter the Issuer. This URL is the Azure AD Identifier that you copied from AAD above.
129129
1. Enter the Public Certificate. Please open the base64 certificate that you downloaded above and paste the text contents of that file into this dialog.
130130
1. Click on **Test SAML configuration**. This will open up a dialog for you to log in with your Azure AD credentials to validate that SAML SSO is configured correctly. Log in with your AAD credentials. you will receive a message **Passed: Successfully authenticated your SAML SSO identity** upon successful validation.

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 06/16/2021
12+
ms.date: 09/26/2022
1313
ms.author: jeedes
1414
---
1515
# Tutorial: Azure Active Directory integration with Sciforma
@@ -73,9 +73,12 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
7373
4. On the **Basic SAML Configuration** section, perform the following steps:
7474

7575
a. In the **Identifier (Entity ID)** text box, type a URL using the following pattern:
76-
`https://<SUBDOMAIN>.sciforma.net/sciforma/saml`
76+
`https://<SUBDOMAIN>.sciforma.net/sciforma`
7777

78-
b. In the **Sign on URL** text box, type a URL using the following pattern:
78+
b. In the **Reply URL** text box, type a URL using the following pattern:
79+
`https://<SUBDOMAIN>.sciforma.net/sciforma/saml/post`
80+
81+
c. In the **Sign on URL** text box, type a URL using the following pattern:
7982
`https://<SUBDOMAIN>.sciforma.net/sciforma/main.html`
8083

8184
> [!NOTE]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 08/22/2022
12+
ms.date: 09/27/2022
1313
ms.author: jeedes
1414

1515
---
@@ -51,7 +51,7 @@ To configure the integration of workhub into Azure AD, you need to add workhub f
5151
1. In the **Add from the gallery** section, type **workhub** in the search box.
5252
1. Select **workhub** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
5353

54-
Alternatively, you can also use the [Enterprise App Configuration Wizard](https://portal.office.com/AdminPortal/home?Q=Docs#/azureadappintegration). In this wizard, you can add an application to your tenant, add users/groups to the app, assign roles, as well as walk through the SSO configuration as well. [Learn more about Microsoft 365 wizards.](/microsoft-365/admin/misc/azure-ad-setup-guides)
54+
Alternatively, you can also use the [Enterprise App Configuration Wizard](https://portal.office.com/AdminPortal/home?Q=Docs#/azureadappintegration). In this wizard, you can add an application to your tenant, add users/groups to the app, assign roles, and walk through the SSO configuration as well. [Learn more about Microsoft 365 wizards.](/microsoft-365/admin/misc/azure-ad-setup-guides)
5555

5656
## Configure and test Azure AD SSO for workhub
5757

@@ -121,11 +121,11 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
121121

122122
## Configure workhub SSO
123123

124-
To configure single sign-on on **workhub** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [workhub support team](mailto:team_bkp@bitkey.jp). They set this setting to have the SAML SSO connection set properly on both sides.
124+
To configure single sign-on on **workhub** side, you need to send the downloaded **Certificate (Base64)**, and appropriate copied URLs from Azure portal to [workhub support team](mailto:support_work@bitkey.jp). They set this setting to have the SAML SSO connection set properly on both sides.
125125

126126
### Create workhub test user
127127

128-
In this section, you create a user called Britta Simon at workhub. Work with [workhub support team](mailto:team_bkp@bitkey.jp) to add the users in the workhub platform. Users must be created and activated before you use single sign-on.
128+
In this section, you create a user called Britta Simon at workhub. Work with [workhub support team](mailto:support_work@bitkey.jp) to add the users in the workhub platform. Users must be created and activated before you use single sign-on.
129129

130130
## Test SSO
131131

articles/azure-vmware/includes/disk-capabilities-of-the-host.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Disk capabilities of the hosts
33
description: Hosts used to build or scale clusters come from an isolated pool of hosts.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 09/18/2022
6+
ms.date: 09/24/2022
77
author: suzizuber
88
ms.author: v-szuber
99
---
@@ -19,7 +19,7 @@ Azure VMware Solution clusters are based on hyper-converged, bare-metal infrastr
1919
| AV36P | dual Intel 18 core 2.6 GHz / 3.9 GHz turbo (Cascade Lake) | 768 | 1.5 (Intel Optane Cache) | 19.20 (NVMe) | Selected regions (*) |
2020
| AV52 | dual Intel 26 core 2.7 GHz / 4.0 GHz turbo (Cascade Lake) | 1,536 | 1.5 (Intel Optane Cache) | 38.40 (NVMe) | Selected regions (*) |
2121

22-
An Azure VMware cluster requires a minimum number of three hosts. You can only use host of the same type in a single cluster. You can use multiple clusters with different host types in a single Azure VMware Private Cloud.
22+
An Azure VMware Solution cluster requires a minimum number of three hosts. You can only use host of the same type in a single cluster. You can use multiple clusters with different host types in a single Azure VMware Private Cloud.
2323
Hosts used to build or scale clusters come from an isolated pool of hosts. Those hosts have passed hardware tests and have had all data securely deleted before being added to a cluster.
2424

2525
(*) details available via the Azure pricing calculator.

articles/cognitive-services/language-service/concepts/data-limits.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ The following limit specifies the maximum number of characters that can be in a
4646
| Feature | Value |
4747
|------------------------|---------------|
4848
| Conversation summarization | 7,000 characters as measured by [StringInfo.LengthInTextElements](/dotnet/api/system.globalization.stringinfo.lengthintextelements).|
49+
| Conversation PII | 40,000 characters as measured by [StringInfo.LengthInTextElements](/dotnet/api/system.globalization.stringinfo.lengthintextelements).|
4950
| Text Analytics for health | 30,720 characters as measured by [StringInfo.LengthInTextElements](/dotnet/api/system.globalization.stringinfo.lengthintextelements). |
5051
| All other pre-configured features (synchronous) | 5,120 as measured by [StringInfo.LengthInTextElements](/dotnet/api/system.globalization.stringinfo.lengthintextelements). |
5152
| All other pre-configured features ([asynchronous](use-asynchronously.md)) | 125,000 characters across all submitted documents, as measured by [StringInfo.LengthInTextElements](/dotnet/api/system.globalization.stringinfo.lengthintextelements) (maximum of 25 documents). |

articles/cognitive-services/language-service/custom-named-entity-recognition/includes/roles-for-resource-and-storage.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,8 @@ Use the following steps to set the required roles for your Language resource and
3838
4. Within **Assign access to**, select **Managed identity**.
3939
5. Select **Select members**
4040
6. Select your subscription, and **Language** as the managed identity. You can search for user names in the **Select** field.
41+
42+
> ![IMPORTANT]
43+
> If you have a virtual network or private endpoint, be sure to select **Allow Azure services on the trusted services list to access this storage account** in the Azure portal.
44+
45+

articles/cognitive-services/language-service/custom-text-classification/includes/roles-for-resource-and-storage.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ Use the following steps to set the required roles for your Language resource and
3838
4. Within **Assign access to**, select **Managed identity**.
3939
5. Select **Select members**
4040
6. Select your subscription, and **Language** as the managed identity. You can search for user names in the **Select** field.
41+
42+
> ![IMPORTANT]
43+
> If you have a virtual network or private endpoint, be sure to select **Allow Azure services on the trusted services list to access this storage account** in the Azure portal.

articles/cognitive-services/language-service/orchestration-workflow/tutorials/connect-services.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Now your orchestration project is ready to be used. Any incoming request will be
8787
```powershell
8888
dotnet add package Azure.AI.Language.Conversations
8989
```
90+
Alternatively, you can search for "Azure.AI.Language.Conversations" in the NuGet package manager and install the latest release.
9091

9192
3. In `Program.cs`, replace `{api-key}` and the `{endpoint}` variables. Use the key and endpoint for the Language resource you created earlier. You can find them in the **Keys and Endpoint** tab in your Language resource in Azure.
9293

@@ -95,10 +96,11 @@ Uri endpoint = new Uri("{endpoint}");
9596
AzureKeyCredential credential = new AzureKeyCredential("{api-key}");
9697
```
9798

98-
4. Replace the orchestrationProject parameters to **Orchestrator** and **Testing** as below if they are not set already.
99+
4. Replace the project and deployment parameters to **Orchestrator** and **Testing** as below if they are not set already.
99100

100101
```csharp
101-
ConversationsProject orchestrationProject = new ConversationsProject("Orchestrator", "Testing");
102+
string projectName = "Orchestrator";
103+
string deploymentName = "Testing";
102104
```
103105

104106
5. Run the project or press F5 in Visual Studio.

articles/load-balancer/TOC.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@
198198
href: configure-vm-scale-set-cli.md
199199
- name: Upgrade from a basic to standard load balancer
200200
items:
201+
- name: Upgrade options and guidance
202+
href: load-balancer-basic-upgrade-guidance.md
201203
- name: Upgrade a basic public load balancer
202204
href: upgrade-basic-standard.md
203205
- name: Upgrade an internal load balancer - Outbound connections not required
@@ -214,9 +216,9 @@
214216
href: load-balancer-multiple-ip-powershell.md
215217
- name: Move across regions
216218
items:
217-
- name: Public Load Balancer - Portal
219+
- name: Public load balancer - Portal
218220
href: move-across-regions-external-load-balancer-portal.md
219-
- name: Public Load Balancer - PowerShell
221+
- name: Public load balancer - PowerShell
220222
href: move-across-regions-external-load-balancer-powershell.md
221223
- name: Internal load balancer - Portal
222224
href: move-across-regions-internal-load-balancer-portal.md

articles/load-balancer/index.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ landingContent:
3434
url: https://azure.microsoft.com/updates/?category=networking&query=load%20balancer
3535
- text: Load Balancer SKUs
3636
url: skus.md
37+
- text: Upgrade guidance from basic to standard Load Balancer
38+
url: load-balancer-basic-upgrade-guidance.md
3739
- linkListType: learn
3840
links:
3941
- text: Introduction to Azure Load Balancer

0 commit comments

Comments
 (0)