Skip to content

Commit f96a31f

Browse files
authored
Merge pull request #266224 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 ff828a9 + 2159200 commit f96a31f

File tree

7 files changed

+17
-12
lines changed

7 files changed

+17
-12
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thank you for taking the time to contribute to the Microsoft Azure documentation.
44

5-
This guide covers some general topics related to contribution and refers to our [contributor guide](/contribute/content) for more detailed explanations when required.
5+
This guide covers some general topics related to contribution and refers to our [contributor guide](https://learn.microsoft.com/contribute/content) for more detailed explanations when required.
66

77
## Code of Conduct
88

@@ -22,8 +22,8 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
2222

2323
### Edit in GitHub
2424

25-
Follow the guidance for [Quick edits to existing documents](/contribute/content/#quick-edits-to-documentation) in our contributor guide.
25+
Follow the guidance for [editing documentation in the browser](https://learn.microsoft.com/contribute/content/how-to-write-quick-edits) in our contributor guide.
2626

2727
## Pull requests
2828

29-
Review the guidance for [pull-request processing](/contribute/content/process-pull-request) in our contributor guide.
29+
Review the guidance for [pull-request processing](https://learn.microsoft.com/contribute/content/process-pull-request) in our contributor guide.

articles/api-management/backends.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ resource symbolicname 'Microsoft.ApiManagement/service/backends@2023-05-01-previ
196196
properties: {
197197
description: 'Load balancer for multiple backends'
198198
type: 'Pool'
199-
protocol: 'https'
199+
protocol: 'http'
200200
url: 'https://example.com'
201201
pool: {
202202
services: [
@@ -223,7 +223,7 @@ Include a JSON snippet similar to the following in your ARM template for a backe
223223
"properties": {
224224
"description": "Load balancer for multiple backends",
225225
"type": "Pool",
226-
"protocol": "https",
226+
"protocol": "http",
227227
"url": "https://example.com",
228228
"pool": {
229229
"services": [

articles/azure-cache-for-redis/cache-tutorial-vector-similarity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ In this tutorial, you learn how to:
7777

7878
To successfully make a call against Azure OpenAI, you need an **endpoint** and a **key**. You also need an **endpoint** and a **key** to connect to Azure Cache for Redis.
7979

80-
1. Go to your Azure Open AI resource in the Azure portal.
80+
1. Go to your Azure OpenAI resource in the Azure portal.
8181

8282
1. Locate **Endpoint and Keys** in the **Resource Management** section. Copy your endpoint and access key as you'll need both for authenticating your API calls. An example endpoint is: `https://docs-test-001.openai.azure.com`. You can use either `KEY1` or `KEY2`.
8383

articles/defender-for-cloud/support-matrix-defender-for-containers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Following are the features for each of the domains in Defender for Containers:
7373

7474
| Aspect | Details |
7575
|--|--|
76-
| Registries and images | **Supported**<br> • ACR registries <br> • [ACR registries protected with Azure Private Link](/azure/container-registry/container-registry-private-link) (Private registries requires access to Trusted Services) <br> • Container images in Docker V2 format <br> **Unsupported**<br> • Super-minimalist images such as [Docker scratch](https://hub.docker.com/_/scratch/) images<br> is currently unsupported <br> • Images with [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md) image format specification <br> |
76+
| Registries and images | **Supported**<br> • ACR registries <br> • [ACR registries protected with Azure Private Link](/azure/container-registry/container-registry-private-link) (Private registries requires access to Trusted Services) <br> • Container images in Docker V2 format <br> • Images with [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md) image format specification <br> **Unsupported**<br> • Super-minimalist images such as [Docker scratch](https://hub.docker.com/_/scratch/) images<br> is currently unsupported <br>
7777
| Operating systems | **Supported** <br> • Alpine Linux 3.12-3.16 <br> • Red Hat Enterprise Linux 6-9 <br> • CentOS 6-9<br> • Oracle Linux 6-9 <br> • Amazon Linux 1, 2 <br> • openSUSE Leap, openSUSE Tumbleweed <br> • SUSE Enterprise Linux 11-15 <br> • Debian GNU/Linux 7-12 <br> • Google Distroless (based on Debian GNU/Linux 7-12) <br> • Ubuntu 12.04-22.04 <br> • Fedora 31-37<br> • Mariner 1-2<br> • Windows Server 2016, 2019, 2022|
7878
| Language specific packages <br><br> | **Supported** <br> • Python <br> • Node.js <br> • .NET <br> • JAVA <br> • Go |
7979

@@ -123,7 +123,7 @@ Learn how to [use Azure Private Link to connect networks to Azure Monitor](../az
123123

124124
| Aspect | Details |
125125
|--|--|
126-
| Registries and images | **Supported**<br> • ECR registries <br> • Container images in Docker V2 format <br> **Unsupported**<br> • Super-minimalist images such as [Docker scratch](https://hub.docker.com/_/scratch/) images is currently unsupported <br> • Images with [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md) image format specification <br>• Public repositories <br> • Manifest lists <br>|
126+
| Registries and images | **Supported**<br> • ECR registries <br> • Container images in Docker V2 format <br> • Images with [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md) image format specification <br> **Unsupported**<br> • Super-minimalist images such as [Docker scratch](https://hub.docker.com/_/scratch/) images is currently unsupported <br> • Public repositories <br> • Manifest lists <br>|
127127
| Operating systems | **Supported** <br> • Alpine Linux 3.12-3.16 <br> • Red Hat Enterprise Linux 6-9 <br> • CentOS 6-9<br> • Oracle Linux 6-9 <br> • Amazon Linux 1, 2 <br> • openSUSE Leap, openSUSE Tumbleweed <br> • SUSE Enterprise Linux 11-15 <br> • Debian GNU/Linux 7-12 <br> • Google Distroless (based on Debian GNU/Linux 7-12)<br> • Ubuntu 12.04-22.04 <br> • Fedora 31-37<br> • Mariner 1-2<br> • Windows server 2016, 2019, 2022|
128128
| Language specific packages <br><br> | **Supported** <br> • Python <br> • Node.js <br> • .NET <br> • JAVA <br> • Go |
129129

@@ -167,7 +167,7 @@ Outbound proxy without authentication and outbound proxy with basic authenticati
167167

168168
| Aspect | Details |
169169
|--|--|
170-
| Registries and images | **Supported**<br> • Google Registries (GAR, GCR) <br> • Container images in Docker V2 format <br> **Unsupported**<br> • Super-minimalist images such as [Docker scratch](https://hub.docker.com/_/scratch/) images is currently unsupported <br> • Images with [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md) image format specification <br>• Public repositories <br> • Manifest lists <br>|
170+
| Registries and images | **Supported**<br> • Google Registries (GAR, GCR) <br> • Container images in Docker V2 format <br> • Images with [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md) image format specification <br> **Unsupported**<br> • Super-minimalist images such as [Docker scratch](https://hub.docker.com/_/scratch/) images is currently unsupported <br> • Public repositories <br> • Manifest lists <br>|
171171
| Operating systems | **Supported** <br> • Alpine Linux 3.12-3.16 <br> • Red Hat Enterprise Linux 6-9 <br> • CentOS 6-9<br> • Oracle Linux 6-9 <br> • Amazon Linux 1, 2 <br> • openSUSE Leap, openSUSE Tumbleweed <br> • SUSE Enterprise Linux 11-15 <br> • Debian GNU/Linux 7-12 <br> • Google Distroless (based on Debian GNU/Linux 7-12)<br> • Ubuntu 12.04-22.04 <br> • Fedora 31-37<br> • Mariner 1-2<br> • Windows server 2016, 2019, 2022|
172172
| Language specific packages <br><br> | **Supported** <br> • Python <br> • Node.js <br> • .NET <br> • JAVA <br> • Go |
173173

articles/governance/policy/concepts/policy-for-kubernetes.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,12 @@ To identify the Gatekeeper version that your Azure Policy Add-On is using, you c
601601
Finally, to identify the AKS cluster version that you are using, follow the linked AKS guidance for this.
602602

603603
### Add-On versions available per each AKS cluster version
604-
604+
#### 1.3.0
605+
Introduces error state for policies in error, enabling them to be distinguished from policies in noncompliant states. Adds support for v1 constraint templates and use of the excludedNamespaces parameter in mutation policies. Adds an error status check on constraint templates post-installation.
606+
- Released February 2024
607+
- Kubernetes 1.25+
608+
- Gatekeeper 3.14.0
609+
605610
#### 1.2.1
606611
- Released October 2023
607612
- Kubernetes 1.25+

articles/site-recovery/site-recovery-monitor-and-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Azure Site Recovery also provides default alerts via Azure Monitor, which enable
176176

177177
### Enable built-in Azure Monitor alerts
178178

179-
To enable built-in Azure Monitor alerts for Azure Site Recovery, for a particular subscription, navigate to **Preview Features** in the [Azure portal](https://ms.portal.azure.com) and register the feature flag **EnableAzureSiteRecoveryAlertToAzureMonitor** for the selected subscription.
179+
To enable built-in Azure Monitor alerts for Azure Site Recovery, for a particular subscription, navigate to **Preview Features** in the [Azure portal](https://ms.portal.azure.com) and register the feature flag **EnableAzureSiteRecoveryAlertsToAzureMonitor** for the selected subscription.
180180

181181
> [!NOTE]
182182
> We recommended that you wait for 24 hours for the registration to take effect before testing out the feature.

articles/virtual-machines/extensions/custom-script-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ If your script is on a local server, you might still need to open other firewall
5555
### Tips
5656

5757
- Output is limited to the last 4,096 bytes.
58-
- Properly escaping characters will help ensure that strings are parsed correctly. For example, you always need two backslashes to escape a single literal backslash when dealing with file paths. Sample: {"commandToExecute": "C:\\Windows\\System32\\systeminfo.exe >> D:\\test.txt"}
58+
- Properly escaping characters will help ensure that strings are parsed correctly. For example, you always need two backslashes to escape a single literal backslash when dealing with file paths. Sample: `{"commandToExecute": "C:\\Windows\\System32\\systeminfo.exe >> D:\\test.txt"}`
5959
- The highest failure rate for this extension is due to syntax errors in the script. Verify that the script runs without errors. Put more logging into the script to make it easier to find failures.
6060
- Write scripts that are idempotent, so that running them more than once accidentally doesn't cause system changes.
6161
- Ensure that the scripts don't require user input when they run.

0 commit comments

Comments
 (0)