Skip to content

Commit bf6874f

Browse files
authored
Merge pull request #218075 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 d70b811 + d4f3835 commit bf6874f

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

articles/active-directory/governance/lifecycle-workflow-tasks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ For Microsoft Graph the parameters for the **Run a Custom Task Extension** task
302302
|displayName | Run a Custom Task Extension (Customizable by user) |
303303
|description | Run a Custom Task Extension to call-out to an external system. (Customizable by user) |
304304
|taskDefinitionId | "d79d1fcc-16be-490c-a865-f4533b1639ee |
305-
|argument | Argument contains a name parameter that is the "LogicAppURL", and a value parameter that is the Logic App HTTP trigger. |
305+
|argument | Argument contains a name parameter that is the "customTaskExtensionID", and a value parameter that is the ID of the previously created extension that contains information about the Logic App. |
306306

307307

308308

@@ -317,7 +317,7 @@ For Microsoft Graph the parameters for the **Run a Custom Task Extension** task
317317
"taskDefinitionId": "d79d1fcc-16be-490c-a865-f4533b1639ee",
318318
"arguments": [
319319
{
320-
"name": "CustomTaskExtensionID",
320+
"name": "customTaskExtensionID",
321321
"value": ""<ID of your Custom Task Extension>""
322322
}
323323
]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ As of now, following versions of Confluence are supported:
6060

6161
- Confluence: 5.0 to 5.10
6262
- Confluence: 6.0.1 to 6.15.9
63-
- Confluence: 7.0.1 to 7.19.0
63+
- Confluence: 7.0.1 to 7.20.0
6464

6565
> [!NOTE]
6666
> Please note that our Confluence Plugin also works on Ubuntu Version 16.04

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use your Microsoft Azure Active Directory account with Atlassian JIRA server to
3030
To configure Azure AD integration with JIRA SAML SSO by Microsoft, you need the following items:
3131

3232
- An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
33-
- JIRA Core and Software 6.4 to 8.22.1 or JIRA Service Desk 3.0 to 4.22.1 should installed and configured on Windows 64-bit version.
33+
- JIRA Core and Software 6.4 to 9.1.0 or JIRA Service Desk 3.0 to 4.22.1 should installed and configured on Windows 64-bit version.
3434
- JIRA server is HTTPS enabled.
3535
- Note the supported versions for JIRA Plugin are mentioned in below section.
3636
- JIRA server is reachable on the Internet particularly to the Azure AD login page for authentication and should able to receive the token from Azure AD.
@@ -51,7 +51,7 @@ To get started, you need the following items:
5151
5252
## Supported versions of JIRA
5353

54-
* JIRA Core and Software: 6.4 to 8.22.1.
54+
* JIRA Core and Software: 6.4 to 9.1.0
5555
* JIRA Service Desk 3.0 to 4.22.1.
5656
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](jira52microsoft-tutorial.md).
5757

articles/active-directory/saas-apps/ms-confluence-jira-plugin-adminguide.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ Note the following information before you install the plug-in:
5959

6060
The plug-in supports the following versions of Jira and Confluence:
6161

62-
* Jira Core and Software: 6.0 to 8.22.1.
62+
* Jira Core and Software: 6.0 to 9.1.0
6363
* Jira Service Desk: 3.0.0 to 4.22.1.
6464
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
6565
* Confluence: 5.0 to 5.10.
6666
* Confluence: 6.0.1 to 6.15.9.
67-
* Confluence: 7.0.1 to 7.19.0.
67+
* Confluence: 7.0.1 to 7.20.0.
6868

6969
## Installation
7070

@@ -172,12 +172,12 @@ No. The plug-in supports only on-premises versions of Jira and Confluence.
172172

173173
The plug-in supports these versions:
174174

175-
* Jira Core and Software: 6.0 to 8.22.1.
175+
* Jira Core and Software: 6.0 to 9.1.0.
176176
* Jira Service Desk: 3.0.0 to 4.22.1.
177177
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
178178
* Confluence: 5.0 to 5.10.
179179
* Confluence: 6.0.1 to 6.15.9.
180-
* Confluence: 7.0.1 to 7.19.0.
180+
* Confluence: 7.0.1 to 7.20.0.
181181

182182
### Is the plug-in free or paid?
183183

articles/virtual-desktop/windows-10-multisession-faq.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
### YamlMime:FAQ
22
metadata:
3-
title: Windows 10 Enterprise multi-session FAQ - Azure
4-
description: Frequently asked questions and best practices for using Windows 10 Enterprise multi-session for Azure Virtual Desktop.
3+
title: Windows 10 and Windows 11 Enterprise multi-session FAQ - Azure
4+
description: Frequently asked questions and best practices for using Windows 10 and Windows 11 Enterprise multi-session for Azure Virtual Desktop.
55
author: Heidilohr
66
ms.topic: faq
77
ms.prod: windows
88
ms.date: 01/04/2022
99
ms.author: helohr
1010
manager: femila
1111
title: Windows 10 Enterprise multi-session FAQ
12-
summary: This article answers frequently asked questions and explains best practices for Windows 10 Enterprise multi-session.
12+
summary: This article answers frequently asked questions and explains best practices for Windows 10 and Windows 11 Enterprise multi-session.
1313

1414

1515
sections:
@@ -27,8 +27,8 @@ sections:
2727
answer: |
2828
Windows 10 Enterprise multi-session is a virtual edition of Windows 10 Enterprise. One of the differences is that this operating system (OS) reports the [ProductType](/windows/win32/cimwin32prov/win32-operatingsystem) as having a value of 3, the same value as Windows Server. This property keeps the OS compatible with existing RDSH management tooling, RDSH multi-session-aware applications, and mostly low-level system performance optimizations for RDSH environments. Some application installers can block installation on Windows 10 multi-session depending on whether they detect the ProductType is set to Client. If your app won't install, contact your application vendor for an updated version.
2929
30-
- question: Can I run Windows 10 Enterprise multi-session on-premises?
31-
answer: Windows 10 Enterprise multi-session can't run in on-premises production environments because it's optimized for the Azure Virtual Desktop service for Azure. It's against the licensing agreement to run Windows 10 Enterprise multi-session outside of Azure for production purposes. Windows 10 Enterprise multi-session won't activate against on-premises Key Management Services (KMS).
30+
- question: Can I run Windows 10 or Windows 11 Enterprise multi-session outside of the Azure Virtual Desktop service?
31+
answer: We don't allow customers to run Windows 10 or 11 Enterprise multi-session in production environments outside of the Azure Virtual Desktop service. Only Microsoft or the Azure Virtual Desktop Approved Providers, Citrix and VMware, can provide access to the Azure Virtual Desktop service. It's against the licensing agreement to run Windows 10 or 11 multi-session outside of the Azure Virtual Desktop service for production purposes. Windows 10 and 11 multi-session also wont activate against on-premises Key Management Services (KMS).
3232

3333
- question: Can I upgrade a Windows 10 VM to Windows 10 Enterprise multi-session?
3434
answer: No. It's not currently possible to upgrade an existing virtual machine (VM) that's running Windows 10 Professional or Enterprise to Windows 10 Enterprise multi-session. Also, if you deploy a Windows 10 Enterprise multi-session VM and then update the product key to another edition, you won't be able to switch the VM back to Windows 10 Enterprise multi-session and will need to redeploy the VM. Changing your Azure Virtual Desktop VM SKU to another edition is not supported.

0 commit comments

Comments
 (0)