Skip to content

Commit b9b84d1

Browse files
authored
Merge pull request #47591 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 ffe9f21 + c27f174 commit b9b84d1

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

articles/active-directory/device-management-azure-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ To delete a device, you have two options:
160160

161161
**Remarks:**
162162

163-
- You need to be a global administrator in Azure AD to delete a device.
163+
- You need to be a global administrator or an Intune administrator in Azure AD to delete a device.
164164

165165
- Deleting a device:
166166

articles/search/cognitive-search-create-custom-skill-example.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,13 @@ When you are satisfied with the function behavior, you can publish it.
239239

240240
1. In the [Azure portal](https://portal.azure.com), navigate to the Resource Group, and look for the Translate Function you published. Under the **Manage** section, you should see Host Keys. Select the **Copy** icon for the *default* host key.
241241

242+
## Update SSL Settings
243+
244+
All Azure Functions created after June 30th, 2018 have disabled TLS 1.0, which is not currently compatible with custom skills.
245+
246+
1. In the [Azure portal](https://portal.azure.com), navigate to the Resource Group, and look for the Translate Function you published. Under the **Platform features** section, you should see SSL.
247+
248+
1. After selecting SSL, you should change the **Minimum TLS version** to 1.0. TLS 1.2 functions are not yet supported as custom skills.
242249

243250
## Test the function in Azure
244251

0 commit comments

Comments
 (0)