Skip to content

Commit 64806d2

Browse files
authored
Merge pull request #261524 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 373d55e + 1326242 commit 64806d2

14 files changed

+92
-86
lines changed

articles/ai-services/computer-vision/concept-background-removal.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ This feature provides two possible outputs based on the customer's needs:
2727

2828
This service is currently in preview, and the API may change in the future.
2929

30+
> [!IMPORTANT]
31+
> Background removal is only available in the following Azure regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US.
32+
3033
## Background removal examples
3134

3235
The following example images illustrate what the Image Analysis service returns when removing the background of an image and creating an alpha matte.

articles/ai-services/content-safety/concepts/jailbreak-detection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Despite these precautions, models remain susceptible to adversarial inputs that
2323

2424
## What is a jailbreak attack?
2525

26-
A jailbreak attack, also known as a User Prompt Injection Attack (UPIA), is an intentional attempt by a user to exploit the vulnerabilities of an LLM-powered system, bypass its safety mechanisms, and provoke restricted behaviors. These attacks can lead to the LLM generating inappropriate content or performing actions restricted by System Prompt or RHLF.
26+
A jailbreak attack, also known as a User Prompt Injection Attack (UPIA), is an intentional attempt by a user to exploit the vulnerabilities of an LLM-powered system, bypass its safety mechanisms, and provoke restricted behaviors. These attacks can lead to the LLM generating inappropriate content or performing actions restricted by System Prompt or RLHF(Reinforcement Learning with Human Feedback).
2727

2828
Most generative AI models are prompt-based: the user interacts with the model by entering a text prompt, to which the model responds with a completion.
2929

articles/ai-services/openai/includes/gpt-v-rest.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,10 @@ The **object grounding** integration brings a new layer to data analysis and use
136136
"dataSources": [
137137
{
138138
"type": "AzureComputerVision",
139-
"endpoint": " <your_computer_vision_endpoint> ",
140-
"key": "<your_computer_vision_key>",
141-
"indexName": "test-products"
139+
"parameters": {
140+
"endpoint": "<your_computer_vision_endpoint>",
141+
"key": "<your_computer_vision_key>"
142+
}
142143
}],
143144
"messages": [
144145
{ "role": "system", "content": "You are a helpful assistant." },

articles/azure-arc/servers/agent-release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Download for [Windows](https://download.microsoft.com/download/f/6/4/f64c574f-d3
3434
- Agent installation and upgrades apply more restrictive permissions to the agent's data directories on Windows
3535
- Improved reliability when detecting Azure Stack HCI as a cloud provider
3636
- Removed the log zipping feature introduced in version 1.37 for extension manager and machine configuration agent logs. Log files will still be rotated automatically.
37+
- Resolved [Azure Connected Machine Agent Elevation of Privilege Vulnerability](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2023-35624)
3738

3839
## Version 1.36 - November 2023
3940

articles/copilot/deploy-vms-effectively.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Microsoft Copilot for Azure (preview) can guide you in suggesting different opti
3535

3636
### Examples
3737

38-
During the VM creation process, you can ask "How do I reduce the cost of my virtual machine?" Microsoft Copilot for Azure (preview) guides you through options to make your VM more cost-effective, providing options that you can enable.
38+
During the VM creation process, you can ask "**How do I reduce the cost of my virtual machine?**" Microsoft Copilot for Azure (preview) guides you through options to make your VM more cost-effective, providing options that you can enable.
3939

4040
:::image type="content" source="media/deploy-vms-effectively/vm-reduce-costs.png" lightbox="media/deploy-vms-effectively/vm-reduce-costs.png" alt-text="Screenshot showing Microsoft Copilot for Azure (preview) providing ways to lower VM costs.":::
4141

@@ -54,7 +54,7 @@ Microsoft Copilot for Azure (preview) can provide additional context to help you
5454

5555
### Examples
5656

57-
During the VM creation process, you can ask "How do I create a resilient and high availability virtual machine?" Microsoft Copilot for Azure (preview) guides you through options to configure your VM for high availability, providing options that you can enable.
57+
During the VM creation process, you can ask "**How do I create a resilient and high availability virtual machine?**" Microsoft Copilot for Azure (preview) guides you through options to configure your VM for high availability, providing options that you can enable.
5858

5959
:::image type="content" source="media/deploy-vms-effectively/vm-resilient-high-availability.png" lightbox="media/deploy-vms-effectively/vm-resilient-high-availability.png" alt-text="Screenshot showing Microsoft Copilot for Azure (preview) providing ways to configure a VM for high availability.":::
6060

@@ -69,7 +69,7 @@ Azure offers different size options for VMs based on your workload needs. Micros
6969

7070
### Examples
7171

72-
Ask "Help me choose the right VM size for my workload?" Microsoft Copilot for Azure (preview) asks for some more information to help it determine the best options. After that, it presents some options and lets you choose which recommended size to use for your VM.
72+
Ask "**Help me choose the right VM size for my workload?**" Microsoft Copilot for Azure (preview) asks for some more information to help it determine the best options. After that, it presents some options and lets you choose which recommended size to use for your VM.
7373

7474
:::image type="content" source="media/deploy-vms-effectively/vm-choose-size.png" lightbox="media/deploy-vms-effectively/vm-choose-size.png" alt-text="Screenshot of Screenshot showing Microsoft Copilot for Azure (preview) providing size recommendations for a VM.":::
7575

articles/lab-services/connect-virtual-machine-chromebook-remote-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ Next, you connect to the lab VM by using the remote desktop application. You can
5656

5757
## Next steps
5858

59-
- As an educator, [configure RDP for Linux VMs](how-to-enable-remote-desktop-linux.md#rdp-setup)
59+
- As an educator, [configure RDP for Linux VMs](how-to-enable-remote-desktop-linux.md)
6060
- As a student, [stop the VM](how-to-use-lab.md#start-or-stop-the-vm)

articles/lab-services/connect-virtual-machine-linux-x2go.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ ms.date: 04/24/2023
1212

1313
# Connect to a lab VM using X2Go in Azure Lab Services
1414

15-
In this article, you learn how to connect to a Linux-based lab VM in Azure Lab Services by using X2Go. Before you can connect with X2Go, the lab needs to have the X2Go and the GUI packages for a Linux graphical desktop environment.
15+
In this article, you learn how to connect to a Linux-based lab VM in Azure Lab Services by using X2Go. Before you can connect with X2Go, the lab needs to have the [X2Go and the Linux GUI (graphical user interface) desktop packages configured](./how-to-enable-remote-desktop-linux.md) by the lab creator.
1616

17-
When you connect to the lab VM by using X2Go, you need to provide the Linux graphical desktop environment version. For example, select `XFCE` if you're using either XFCE or Xubuntu graphical desktop environments. You can get this information from the person that created the lab.
17+
When you connect to the lab VM by using X2Go, you need to provide the Linux GUI desktop version. For example, select *XFCE* if you're using either XFCE or xUbuntu GUI desktops. You can get this information from the person that created the lab.
1818

1919
## Install X2Go client
2020

@@ -44,7 +44,7 @@ Install the [X2Go client](https://wiki.x2go.org/doku.php/doc:installation:x2gocl
4444
- **Host** - The ID of your VM; for example, **`ml-lab-00000000-0000-0000-0000-000000000000.eastus2.cloudapp.azure.com`**.
4545
- **Login** - The username for your VM; for example, **student**.
4646
- **SSH port** - The unique port assigned to your VM; for example, **12345**.
47-
- **Session type** - Select the Linux graphical desktop environment that was used when setting up the lab. For example, select `XFCE` if you're using either XFCE or Xubuntu graphical desktop environments.
47+
- **Session type** - Select the Linux GUI desktop that was used when setting up the lab. For example, select **XFCE** if you're using either XFCE or xUbuntu GUI desktops.
4848
4949
1. Select **OK** to create the remote session.
5050
@@ -59,8 +59,8 @@ Install the [X2Go client](https://wiki.x2go.org/doku.php/doc:installation:x2gocl
5959

6060
1. When prompted, enter your password and select **OK**.
6161

62-
You're now remotely connected to your lab VM's GUI desktop environment.
62+
You're now remotely connected to your lab VM's GUI desktop.
6363

6464
## Next steps
6565

66-
- [Configure X2Go on a template VM](how-to-enable-remote-desktop-linux.md#setting-up-x2go)
66+
- [Configure X2Go on a template VM](how-to-enable-remote-desktop-linux.md)

articles/lab-services/connect-virtual-machine-windows-rdp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ The RDP client software has various settings for optimizing your connection expe
4444

4545
Learn more about the [RDP client's **Experience** settings](/windows-server/administration/performance-tuning/role/remote-desktop/session-hosts#client-experience-settings).
4646

47-
If the lab creator configured the GNOME graphical desktop on a Linux lab VM with the RDP client, we recommend the following settings to optimize performance:
47+
If you're using a Linux lab VM with a graphical desktop and the RDP client, the following settings may help to optimize performance:
4848

4949
- On the **Display** tab, set the color depth to **High Color (15 bit)**.
5050

5151
:::image type="content" source="./media/connect-virtual-machine-windows-rdp/rdp-display-settings.png" alt-text="Screenshot of display tab of the Windows R D P client, highlighting the color depth setting.":::
5252

5353
- On the **Experience** tab, set the connection speed to **Modem (56 kbps)**.
5454

55-
:::image type="content" source="./media/connect-virtual-machine-windows-rdp/rdp-experience-settings.png" alt-text="Screenshot of experience tab of the Windows R D P client, highlighting the connection speed setting.":::
55+
:::image type="content" source="./media/connect-virtual-machine-windows-rdp/rdp-experience-settings.png" alt-text="Screenshot of experience tab of the Windows RDP client, highlighting the connection speed setting.":::
5656

5757
## Next steps
5858

59-
- [As an educator, enabled RDP on Linux](how-to-enable-remote-desktop-linux.md#rdp-setup)
59+
- [As an educator, enabled RDP on Linux](how-to-enable-remote-desktop-linux.md)
6060
- [As a student, stop the VM](how-to-use-lab.md#start-or-stop-the-vm)

articles/lab-services/connect-virtual-machine.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,11 @@ Follow these instructions to connect to a Windows-based lab VM. Choose the instr
3030

3131
To connect to a Linux-based lab VM, you can use the secure shell protocol (SSH), remote desktop protocol (RDP), or X2Go.
3232

33-
Azure Lab Services automatically configures SSH for Linux VMs. Both lab users and lab creators can SSH into Linux VMs without additional setup. If you want to connect to a VM with a Linux GUI, the lab creator might need to do extra setup on the template VM.
34-
35-
> [!WARNING]
36-
> If you need to use [GNOME](https://www.gnome.org/) or [MATE](https://mate-desktop.org/) you should coordinate with the lab creator to ensure that your lab VM has the correct configuration. For details, see [Using GNOME or MATE graphical desktops](how-to-enable-remote-desktop-linux.md#using-gnome-or-mate-graphical-desktops).
33+
Azure Lab Services automatically configures SSH for Linux VMs. Both lab users and lab creators can SSH into Linux VMs without additional setup. If you want to connect to a VM with a Linux GUI (graphical user interface) desktop, the lab creator/educator might need to do extra setup on the template VM.
3734

3835
### Connect to a Linux lab VM using RDP
3936

40-
Before you can connect to a Linux VM using RDP, the lab creator first needs to [enable remote desktop connection for Linux VMs](how-to-enable-remote-desktop-linux.md#rdp-setup).
37+
Before you can connect to a Linux VM using RDP, the lab creator first needs to enable the **Client connection (RDP)** setting and ensure that a GUI desktop and RDP are installed. For more information on steps that need to be completed by the lab creator, see the example that shows [how to set up GNOME and RDP](how-to-enable-remote-desktop-linux.md#set-up-gnome-and-rdp).
4138

4239
To connect to a Linux VM using RDP, follow the instructions based on the type of OS you're using.
4340

@@ -49,7 +46,7 @@ To connect to a Linux VM using RDP, follow the instructions based on the type of
4946

5047
### Connect to a Linux lab VM Using X2Go
5148

52-
Linux VMs can have X2Go enabled and a graphical desktop installed. For more information, see [X2Go Setup](how-to-enable-remote-desktop-linux.md#setting-up-x2go) and [Using GNOME or MATE graphical desktops](how-to-enable-remote-desktop-linux.md#using-gnome-or-mate-graphical-desktops).
49+
Another option for connecting to a Linux VM that has a GUI desktop installed, is to use X2Go. For more information on steps that need to be completed by the lab creator, see examples to [set up X2Go with XFCE, xUbuntu, and MATE](./how-to-enable-remote-desktop-linux.md#setup).
5350

5451
For instructions to connect to a Linux VM using X2Go, see [Connect to a VM using X2Go](connect-virtual-machine-linux-x2go.md).
5552

0 commit comments

Comments
 (0)