Skip to content

Commit 2fbf459

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into in-nat-overview
2 parents aa0b087 + cf80fd3 commit 2fbf459

30 files changed

+612
-128
lines changed

articles/active-directory/hybrid/whatis-azure-ad-connect-v2.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management, has-adal-ref
1717

1818
Azure AD Connect was released several years ago. Since this time, several of the components that Azure AD Connect uses have been scheduled for deprecation and updated to newer versions. To attempt to update all of these components individually would take time and planning.
1919

20-
To address this, we wanted to bundle as many of these newer components into a new, single release, so you only have to update once. This release will be Azure AD Connect V2.0. This is a new version of the same software used to accomplish your hybrid identity goals that is built using the latest foundational components.
20+
To address this, we have bundled as many of these newer components into a new, single release, so you only have to update once. This release is Azure AD Connect V2. This is a new version of the same software used to accomplish your hybrid identity goals that is built using the latest foundational components.
2121

2222
## What are the major changes?
2323

@@ -27,16 +27,16 @@ The previous versions of Azure AD Connect shipped with a SQL Server 2012 LocalDB
2727

2828
### MSAL authentication library
2929

30-
The previous versions of Azure AD Connect shipped with the ADAL authentication library. This library will be deprecated in June 2022. The V2.0 release ships with the newer MSAL library. For more information see [Overview of the MSAL library](../../active-directory/develop/msal-overview.md).
30+
The previous versions of Azure AD Connect shipped with the ADAL authentication library. This library will be deprecated in June 2022. The V2 release ships with the newer MSAL library. For more information see [Overview of the MSAL library](../../active-directory/develop/msal-overview.md).
3131

3232
### Visual C++ Redist 14
3333

34-
SQL Server 2019 requires the Visual C++ Redist 14 runtime, so we are updating the C++ runtime library to use this version. This will be installed with the Azure AD Connect V2.0 package, so you do not have to take any action for the C++ runtime update.
34+
SQL Server 2019 requires the Visual C++ Redist 14 runtime, so we are updating the C++ runtime library to use this version. This will be installed with the Azure AD Connect V2 package, so you do not have to take any action for the C++ runtime update.
3535

3636
### TLS 1.2
3737

3838
TLS1.0 and TLS 1.1 are protocols that are deemed unsafe and are being deprecated by Microsoft. This release of Azure AD Connect will only support TLS 1.2.
39-
All versions of Windows Server that are supported for Azure AD Connect V2.0 already default to TLS 1.2. If your server does not support TLS 1.2 you will need to enable this before you can deploy Azure AD Connect V2.0. For more information, see [TLS 1.2 enforcement for Azure AD Connect](reference-connect-tls-enforcement.md).
39+
All versions of Windows Server that are supported for Azure AD Connect V2 already default to TLS 1.2. If your server does not support TLS 1.2 you will need to enable this before you can deploy Azure AD Connect V2. For more information, see [TLS 1.2 enforcement for Azure AD Connect](reference-connect-tls-enforcement.md).
4040

4141
### All binaries signed with SHA2
4242

@@ -70,35 +70,35 @@ Next year several of the components in your current Azure AD Connect server inst
7070
This upgrade is especially important since we have had to update our prerequisites for Azure AD Connect and you may need additional time to plan and update your servers to the newer versions of these prerequisites
7171

7272
**Is there any new functionality I need to know about?** </br>
73-
No – this release does not contain any new functionality. This release only contains updates of some of the foundational components on Azure AD Connect.
73+
No – the V2.0 release does not contain any new functionality. This release only contains updates of some of the foundational components on Azure AD Connect. However, later releases of Azure AD Connect V2 may contain new functionality.
7474

75-
**Can I upgrade from any previous version to V2.0?** </br>
76-
Yes – upgrades from any previous version of Azure AD Connect to Azure AD Connect V2.0 is supported. Please follow the guidance in [this article](how-to-upgrade-previous-version.md) to determine what is the best upgrade strategy for you.
75+
**Can I upgrade from any previous version to V2?** </br>
76+
Yes – upgrades from any previous version of Azure AD Connect to Azure AD Connect V2 is supported. Please follow the guidance in [this article](how-to-upgrade-previous-version.md) to determine what is the best upgrade strategy for you.
7777

78-
**Can I export the configuration of my current server and import it in Azure AD Connect V2.0?** </br>
79-
Yes, you can do that, and it is a great way to migrate to Azure AD Connect V2.0 – especially if you are also upgrading to a new operating system version. You can read more about the Import/export configuration feature and how you can use it in this [article](how-to-connect-import-export-config.md).
78+
**Can I export the configuration of my current server and import it in Azure AD Connect V2?** </br>
79+
Yes, you can do that, and it is a great way to migrate to Azure AD Connect V2 – especially if you are also upgrading to a new operating system version. You can read more about the Import/export configuration feature and how you can use it in this [article](how-to-connect-import-export-config.md).
8080

8181
**I have enabled auto upgrade for Azure AD Connect – will I get this new version automatically?** </br>
82-
No – Azure AD Connect V2.0 will not be made available for auto upgrade at this time.
82+
Yes - your Azure AD Connect server will be upgraded to the latest release if you have enabled the auto-upgrade feature. Note that we have no yet release an autop upgrade version for Azure AD Connect.
8383

8484
**I am not ready to upgrade yet – how much time do I have?** </br>
85-
You should upgrade to Azure AD Connect V2.0 as soon as you can. **__All Azure AD Connect V1 versions will be retired on 31 August, 2022.__** For the time being we will continue to support older versions of Azure AD Connect, but it may prove difficult to provide a good support experience if some of the components in Azure AD Connect have dropped out of support. This upgrade is particularly important for ADAL and TLS1.0/1.1 as these services might stop working unexpectedly after they are deprecated.
85+
You should upgrade to Azure AD Connect V2 as soon as you can. **__All Azure AD Connect V1 versions will be retired on 31 August, 2022.__** For the time being we will continue to support older versions of Azure AD Connect, but it may prove difficult to provide a good support experience if some of the components in Azure AD Connect have dropped out of support. This upgrade is particularly important for ADAL and TLS1.0/1.1 as these services might stop working unexpectedly after they are deprecated.
8686

8787
**I use an external SQL database and do not use SQL 2012 LocalDb – do I still have to upgrade?** </br>
88-
Yes, you still need to upgrade to remain in a supported state even if you do not use SQL Server 2012, due to the TLS1.0/1.1 and ADAL deprecation. Note that SQL Server 2012 can still be used as an external SQL database with Azure AD Connect V2.0 - the SQL 2019 drivers in Azure AD Connect V2.0 are compatible with SQL Server 2012.
88+
Yes, you still need to upgrade to remain in a supported state even if you do not use SQL Server 2012, due to the TLS1.0/1.1 and ADAL deprecation. Note that SQL Server 2012 can still be used as an external SQL database with Azure AD Connect V2 - the SQL 2019 drivers in Azure AD Connect V2 are compatible with SQL Server 2012.
8989

90-
**After the upgrade of my Azure AD Connect instance to V2.0, will the SQL 2012 components automatically get uninstalled?** </br>
90+
**After the upgrade of my Azure AD Connect instance to V2, will the SQL 2012 components automatically get uninstalled?** </br>
9191
No, the upgrade to SQL 2019 does not remove any SQL 2012 components from your server. If you no longer need these components then you should follow [the SQL Server uninstallation instructions](/sql/sql-server/install/uninstall-an-existing-instance-of-sql-server-setup).
9292

9393
**What happens if I do not upgrade?** </br>
9494
Until one of the components that are being retired are actually deprecated, you will not see any impact. Azure AD Connect will keep on working.
9595

96-
We expect TLS 1.0/1.1 to be deprecated in January 2022, and you need to make sure you are not using these protocols by that date as your service may stop working unexpectedly. You can manually configure your server for TLS 1.2 though, and that does not require an update of Azure AD Connect to V2.0
96+
We expect TLS 1.0/1.1 to be deprecated in 2022, and you need to make sure you are not using these protocols by that date as your service may stop working unexpectedly. You can manually configure your server for TLS 1.2 though, and that does not require an update of Azure AD Connect to V2
9797

98-
In June 2022, ADAL will go out of support. When ADAL goes out of support authentication may stop working unexpectedly and this will block the Azure AD Connect server from working properly. We strongly advise you to upgrade to Azure AD Connect V2.0 before June 2022. You cannot upgrade to a supported authentication library with your current Azure AD Connect version.
98+
In June 2022, ADAL is planned to go out of support. When ADAL goes out of support authentication may stop working unexpectedly and this will block the Azure AD Connect server from working properly. We strongly advise you to upgrade to Azure AD Connect V2 before June 2022. You cannot upgrade to a supported authentication library with your current Azure AD Connect version.
9999

100-
**After upgrading to 2.0 the ADSync PowerShell cmdlets do not work?** </br>
101-
This is a known issue. To resolve this, restart your PowerShell session after installing or upgrading to version 2.0 and then re-import the module. Use the following instructions to import the module.
100+
**After upgrading to 2 the ADSync PowerShell cmdlets do not work?** </br>
101+
This is a known issue. To resolve this, restart your PowerShell session after installing or upgrading to version 2 and then re-import the module. Use the following instructions to import the module.
102102

103103
1. Open Windows PowerShell with administrative privileges.
104104
1. Type or copy and paste the following code:
@@ -107,7 +107,7 @@ This is a known issue. To resolve this, restart your PowerShell session after in
107107
Import-module -Name "C:\Program Files\Microsoft Azure AD Sync\Bin\ADSync"
108108
```
109109
110-
## License requirements for using Azure AD Connect V2.0
110+
## License requirements for using Azure AD Connect V2
111111
112112
[!INCLUDE [active-directory-free-license.md](../../../includes/active-directory-free-license.md)]
113113

articles/azure-functions/functions-bindings-service-bus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ When you set the `isSessionsEnabled` property or attribute on [the trigger](func
187187
|**maxAutoLockRenewalDuration**|`00:05:00`|The maximum duration within which the message lock will be renewed automatically. This setting only applies for functions that receive a single message at a time.|
188188
|**maxConcurrentCalls**|`16`|The maximum number of concurrent calls to the callback that the should be initiate per scaled instance. By default, the Functions runtime processes multiple messages concurrently. This setting only applies for functions that receive a single message at a time.|
189189
|**maxConcurrentSessions**|`8`|The maximum number of sessions that can be handled concurrently per scaled instance. This setting only applies for functions that receive a single message at a time.|
190-
|**maxMessages**|`1000`|The maximum number of messages that will be passed to each function call. This setting only applies for functions that receive a batch of messages.|
190+
|**maxMessageBatchSize**|`1000`|The maximum number of messages that will be passed to each function call. This setting only applies for functions that receive a batch of messages.|
191191
|**sessionIdleTimeout**|n/a|The maximum amount of time to wait for a message to be received for the currently active session. After this time has elapsed, the processor will close the session and attempt to process another session. This setting only applies for functions that receive a single message at a time.|
192192
|**enableCrossEntityTransactions**|`false`|Whether or not to enable transactions that span multiple entities on a Service Bus namespace.|
193193

articles/azure-monitor/app/java-standalone-sampling-overrides.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ To begin, create a configuration file named *applicationinsights.json*. Save it
6969
When a span is started, the attributes present on the span at that time are used to check if any of the sampling
7070
overrides match.
7171

72+
Matches can be either `strict` or `regexp`. Regular expression matches are performed against the entire attribute value,
73+
so if you want to match a value that contains `abc` anywhere in it, then you need to use `.*abc.*`.
74+
7275
If one of the sampling overrides match, then its sampling percentage is used to decide whether to sample the span or
7376
not.
7477

articles/azure-monitor/app/java-standalone-telemetry-processors.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,9 @@ To configure this option, under `include` or `exclude` (or both), specify at lea
236236
The include-exclude configuration allows more than one specified condition.
237237
All specified conditions must evaluate to true to result in a match.
238238

239-
* **Required field**: `matchType` controls how items in `spanNames` arrays and `attributes` arrays are interpreted. Possible values are `regexp` and `strict`.
239+
* **Required field**: `matchType` controls how items in `spanNames` arrays and `attributes` arrays are interpreted.
240+
Possible values are `regexp` and `strict`. Regular expression matches are performed against the entire attribute value,
241+
so if you want to match a value that contains `abc` anywhere in it, then you need to use `.*abc.*`.
240242

241243
* **Optional fields**:
242244
* `spanNames` must match at least one of the items.
@@ -383,7 +385,9 @@ To configure this option, under `include` or `exclude` (or both), specify at lea
383385
The include-exclude configuration allows more than one specified condition.
384386
All specified conditions must evaluate to true to result in a match.
385387

386-
* **Required field**: `matchType` controls how items in `spanNames` arrays and `attributes` arrays are interpreted. Possible values are `regexp` and `strict`.
388+
* **Required field**: `matchType` controls how items in `spanNames` arrays and `attributes` arrays are interpreted.
389+
Possible values are `regexp` and `strict`. Regular expression matches are performed against the entire attribute value,
390+
so if you want to match a value that contains `abc` anywhere in it, then you need to use `.*abc.*`.
387391

388392
* **Optional fields**:
389393
* `spanNames` must match at least one of the items.
@@ -506,7 +510,9 @@ The include-exclude configuration allows more than one specified condition.
506510
All specified conditions must evaluate to true to result in a match.
507511

508512
* **Required field**:
509-
* `matchType` controls how items in `attributes` arrays are interpreted. Possible values are `regexp` and `strict`.
513+
* `matchType` controls how items in `attributes` arrays are interpreted. Possible values are `regexp` and `strict`.
514+
Regular expression matches are performed against the entire attribute value,
515+
so if you want to match a value that contains `abc` anywhere in it, then you need to use `.*abc.*`.
510516
* `attributes` specifies the list of attributes to match. All of these attributes must match exactly to result in a match.
511517

512518
> [!NOTE]
@@ -566,7 +572,9 @@ To configure this option, under `exclude`, specify the `matchType` one or more `
566572

567573
* **Required field**:
568574
* `matchType` controls how items in `metricNames` are matched. Possible values are `regexp` and `strict`.
569-
* `metricNames` must match at least one of the items.
575+
Regular expression matches are performed against the entire attribute value,
576+
so if you want to match a value that contains `abc` anywhere in it, then you need to use `.*abc.*`.
577+
* `metricNames` must match at least one of the items.
570578

571579
### Sample usage
572580

articles/bastion/bastion-create-host-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ The following required roles for your resources.
166166

167167
You can use the [Connection steps](#steps) in the section below to connect to your VM. You can also use any of the following articles to connect to a VM. Some connection types require the Bastion [Standard SKU](configuration-settings.md#skus).
168168

169-
[!INCLUDE [Links to Connect to VM articles](../../includes/bastion-vm-table.md)]
169+
[!INCLUDE [Links to Connect to VM articles](../../includes/bastion-vm-connect-article-list.md)]
170170

171171
### <a name="steps"></a>Connection steps
172172

articles/bastion/create-host-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ This section helps you deploy Azure Bastion using Azure CLI.
6969

7070
## <a name="connect"></a>Connect to a VM
7171

72-
You can use any of the following articles to connect to a VM that's located in the virtual network to which you deployed Bastion. You can also use the [Connection steps](#steps) in the section below. Some connection types require the [Standard SKU](configuration-settings.md#skus).
72+
You can use the [Connection steps](#steps) in the section below to connect to your VM. You can also use any of the following articles to connect to a VM. Some connection types require the Bastion [Standard SKU](configuration-settings.md#skus).
7373

74-
[!INCLUDE [Links to Connect to VM articles](../../includes/bastion-vm-table.md)]
74+
[!INCLUDE [Links to Connect to VM articles](../../includes/bastion-vm-connect-article-list.md)]
7575

7676
### <a name="steps"></a>Connection steps
7777

articles/bastion/tutorial-create-host-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ This is the public IP address of the Bastion host resource on which RDP/SSH will
154154

155155
You can use the [Connection steps](#steps) in the section below to connect to your VM. You can also use any of the following articles to connect to a VM. Some connection types require the Bastion [Standard SKU](configuration-settings.md#skus).
156156

157-
[!INCLUDE [Links to Connect to VM articles](../../includes/bastion-vm-table.md)]
157+
[!INCLUDE [Links to Connect to VM articles](../../includes/bastion-vm-connect-article-list.md)]
158158

159159
### <a name="steps"></a>Connection steps
160160

articles/cognitive-services/Speech-Service/speech-container-howto.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ With Speech containers, you can build a speech application architecture that's o
2929
| Custom speech-to-text | Using a custom model from the [Custom Speech portal](https://speech.microsoft.com/customspeech), transcribes continuous real-time speech or batch audio recordings into text with intermediate results. | 3.0.0 | Generally available |
3030
| Text-to-speech | Converts text to natural-sounding speech with plain text input or Speech Synthesis Markup Language (SSML). | 1.15.0 | Generally available |
3131
| Speech language identification | Detects the language spoken in audio files. | 1.5.0 | Preview |
32-
| Neural text-to-speech | Converts text to natural-sounding speech by using deep neural network technology, which allows for more natural synthesized speech. | 1.12.0 | Generally available |
32+
| Neural text-to-speech | Converts text to natural-sounding speech by using deep neural network technology, which allows for more natural synthesized speech. | 2.0.0 | Generally available |
3333

3434
## Prerequisites
3535

@@ -261,6 +261,8 @@ Use the [docker run](https://docs.docker.com/engine/reference/commandline/run/)
261261

262262
Starting in container version 3.0.0, select customers can run speech-to-text containers in an environment without internet accessibility. For more information, see [Run Cognitive Services containers in disconnected environments](../containers/disconnected-containers.md).
263263

264+
Starting in container version 2.0.0, select customers can run neural-text-to-speech containers in an environment without internet accessibility. For more information, see [Run Cognitive Services containers in disconnected environments](../containers/disconnected-containers.md).
265+
264266
# [Speech-to-text](#tab/stt)
265267

266268
To run the standard speech-to-text container, execute the following `docker run` command:

0 commit comments

Comments
 (0)