Skip to content

Commit 7f2c2dd

Browse files
authored
Merge pull request #264639 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 70a97a7 + da37cf0 commit 7f2c2dd

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

articles/api-management/rate-limit-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To understand the difference between rate limits and quotas, [see Rate limits an
2929
remaining-calls-header-name="header name"
3030
remaining-calls-variable-name="policy expression variable name"
3131
total-calls-header-name="header name">
32-
<api name="API name" id="API id" calls="number" renewal-period="seconds" />
32+
<api name="API name" id="API id" calls="number" renewal-period="seconds" >
3333
<operation name="operation name" id="operation id" calls="number" renewal-period="seconds" />
3434
</api>
3535
</rate-limit>

articles/api-management/validate-client-certificate-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ For more information about custom CA certificates and certificate authorities, s
3535
validate-not-after="true | false"
3636
ignore-error="true | false">
3737
<identities>
38-
<identity
38+
<identity
3939
thumbprint="certificate thumbprint"
4040
serial-number="certificate serial number"
4141
common-name="certificate common name"
4242
subject="certificate subject string"
4343
dns-name="certificate DNS name"
4444
issuer-subject="certificate issuer"
4545
issuer-thumbprint="certificate issuer thumbprint"
46-
issuer-certificate-id="certificate identifier"/>
46+
issuer-certificate-id="certificate identifier"/>
4747
</identities>
4848
</validate-client-certificate>
4949
```
@@ -106,4 +106,4 @@ The following example validates a client certificate to match the policy's defau
106106

107107
* [API Management access restriction policies](api-management-access-restriction-policies.md)
108108

109-
[!INCLUDE [api-management-policy-ref-next-steps](../../includes/api-management-policy-ref-next-steps.md)]
109+
[!INCLUDE [api-management-policy-ref-next-steps](../../includes/api-management-policy-ref-next-steps.md)]

articles/api-management/validate-content-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ The policy validates the following content in the request or response against th
4040
## Policy statement
4141

4242
```xml
43-
<validate-content unspecified-content-type-action="ignore | prevent | detect" max-size="size in bytes" size-exceeded-action="ignore | prevent | detect" errors-variable-name="variable name">
43+
<validate-content unspecified-content-type-action="ignore | prevent | detect" max-size="size in bytes" size-exceeded-action="ignore | prevent | detect" errors-variable-name="variable name">
4444
<content-type-map any-content-type-value="content type string" missing-content-type-value="content type string">
4545
<type from | when="content type string" to="content type string" />
4646
</content-type-map>
47-
<content type="content type string" validate-as="json | xml | soap" schema-id="schema id" schema-ref="#/local/reference/path" action="ignore | prevent | detect" allow-additional-properties="true | false" />
47+
<content type="content type string" validate-as="json | xml | soap" schema-id="schema id" schema-ref="#/local/reference/path" action="ignore | prevent | detect" allow-additional-properties="true | false" />
4848
</validate-content>
4949
```
5050

articles/container-apps/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ This article lists significant updates and new features available in Azure Conta
6767
| ------- | ----------- |
6868
| [Generally Available: Inbound IP restrictions](./ingress-overview.md#ip-restrictions) | Enables container apps to restrict inbound HTTP or TCP traffic by allowing or denying access to a specific list of IP address ranges. |
6969
| [Generally Available: TCP support](./ingress-overview.md#tcp) | Azure Container Apps now supports using TCP-based protocols other than HTTP or HTTPS for ingress. |
70-
| [Generally Available: Github Actions for Azure Container Apps](./github-actions.md) | Azure Container Apps allows you to use GitHub Actions to publish revisions to your container app. |
70+
| [Generally Available: GitHub Actions for Azure Container Apps](./github-actions.md) | Azure Container Apps allows you to use GitHub Actions to publish revisions to your container app. |
7171
| [Generally Available: Azure Pipelines for Azure Container Apps](./azure-pipelines.md) | Azure Container Apps allows you to use Azure Pipelines to publish revisions to your container app. |
7272
| [Dapr: Easy component creation](./dapr-component-connection.md) | You can now configure and secure dependent Azure services to use Dapr APIs in the portal using the Service Connector feature. Learn how to [connect to Azure services via Dapr components in the Azure portal](./dapr-component-connection.md). |

articles/iot-hub-device-update/device-update-error-codes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ There are two primary client-side components that may throw error codes: the Dev
1818

1919
### ResultCode and ExtendedResultCode
2020

21-
The Device Update for IoT Hub Core PnP interface reports `ResultCode` and `ExtendedResultCode`, which can be used to diagnose failures. For more information about the Device Update Core PnP interface, see [Device Update and Plug and Play](device-update-plug-and-play.md). For more details regarding the default meanings of Device Update agent ResultCode and ExtendedResultCodes, see the [Device Update Github repository](https://aka.ms/du-resultcodes).
21+
The Device Update for IoT Hub Core PnP interface reports `ResultCode` and `ExtendedResultCode`, which can be used to diagnose failures. For more information about the Device Update Core PnP interface, see [Device Update and Plug and Play](device-update-plug-and-play.md). For more details regarding the default meanings of Device Update agent ResultCode and ExtendedResultCodes, see the [Device Update GitHub repository](https://aka.ms/du-resultcodes).
2222

2323
`ResultCode` is a general status code and `ExtendedResultCode` is an integer with encoded error information.
2424

articles/iot-operations/deploy-iot-ops/howto-deploy-iot-operations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Use the Azure portal to deploy Azure IoT Operations components to your Arc-enabl
8787
```
8888

8989
> [!NOTE]
90-
> If you're using Github Codespaces in a browser, `az login` returns a localhost error in the browser window after logging in. To fix, either:
90+
> If you're using GitHub Codespaces in a browser, `az login` returns a localhost error in the browser window after logging in. To fix, either:
9191
>
9292
> * Open the codespace in VS Code desktop, and then run `az login` again in the browser terminal.
9393
> * After you get the localhost error on the browser, copy the URL from the browser and run `curl "<URL>"` in a new terminal tab. You should see a JSON response with the message "You have logged into Microsoft Azure!."

articles/mysql/flexible-server/create-automation-tasks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Creating an automation task doesn't immediately incur charges. The automation ta
5151
|||
5252

5353
## Stop server task
54-
Here's an example to configure stop tasks for a Azure Database for MySQL flexible server instance.
54+
Here's an example to configure stop tasks for an Azure Database for MySQL flexible server instance.
5555

5656
1. Select **Stop MySQL Flexible server** task.
5757

articles/reliability/migrate-search-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
title: Migrate Azure AI Search to availability zone support
44
description: Learn how to migrate Azure AI Search to availability zone support.
5-
author: mattmsft
5+
author: mattgotteiner
66
ms.service: azure-migrate
77
ms.topic: conceptual
88
ms.date: 08/01/2022

articles/security/fundamentals/recover-from-identity-compromise.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ We recommend the following actions to ensure your general security posture:
232232

233233
- **Ensure that your organization has extended detection and response (XDR) and security information and event management (SIEM) solutions in place**, such as [Microsoft Defender XDR for Endpoint](/microsoft-365/security/defender/microsoft-365-defender), [Microsoft Sentinel](../../sentinel/overview.md), and [Microsoft Defender for IoT](../../defender-for-iot/organizations/index.yml).
234234

235-
- **Review [Microsoft’s Enterprise access model](/security/privileged-access-workstations/privileged-access-access-model)**.
235+
- **Review Microsoft’s Enterprise access model**
236236

237237
### Improve identity security posture
238238

@@ -269,7 +269,7 @@ This section provides possible methods and steps to consider when building your
269269
> [!IMPORTANT]
270270
> The exact steps required in your organization will depend on what persistence you've discovered in your investigation, and how confident you are that your investigation was complete and has discovered all possible entry and persistence methods.
271271
>
272-
> Ensure that any actions taken are performed from a trusted device, built from a [clean source](/security/privileged-access-workstations/privileged-access-access-model). For example, use a fresh, [privileged access workstation](/security/privileged-access-workstations/privileged-access-deployment).
272+
> Ensure that any actions taken are performed from a trusted device, built from a clean source. For example, use a fresh, privileged access workstation.
273273
>
274274
275275
The following sections include the following types of recommendations for remediating and retaining administrative control:
@@ -322,7 +322,7 @@ In addition to the recommendations listed earlier in this article, we also recom
322322
|Activity |Description |
323323
|---------|---------|
324324
|**Rebuild affected systems** | Rebuild systems that were identified as compromised by the attacker during your investigation. |
325-
|**Remove unnecessary admin users** | Remove unnecessary members from Domain Admins, Backup Operators, and Enterprise Admin groups. For more information, see [Securing Privileged Access](/security/privileged-access-workstations/overview). |
325+
|**Remove unnecessary admin users** | Remove unnecessary members from Domain Admins, Backup Operators, and Enterprise Admin groups. For more information, see Securing Privileged Access. |
326326
|**Reset passwords to privileged accounts** | Reset passwords of all privileged accounts in the environment. <br><br>**Note**: Privileged accounts are not limited to built-in groups, but can also be groups that are delegated access to server administration, workstation administration, or other areas of your environment. |
327327
|**Reset the krbtgt account** | Reset the **krbtgt** account twice using the [New-KrbtgtKeys](https://github.com/microsoft/New-KrbtgtKeys.ps1/blob/master/New-KrbtgtKeys.ps1) script. <br><br>**Note**: If you are using Read-Only Domain Controllers, you will need to run the script separately for Read-Write Domain Controllers and for Read-Only Domain Controllers. |
328328
|**Schedule a system restart** | After you validate that no persistence mechanisms created by the attacker exist or remain on your system, schedule a system restart to assist with removing memory-resident malware. |

includes/azure-data-factory-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Azure Data Factory is a multitenant service that has the following default limit
2323
| Concurrent Data Integration Units<sup>1</sup> consumption per subscription per [Azure Integration Runtime region](../articles/data-factory/concepts-integration-runtime.md#integration-runtime-location) in managed virtual network| 2,400 | [Find out how to request a quota increase from support](https://azure.microsoft.com/blog/azure-limits-quotas-increase-requests/). |
2424
| Maximum activities per pipeline, which includes inner activities for containers | 40 | 40 |
2525
| Maximum number of linked integration runtimes that can be created against a single self-hosted integration runtime | 100 | 100 |
26-
| Maximum number of node that can be created against a single self-hosted integration runtime | 4 | [Find out how to request a quota increase from support](https://azure.microsoft.com/blog/azure-limits-quotas-increase-requests/). |
26+
| Maximum number of nodes that can be created against a single self-hosted integration runtime | 4 | [Find out how to request a quota increase from support](https://azure.microsoft.com/blog/azure-limits-quotas-increase-requests/). |
2727
| Maximum parameters per pipeline | 50 | 50 |
2828
| ForEach items | 100,000 | 100,000 |
2929
| ForEach parallelism | 20 | 50 |

0 commit comments

Comments
 (0)