Resolving merge conflict

Author: schaffererin

articles/active-directory/hybrid/connect/reference-connect-version-history.md

@@ -70,13 +70,31 @@ For version history information on retired versions, see [Azure AD Connect: Vers
 > [!NOTE]
 > Releasing a new version of Azure AD Connect requires several quality-control steps to ensure the operation functionality of the service. While we go through this process, the version number of a new release and the release status are updated to reflect the most recent state.
 
-Not all releases of Azure AD Connect are made available for auto-upgrade. The release status indicates whether a release is made available for auto-upgrade or for download only. If auto-upgrade was enabled on your Azure AD Connect server, that server automatically upgrades to the latest version of Azure AD Connect that's released for auto-upgrade. Not all Azure AD Connect configurations are eligible for auto-upgrade.
+Not all releases of Azure AD Connect are made available for autoupgrade. The release status indicates whether a release is made available for autoupgrade or for download only. If autoupgrade was enabled on your Azure AD Connect server, that server automatically upgrades to the latest version of Azure AD Connect that's released for autoupgrade. Not all Azure AD Connect configurations are eligible for autoupgrade.
 
-Auto-upgrade is meant to push all important updates and critical fixes to you. It isn't necessarily the latest version because not all versions will require or include a fix to a critical security issue. (This example is just one of many.) Critical issues are usually addressed with a new version provided via auto-upgrade. If there are no such issues, there are no updates pushed out by using auto-upgrade. In general, if you're using the latest auto-upgrade version, you should be good.
+Auto-upgrade is meant to push all important updates and critical fixes to you. It isn't necessarily the latest version because not all versions will require or include a fix to a critical security issue. (This example is just one of many.) Critical issues are usually addressed with a new version provided via autoupgrade. If there are no such issues, there are no updates pushed out by using autoupgrade. In general, if you're using the latest autoupgrade version, you should be good.
 
 If you want all the latest features and updates, check this page and install what you need.
 
-To read more about auto-upgrade, see [Azure AD Connect: Automatic upgrade](how-to-connect-install-automatic-upgrade.md).
+To read more about autoupgrade, see [Azure AD Connect: Automatic upgrade](how-to-connect-install-automatic-upgrade.md).
+
+## 2.2.1.0
+
+### Release status
+5/23/2023: Released for autoupgrade only
+
+### Functional Changes
+ - We have enabled Auto Upgrade for tenants with custom synchronization rules. Note that deleted (not disabled) default rules will be re-created and enabled upon Auto Upgrade.
+ - We have added Microsoft Azure AD Connect Agent Updater service to the install.
+ - We have removed the Synchronization Service WebService Connector Config program from the install.
+
+### Bug Fixes
+ - We have made improvements to accessibility.
+ - We have made the Microsoft Privacy Statement accessible in more places.
+
+
+
+
 
 ## 2.1.20.0
 
@@ -112,15 +130,15 @@ To read more about auto-upgrade, see [Azure AD Connect: Automatic upgrade](how-t
 ## 2.1.16.0
 
 ### Release status
-8/2/2022: Released for download and auto-upgrade.
+8/2/2022: Released for download and autoupgrade.
 
 ### Bug fixes
- - We fixed a bug where auto-upgrade fails when the service account is in "UPN" format.
+ - We fixed a bug where autoupgrade fails when the service account is in "UPN" format.
 
 ## 2.1.15.0
 
 ### Release status
-7/6/2022: Released for download, will be made available for auto-upgrade soon.
+7/6/2022: Released for download, will be made available for autoupgrade soon.
 
 > [!IMPORTANT] 
 > We have discovered a security vulnerability in the Azure AD Connect Admin Agent. If you have installed the Admin Agent previously it is important that you update your Azure AD Connect server(s) to this version to mitigate the vulnerability.
@@ -189,7 +207,7 @@ To read more about auto-upgrade, see [Azure AD Connect: Automatic upgrade](how-t
 
 ### Release status
 
-12/15/2021: Released for download only, not available for auto-upgrade
+12/15/2021: Released for download only, not available for autoupgrade
 
 ### Bug fixes
 
@@ -221,11 +239,11 @@ To read more about auto-upgrade, see [Azure AD Connect: Automatic upgrade](how-t
 
 ### Release status
 
-10/13/2021: Released for download and auto-upgrade
+10/13/2021: Released for download and autoupgrade
 
 ### Bug fixes
 
-- We fixed a bug where the auto-upgrade process attempted to upgrade Azure AD Connect servers that are running older Windows OS version 2008 or 2008 R2 and failed. These versions of Windows Server are no longer supported. In this release, we only attempt auto-upgrade on machines that run Windows Server 2012 or newer.
+- We fixed a bug where the autoupgrade process attempted to upgrade Azure AD Connect servers that are running older Windows OS version 2008 or 2008 R2 and failed. These versions of Windows Server are no longer supported. In this release, we only attempt autoupgrade on machines that run Windows Server 2012 or newer.
 - We fixed an issue where, under certain conditions, miisserver failed because of an access violation exception.
 
 ### Known issues
@@ -239,7 +257,7 @@ When you upgrade to this V1.6 build or any newer builds, the group membership li
 
 ### Release status
 
-9/30/2021: Released for download only, not available for auto-upgrade
+9/30/2021: Released for download only, not available for autoupgrade
 
 ### Bug fixes
 
@@ -264,7 +282,7 @@ When you upgrade to this V1.6 build or any newer builds, the group membership li
 
 ### Release status
 
-9/21/2021: Released for download and auto-upgrade
+9/21/2021: Released for download and autoupgrade
 
 ### Functional changes
 
@@ -283,15 +301,15 @@ When you upgrade to this V1.6 build or any newer builds, the group membership li
 
 ### Release status
 
-9/14/2021: Released for download only, not available for auto-upgrade
+9/14/2021: Released for download only, not available for autoupgrade
 
 ### Bug fixes
 
 - We fixed a security issue where an unquoted path was used to point to the Azure AD Connect service. This path is now a quoted path.
 - We fixed an import configuration issue with writeback enabled when you use the existing Azure AD Connector account.
 - We fixed an issue in Set-ADSyncExchangeHybridPermissions and other related cmdlets, which were broken from V1.6 because of an invalid inheritance type.
 - We fixed an issue with the cmdlet we published in a previous release to set the TLS version. The cmdlet overwrote the keys, which destroyed any values that were in them. Now a new key is created only if one doesn't already exist. We added a warning to let users know the TLS registry changes aren't exclusive to Azure AD Connect and might affect other applications on the same server.
-- We added a check to enforce auto-upgrade for V2.0 to require Windows Server 2016 or newer.
+- We added a check to enforce autoupgrade for V2.0 to require Windows Server 2016 or newer.
 - We added the Replicating Directory Changes permission in the Set-ADSyncBasicReadPermissions cmdlet.
 - We made a change to prevent UseExistingDatabase and import configuration from being used together because they could contain conflicting configuration settings.
 - We made a change to allow a user with the Application Admin role to change the App Proxy service configuration.
@@ -308,14 +326,14 @@ When you upgrade to this V1.6 build or any newer builds, the group membership li
 
 ### Release status
 
-8/19/2021: Released for download only, not available for auto-upgrade
+8/19/2021: Released for download only, not available for autoupgrade
 
 > [!NOTE]
 > This is a hotfix update release of Azure AD Connect. This release requires Windows Server 2016 or newer. This hotfix addresses an issue that's present in version 2.0 and in Azure AD Connect version 1.6. If you're running Azure AD Connect on an older Windows server, install the [1.6.13.0](#16130) build instead.
 
 ### Release status
 
-8/19/2021: Released for download only, not available for auto-upgrade
+8/19/2021: Released for download only, not available for autoupgrade
 
 ### Known issues
 
@@ -330,7 +348,7 @@ We fixed a bug that occurred when a domain was renamed and Password Hash Sync fa
 > [!NOTE]
 > This release is a hotfix update release of Azure AD Connect. It's intended to be used by customers who are running Azure AD Connect on a server with Windows Server 2012 or 2012 R2.
 
-8/19/2021: Released for download only, not available for auto-upgrade
+8/19/2021: Released for download only, not available for autoupgrade
 
 ### Bug fixes
 
@@ -344,7 +362,7 @@ There are no functional changes in this release.
 
 ### Release status
 
-8/17/2021: Released for download only, not available for auto-upgrade
+8/17/2021: Released for download only, not available for autoupgrade
 
 ### Bug fixes
 
@@ -364,7 +382,7 @@ To download the latest version of Azure AD Connect 2.0, see the [Microsoft Downl
 
 ### Release status
 
-8/10/2021: Released for download only, not available for auto-upgrade
+8/10/2021: Released for download only, not available for autoupgrade
 
 ### Functional changes
 
@@ -379,7 +397,7 @@ This release addresses a vulnerability as documented in [this CVE](https://msrc.
 
 ### Release status
 
-8/10/2021: Released for download only, not available for auto-upgrade
+8/10/2021: Released for download only, not available for autoupgrade
 
 ### Functional changes
 
@@ -392,7 +410,7 @@ There are no functional changes in this release.
 
 ### Release status
 
-7/20/2021: Released for download only, not available for auto-upgrade
+7/20/2021: Released for download only, not available for autoupgrade
 
 ### Functional changes
 
@@ -491,7 +509,7 @@ You can use these cmdlets to retrieve the TLS 1.2 enablement status or set it as
 
 ### Release status
 
-3/31/2021: Released for download only, not available for auto-upgrade
+3/31/2021: Released for download only, not available for autoupgrade
 
 ### Bug fixes
 
@@ -509,7 +527,7 @@ This release fixes a bug that occurred in version 1.6.2.4. After upgrade to that
 
 ### Release status
 
-3/19/2021: Released for download, not available for auto-upgrade
+3/19/2021: Released for download, not available for autoupgrade
 
 ### Functional changes
 

articles/aks/learn/tutorial-kubernetes-workload-identity.md

@@ -79,7 +79,7 @@ To help simplify steps to configure the identities required, the steps below def
 1. Create an AKS cluster using the [`az aks create`][az-aks-create] command with the `--enable-oidc-issuer` parameter to use the OIDC Issuer.
 
     ```azurecli-interactive
-    az aks create -g "${RESOURCE_GROUP}" -n myAKSCluster --node-count 1 --enable-oidc-issuer --enable-workload-identity
+    az aks create -g "${RESOURCE_GROUP}" -n myAKSCluster --node-count 1 --enable-oidc-issuer --enable-workload-identity --generate-ssh-keys
     ```
 
     After a few minutes, the command completes and returns JSON-formatted information about the cluster.

articles/cognitive-services/Computer-vision/how-to/call-analyze-image-40.md

@@ -21,7 +21,7 @@ This article demonstrates how to call the Image Analysis 4.0 API to return infor
 This guide assumes you have successfully followed the steps mentioned in the [quickstart](../quickstarts-sdk/image-analysis-client-library-40.md) page. This means:
 
 * You have <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision"  title="created a Computer Vision resource"  target="_blank">created a Computer Vision resource </a> and obtained a key and endpoint URL.
-* If you're using the client SDK, you have the appropriate SDK package installed and you have a running quickstart application. You modify this quickstart application based on code examples here.
+* If you're using the client SDK, you have the appropriate SDK package installed and you have a running [quickstart](../quickstarts-sdk/image-analysis-client-library-40.md) application. You can modify this quickstart application based on code examples here.
 * If you're using 4.0 REST API calls directly, you have successfully made a `curl.exe` call to the service (or used an alternative tool). You modify the `curl.exe` call based on the examples here.
 
 ## Authenticate against the service

articles/cognitive-services/Computer-vision/includes/quickstarts-sdk/image-analysis-cpp-sdk-40.md

@@ -1,6 +1,6 @@
 ---
-title: "Quickstart: Image Analysis 4.0 client library for .NET"
-description: In this quickstart, get started with the Image Analysis 4.0 client library for .NET.
+title: "Quickstart: Image Analysis 4.0 client SDK for .NET"
+description: In this quickstart, get started with the Image Analysis 4.0 client SDK for .NET.
 services: cognitive-services
 author: PatrickFarley
 manager: nitinme
@@ -14,7 +14,7 @@ ms.author: pafarley
 
 <a name="HOLTop"></a>
 
-Use the Image Analysis client library for C++ to analyze an image to read text and generate an image caption. This quickstart defines a function `AnalyzeImage()`, which uses the client object to analyze a remote image and print the results to the console.
+Use the Image Analysis client SDK for C++ to analyze an image to read text and generate an image caption. This quickstart defines a function `AnalyzeImage()`, which uses the client object to analyze a remote image and print the results to the console.
 
 [Reference documentation](/cpp/cognitive-services/vision) | Packages (NuGet): [ImageAnalysis](https://www.nuget.org/packages/Azure.AI.Vision.ImageAnalysis) | [Samples](https://github.com/Azure-Samples/azure-ai-vision-sdk)
 
@@ -40,9 +40,9 @@ Create a new C++ application.
 
 Open Visual Studio, and under **Get started** select **Create a new project**. Set the template filters to _C++/Windows/Console_. Select **Console App** and choose **Next**. Update the project name to _ImageAnalysisQuickstart_ and choose **Create** to create the project.
 
-### Install the client library 
+### Install the client SDK 
 
-Once you've created a new project, install the client library by right-clicking on the project solution in the **Solution Explorer** and selecting **Manage NuGet Packages**. In the package manager that opens select **Browse**, check **Include prerelease**, and search for `Azure.AI.Vision.ImageAnalysis`. Select **Install**. 
+Once you've created a new project, install the client SDK by right-clicking on the project solution in the **Solution Explorer** and selecting **Manage NuGet Packages**. In the package manager that opens select **Browse**, check **Include prerelease**, and search for `Azure.AI.Vision.ImageAnalysis`. Select **Install**. 
 
 #### [Linux](#tab/linux)
 
@@ -147,7 +147,7 @@ If you want to clean up and remove a Cognitive Services subscription, you can de
 
 ## Next steps
 
-In this quickstart, you learned how to install the Image Analysis client library and make basic image analysis calls. Next, learn more about the Analysis 4.0 API features.
+In this quickstart, you learned how to install the Image Analysis client SDK and make basic image analysis calls. Next, learn more about the Analysis 4.0 API features.
 
 
 > [!div class="nextstepaction"]

articles/cognitive-services/Computer-vision/includes/quickstarts-sdk/image-analysis-csharp-sdk-40.md

@@ -1,6 +1,6 @@
 ---
-title: "Quickstart: Image Analysis client 4.0 library for .NET"
-description: In this quickstart, get started with the Image Analysis 4.0 client library for .NET.
+title: "Quickstart: Image Analysis client 4.0 SDK for .NET"
+description: In this quickstart, get started with the Image Analysis 4.0 client SDK for .NET.
 services: cognitive-services
 author: PatrickFarley
 manager: nitinme
@@ -14,7 +14,7 @@ ms.author: pafarley
 
 <a name="HOLTop"></a>
 
-Use the Image Analysis client library for C# to analyze an image to read text and generate an image caption. This quickstart defines a method `AnalyzeAsync()`, which uses the client object to analyze a remote image and print the results to the console. 
+Use the Image Analysis client SDK for C# to analyze an image to read text and generate an image caption. This quickstart defines a method `AnalyzeAsync()`, which uses the client object to analyze a remote image and print the results to the console. 
 
 [Reference documentation](/dotnet/api/azure.ai.vision.imageanalysis
 ) | Packages (NuGet): [ImageAnalysis](https://www.nuget.org/packages/Azure.AI.Vision.ImageAnalysis) | [Samples](https://github.com/Azure-Samples/azure-ai-vision-sdk)
@@ -26,7 +26,7 @@ Use the Image Analysis client library for C# to analyze an image to read text an
 
 * An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/)
 * The [Visual Studio IDE](https://visualstudio.microsoft.com/vs/) with workload **.NET desktop development** enabled. Or if you don't plan on using Visual Studio IDE, you need [.NET 6.0](https://dotnet.microsoft.com/download/dotnet-core) SDK or above installed.
-* [.NET Core 3.1 Runtime](https://dotnet.microsoft.com/download/dotnet/3.1) installed.
+* [.NET Runtime](https://dotnet.microsoft.com/download/dotnet/) installed.
 * Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision"  title="Create a Computer Vision resource"  target="_blank">create a Computer Vision resource</a> in the Azure portal. In order to use the captioning feature in this quickstart, you must create your resource in one of the following Azure regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US. After it deploys, click **Go to resource**.
     * You need the key and endpoint from the resource you create to connect your application to the Computer Vision service.
     * You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
@@ -42,9 +42,9 @@ Create a new C# application.
 
 Open Visual Studio, and under **Get started** select **Create a new project**. Set the template filters to _C#/All Platforms/Console_. Select **Console App** (command-line application that can run on .NET on Windows, Linux and macOS) and choose **Next**. Update the project name to _ImageAnalysisQuickstart_ and choose **Next**. Select **.NET 6.0** or above, and choose **Create** to create the project.
 
-### Install the client library 
+### Install the client SDK 
 
-Once you've created a new project, install the client library by right-clicking on the project solution in the **Solution Explorer** and selecting **Manage NuGet Packages**. In the package manager that opens select **Browse**, check **Include prerelease**, and search for `Azure.AI.Vision.ImageAnalysis`. Select **Install**.
+Once you've created a new project, install the client SDK by right-clicking on the project solution in the **Solution Explorer** and selecting **Manage NuGet Packages**. In the package manager that opens select **Browse**, check **Include prerelease**, and search for `Azure.AI.Vision.ImageAnalysis`. Select **Install**.
 
 #### [CLI](#tab/cli)
 
@@ -70,9 +70,9 @@ Build succeeded.
 ...
 ```
 
-### Install the client library
+### Install the client SDK
 
-Within the application directory, install the Computer Vision client library for .NET with the following command:
+Within the application directory, install the Computer Vision client SDK for .NET with the following command:
 
 ```dotnet
 dotnet add package  Azure.AI.Vision.ImageAnalysis --prerelease
@@ -192,7 +192,7 @@ If you want to clean up and remove a Cognitive Services subscription, you can de
 
 ## Next steps
 
-In this quickstart, you learned how to install the Image Analysis client library and make basic image analysis calls. Next, learn more about the Analysis 4.0 API features.
+In this quickstart, you learned how to install the Image Analysis client SDK and make basic image analysis calls. Next, learn more about the Analysis 4.0 API features.
 
 
 > [!div class="nextstepaction"]