Merge branch 'main' into patch-15

Author: kellydevens

articles/active-directory/fundamentals/road-to-the-cloud-posture.md

@@ -114,7 +114,7 @@ In this state:
 
 * A plan to move apps that depend on Active Directory and are part of the vision for the future-state Azure AD environment is being executed. A plan to replace services that won't move (file, print, or fax services) is in place.
 
-* On-premises workloads have been replaced with cloud alternatives such as Windows Virtual Desktop, Azure Files, or Google Cloud Print. Azure SQL Managed Instance replaces SQL Server.
+* On-premises workloads have been replaced with cloud alternatives such as Windows Virtual Desktop, Azure Files, or Universal Print. Azure SQL Managed Instance replaces SQL Server.
 
 ### State 5: 100% cloud
 

articles/active-directory/fundamentals/whats-new.md

@@ -47,7 +47,7 @@ The test matrix includes the following operating systems:
 ## Key Features of v1.0.8
 
 - **Local directory configuration settings** - You can define the working directory that you want to save runbooks locally.
-   - **Change Directory:Base Path** - You use the changed directory path when you reopen Visual Studio code IDE. To change the directory using the Command Palette, use **Ctrl+Shift+P -> select Change Directory**. To change the base path from extension configuration settings, select **Manage** icon in the activity bar on the left and go to **Settings > Extensions > Azure Automation > Directory:Base Path**.
+   - **Change Directory:Base Path** - You use the changed directory path when you reopen Visual Studio Code IDE. To change the directory using the Command Palette, use **Ctrl+Shift+P -> select Change Directory**. To change the base path from extension configuration settings, select **Manage** icon in the activity bar on the left and go to **Settings > Extensions > Azure Automation > Directory:Base Path**.
    - **Change Directory:Folder Structure** - You can change the local directory folder structure from *vscodeAutomation/accHash* to *subscription/resourceGroup/automationAccount*. Select **Manage** icon in the activity bar on the left and go to **Settings > Extensions > Azure Automation > Directory:Folder Structure**. You can change the default configuration setting from *vscodeAutomation/accHash* to *subscription/resourceGroupe/automationAccount* format.
     >[!NOTE]
     >If your automation account is integrated with source control you can provide the runbook folder path of your GitHub repo as the directory path. For example: changing directory to *C:\abc* would store runbooks in *C:\abc\vscodeAutomation..* or *C:\abc//subscriptionName//resourceGroupName//automationAccountName//runbookname.ps1*. 

articles/automation/automation-runbook-authoring.md

@@ -35,7 +35,7 @@ Currently, Azure Cache for Redis uses ports 15000-15019 for clustered caches to
 
 To avoid connection interference, we recommend:
 
-- Consider using a non-clustered cache instead
+- Consider using a non-clustered cache or an Enterprise tier cache instead
 - Avoid configuring *Istio* sidecars on pods running Azure Cache for Redis client code
 
 ## Next steps

articles/azure-cache-for-redis/cache-best-practices-kubernetes.md

@@ -153,6 +153,9 @@ Deleting tasks accomplishes two things:
 - Ensures that you don't have a build-up of tasks in the job. This action will help avoid difficulty in finding the task you're interested in as you'll have to filter through the Completed tasks.
 - Cleans up the corresponding task data on the node (provided `retentionTime` hasn't already been hit). This action helps ensure that your nodes don't fill up with task data and run out of disk space.
 
+> [!NOTE]
+> For tasks just submitted to Batch, the DeleteTask API call takes up to 10 minutes to take effect. Before it takes effect, other tasks might be prevented from being scheduled. It's because Batch Scheduler still tries to schedule the tasks just deleted. If you want to delete one task shortly after it's submitted, please terminate the task instead (since the terminate task will take effect immediately). And then delete the task 10 minutes later.
+
 ### Submit large numbers of tasks in collection
 
 Tasks can be submitted on an individual basis or in collections. Submit tasks in [collections](/rest/api/batchservice/task/addcollection) of up to 100 at a time when doing bulk submission of tasks to reduce overhead and submission time.

articles/batch/best-practices.md

@@ -23,13 +23,9 @@ sudo apt-get install build-essential libssl-dev libasound2 wget
 ```
 
 > [!IMPORTANT]
-> On Ubuntu 22.04, install `libssl1.1` either as a [binary package](http://security.ubuntu.com/ubuntu/pool/main/o/openssl/) such as `libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb`, or by compiling it from sources. The Speech SDK does not support OpenSSL 3.0, which is the default in Ubuntu 22.04.
+> The Speech SDK does not support OpenSSL 3.0, which is the default in Ubuntu 22.04. 
 
-Here's an example of installing `libssl1.1` on Ubuntu 22.04:
-```Bash
-wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb
-sudo dpkg -i libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb
-```
+On Ubuntu 22.04 only, install the latest libssl1.1 either as a [binary package](http://security.ubuntu.com/ubuntu/pool/main/o/openssl/), or by compiling it from sources.
 
 # [Debian 9/10/11](#tab/debian)
 

articles/cognitive-services/Speech-Service/includes/quickstarts/platform/linux-distributions.md

@@ -24,6 +24,7 @@ If you're having issues with Defender for DevOps these frequently asked question
 - [Is it possible to block the developers committing code with exposed secrets](#is-it-possible-to-block-the-developers-committing-code-with-exposed-secrets)
 - [I am not able to configure Pull Request Annotations](#i-am-not-able-to-configure-pull-request-annotations)
 - [What are the programing languages that are supported by Defender for DevOps?](#what-are-the-programing-languages-that-are-supported-by-defender-for-devops) 
+- [I'm getting the There's no CLI tool error in Azure DevOps](#im-getting-the-theres-no-cli-tool-error-in-azure-devops)
 
 
 ### I'm getting an error while trying to connect
@@ -108,6 +109,14 @@ The following languages are supported by Defender for DevOps:
 - Java Script
 - Type Script
 
+### I'm getting the There's no CLI tool error in Azure DevOps
+
+If when running the pipeline in Azure DevOps, you receive the following error: 
+"no such file or directory, scandir 'D:\a\_msdo\versions\microsoft.security.devops.cli'".
+
+This error occurs if you are missing the dependency of `dotnet6` in the pipeline's YAML file. DotNet6 is required to allow the Microsoft Security DevOps extension to run. Include this as a task in your YAML file to eliminate the error.
+ 
+You can learn more about [Microsoft Security DevOps](https://marketplace.visualstudio.com/items?itemName=ms-securitydevops.microsoft-security-devops-azdevops). 
 
 
 ## Next steps

articles/defender-for-cloud/devops-faq.md

@@ -22,7 +22,7 @@ sections:
       questions:
         - question: How can I get access to Microsoft Energy Data Services Preview?
           answer: >
-            Microsoft Energy Data Services requires registration and is currently only available to approved customers and partners during the preview period. Request access to Microsoft Energy Data Services Preview [here](https://aka.ms/MicrosoftEnergyDataServices-create)
+            Microsoft Energy Data Services is available to all customers and partners with a valid subscription. Customers can create an instance by going directly to the Azure Marketplace and searching for "Microsoft Energy Data Services."
 
     - name: Data Residency
       questions:

articles/energy-data-services/faq-energy-data-services.yml

@@ -88,9 +88,9 @@ curl --location --request POST 'https://login.microsoftonline.com/<tenant-id>/oa
 Copy the `access_token` value from the response. You'll need it to pass as one of the headers in all calls to the Entitlements API of your Microsoft Energy Data Services Preview instance. 
 
 ## User management activities
-You can manage user's access to your Microsoft Energy Data Services instance or data partitions. As a prerequisite for this step, you need to find the 'object-id' (OID) of the user(s) first. 
+You can manage users' access to your Microsoft Energy Data Services instance or data partitions. As a prerequisite for this step, you need to find the 'object-id' (OID) of the user(s) first. If you are managing an application's access to your instance or data partition, then you must find and use the application ID (or client ID) instead of the OID.
 
-You'll need to input `object-id` (OID) of the users as parameters in the calls to the Entitlements API of your Microsoft Energy Data Services Preview Instance. `object-id`(OID) is the Azure Active Directory User Object ID.
+You'll need to input the `object-id` (OID) of the users (or the application or client ID if managing access for an application) as parameters in the calls to the Entitlements API of your Microsoft Energy Data Services Preview Instance. `object-id` (OID) is the Azure Active Directory User Object ID.
 
 :::image type="content" source="media/how-to-manage-users/azure-active-directory-object-id.png" alt-text="Screenshot of finding the object-id from Azure Active Directory.":::
 

articles/energy-data-services/how-to-manage-users.md

@@ -45,7 +45,7 @@ Sign in to the [Azure portal](https://aka.ms/orbital/portal).
    > TLE stands for Two-Line Element.
    > 
    > Spacecraft resources can be created in any Azure region with a Microsoft ground station and schedule contacts on any  ground station. Current eligible regions are West US 2, Sweden Central, and Southeast Asia.
-   > 
+   >
    > Be sure to update this TLE value before you schedule a contact. A TLE that's more than two weeks old might result in an unsuccessful downlink.
 
    :::image type="content" source="media/orbital-eos-register-bird.png" alt-text="Register Spacecraft Resource Page" lightbox="media/orbital-eos-register-bird.png":::