Skip to content

Commit b785e8d

Browse files
authored
Merge pull request #202985 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 dc4c9cb + c111dff commit b785e8d

File tree

7 files changed

+17
-15
lines changed

7 files changed

+17
-15
lines changed

articles/active-directory/devices/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ sections:
219219
220220
- question: What are the MS-Organization-P2P-Access certificates present on our Windows 10/11 devices?
221221
answer: |
222-
The MS-Organization-P2P-Access certificates are issued by Azure AD to both, Azure AD joined and hybrid Azure AD joined devices. These certificates are used to enable trust between devices in the same tenant for remote desktop scenarios. One certificate is issued to the device and another is issued to the user. The device certificate is present in `Local Computer\Personal\Certificates` and is valid for one day. This certificate is renewed (by issuing a new certificate) if the device is still active in Azure AD. The user certificate is present in `Current User\Personal\Certificates` and this certificate is also valid for one day, but it is issued on-demand when a user attempts a remote desktop session to another Azure AD joined device. It is not renewed on expiry. Both these certificates are issued using the MS-Organization-P2P-Access certificate present in the `Local Computer\AAD Token Issuer\Certificates`. This certificate is issued by Azure AD during device registration.
222+
The MS-Organization-P2P-Access certificates are issued by Azure AD to both, Azure AD joined and hybrid Azure AD joined devices. These certificates are used to enable trust between devices in the same tenant for remote desktop scenarios. One certificate is issued to the device and another is issued to the user. The device certificate is present in `Local Computer\Personal\Certificates` and is valid for one day. This certificate is renewed (by issuing a new certificate) if the device is still active in Azure AD. The user certificate is not persistent and is valid for one hour, but it is issued on-demand when a user attempts a remote desktop session to another Azure AD joined device. It is not renewed on expiry. Both these certificates are issued using the MS-Organization-P2P-Access certificate present in the `Local Computer\AAD Token Issuer\Certificates`. This certificate is issued by Azure AD during device registration.
223223
224224
225225

articles/azure-arc/servers/network-requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This topic describes the networking requirements for using the Connected Machine
1313

1414
The Azure Connected Machine agent for Linux and Windows communicates outbound securely to Azure Arc over TCP port 443. By default, the agent uses the default route to the internet to reach Azure services. You can optionally [configure the agent to use a proxy server](manage-agent.md#update-or-remove-proxy-settings) if your network requires it. Proxy servers don't make the Connected Machine agent more secure because the traffic is already encrypted.
1515

16-
To further secure your network connectivity to Azure Arc, instead of using public networks and proxy servers, you can implement an [Azure Arc Private Link Scope](private-link-security.md) (preview).
16+
To further secure your network connectivity to Azure Arc, instead of using public networks and proxy servers, you can implement an [Azure Arc Private Link Scope](private-link-security.md) .
1717

1818
> [!NOTE]
1919
> Azure Arc-enabled servers does not support using a [Log Analytics gateway](../../azure-monitor/agents/gateway.md) as a proxy for the Connected Machine agent.
@@ -69,4 +69,4 @@ To ensure the security of data in transit to Azure, we strongly encourage you to
6969

7070
* Review additional [prerequisites for deploying the Connected Machine agent](prerequisites.md).
7171
* Before you deploy the Azure Arc-enabled servers agent and integrate with other Azure management and monitoring services, review the [Planning and deployment guide](plan-at-scale-deployment.md).
72-
* To resolve problems, review the [agent connection issues troubleshooting guide](troubleshoot-agent-onboard.md).
72+
* To resolve problems, review the [agent connection issues troubleshooting guide](troubleshoot-agent-onboard.md).

articles/azure-functions/functions-how-to-github-actions.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ jobs:
228228
popd
229229
- name: 'Run Azure Functions Action'
230230
uses: Azure/functions-action@v1
231-
id: fa
232231
with:
233232
app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }}
234233
package: '${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}/output'
@@ -267,7 +266,6 @@ jobs:
267266
popd
268267
- name: 'Run Azure Functions Action'
269268
uses: Azure/functions-action@v1
270-
id: fa
271269
with:
272270
app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }}
273271
package: '${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}/output'
@@ -311,7 +309,6 @@ jobs:
311309
popd
312310
- name: 'Run Azure Functions Action'
313311
uses: Azure/functions-action@v1
314-
id: fa
315312
with:
316313
app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }}
317314
package: './${{ env.POM_XML_DIRECTORY }}/target/azure-functions/${{ env.POM_FUNCTIONAPP_NAME }}'
@@ -353,7 +350,6 @@ jobs:
353350
popd
354351
- name: 'Run Azure Functions Action'
355352
uses: Azure/functions-action@v1
356-
id: fa
357353
with:
358354
app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }}
359355
package: './${{ env.POM_XML_DIRECTORY }}/target/azure-functions/${{ env.POM_FUNCTIONAPP_NAME }}'
@@ -397,7 +393,6 @@ jobs:
397393
popd
398394
- name: 'Run Azure Functions Action'
399395
uses: Azure/functions-action@v1
400-
id: fa
401396
with:
402397
app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }}
403398
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
@@ -439,7 +434,6 @@ jobs:
439434
popd
440435
- name: 'Run Azure Functions Action'
441436
uses: Azure/functions-action@v1
442-
id: fa
443437
with:
444438
app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }}
445439
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
@@ -482,7 +476,6 @@ jobs:
482476
popd
483477
- name: 'Run Azure Functions Action'
484478
uses: Azure/functions-action@v1
485-
id: fa
486479
with:
487480
app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }}
488481
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}

articles/azure-vmware/configure-storage-policy.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ You'll run the `Get-StoragePolicy` cmdlet to list the vSAN based storage policie
7373

7474
## Set storage policy on VM
7575

76-
You'll run the `Set-VMStoragePolicy` cmdlet to Modify vSAN based storage policies on an individual VM or on a group of VMs sharing a similar VM name. For example, if you have 3 VMs named "MyVM1", "MyVM2", "MyVM3", supplying "MyVM*" to the VMName parameter would change the StoragePolicy on all three VMs.
76+
You'll run the `Set-VMStoragePolicy` cmdlet to modify vSAN-based storage policies on a default cluster, individual VM, or group of VMs sharing a similar VM name. For example, if you have three VMs named "MyVM1", "MyVM2", and "MyVM3", supplying "MyVM*" to the VMName parameter would change the StoragePolicy on all three VMs.
77+
7778

7879
> [!NOTE]
7980
> You cannot use the vSphere Client to change the default storage policy or any existing storage policies for a VM.

articles/mysql/flexible-server/concepts-supported-versions.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,19 @@ Azure Database for MySQL currently supports the following versions:
2525

2626
## MySQL Version 5.7
2727

28-
Bug fix release: 5.7.29
28+
Bug fix release: 5.7.37
29+
30+
Refer to the MySQL [release notes](https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-37.html) to learn more about improvements and fixes in this version.
31+
32+
## MySQL Version 8
33+
34+
Bug fix release: 8.0.28
35+
36+
Refer to the MySQL [release notes](https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-28.html) to learn more about improvements and fixes in this version.
37+
2938

3039
The service performs automated patching of the underlying hardware, OS, and database engine. The patching includes security and software updates. For MySQL engine, minor version upgrades are also included as part of the planned maintenance release. Users can configure the patching schedule to be system managed or define their custom schedule. During the maintenance schedule, the patch is applied and server may require a restart as part of the patching process to complete the update. With the custom schedule, users can make their patching cycle predictable and choose a maintenance window with minimum impact to the business. In general, the service follows monthly release schedule as part of the continuous integration and release.
3140

32-
Refer to the MySQL [release notes](https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-29.html) to learn more about improvements and fixes in this version.
3341

3442
## Managing updates and upgrades
3543
The service automatically manages patching for bug fix version updates. For example, 5.7.29 to 5.7.30.

articles/mysql/flexible-server/how-to-configure-high-availability-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ You can only create server using General purpose or Business Critical pricing t
5858
**Example:**
5959

6060
```azurecli
61-
az mysql flexible-server create --name myservername --sku-name Standard_D2ds_v4 --tier Genaralpurpose --resource-group myresourcegroup --high-availability ZoneRedundant --location eastus
61+
az mysql flexible-server create --name myservername --sku-name Standard_D2ds_v4 --tier GeneralPurpose --resource-group myresourcegroup --high-availability ZoneRedundant --location eastus
6262
```
6363

6464
## Disable high availability

articles/role-based-access-control/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.custom: contperf-fy21q1, azuread-video-2020
1818

1919
Access management for cloud resources is a critical function for any organization that is using the cloud. Azure role-based access control (Azure RBAC) helps you manage who has access to Azure resources, what they can do with those resources, and what areas they have access to.
2020

21-
Azure RBAC is an authorization system built on [Azure Resource Manager](../azure-resource-manager/management/overview.md) that provides fine-grained access management of Azure resources.
21+
Azure RBAC is an authorization system built on [Azure Resource Manager](../azure-resource-manager/management/overview.md) that provides fine-grained access management to Azure resources.
2222

2323
This video provides a quick overview of Azure RBAC.
2424

0 commit comments

Comments
 (0)