Skip to content

Commit 0491cd2

Browse files
authored
Merge pull request #224881 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 5fc8cc4 + 2d64531 commit 0491cd2

File tree

12 files changed

+34
-25
lines changed

12 files changed

+34
-25
lines changed

articles/active-directory/enterprise-users/groups-bulk-download.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ You can download a list of all the groups in your organization to a comma-separa
2222

2323
## To download a list of groups
2424

25+
>[!NOTE]
26+
> The columns downloaded are pre-defined
27+
2528
1. Sign in to [the Azure portal](https://portal.azure.com) with an account in your organization.
2629
1. In Azure AD, select **Groups** > **Download groups**.
2730
1. On the **Groups download** page, select **Start** to receive a CSV file listing your groups.

articles/active-directory/hybrid/how-to-connect-configure-ad-ds-connector-account.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ By default, all the set permissions cmdlets will try to set AD DS permissions on
8686

8787
You can also set permissions on a specific OU or AD DS object by using the parameter `-ADobjectDN` followed by the DN of the target object where you want to set permissions. When using a target ADobjectDN, the cmdlet will set permissions on this object only and not on the domain root or AdminSDHolder container. This parameter can be useful when you have certain OUs or AD DS objects that have permission inheritance disabled (see Locate AD DS objects with permission inheritance disabled)
8888

89-
Exceptions to these common parameters are the `Set-ADSyncRestrictedPermissions` cmdlet which is used to set the permissions on the AD DS Connector Account itself, and the `Set-ADSyncPasswordHashSyncPermissions` cmdlet since the permissions required for Password Hash Sync are only set at the domain root, hence this cmdlet does not include the `-ObjectDN` or `-SkipAdminSdHolders` parameters.
89+
Exceptions to these common parameters are the `Set-ADSyncRestrictedPermissions` cmdlet which is used to set the permissions on the AD DS Connector Account itself, and the `Set-ADSyncPasswordHashSyncPermissions` cmdlet since the permissions required for Password Hash Sync are only set at the domain root, hence this cmdlet does not include the `-ObjectDN` or `-IncludeAdminSdHolders` parameters.
9090

9191
### Determine your AD DS Connector Account
9292
In case Azure AD Connect is already installed and you want to check what is the AD DS Connector Account currently in use by Azure AD Connect, you can execute the cmdlet:
@@ -119,7 +119,7 @@ Show-ADSyncADObjectPermissions -ADobjectDN '<DistinguishedName>'
119119
To set basic read-only permissions for the AD DS Connector account when not using any Azure AD Connect feature, run:
120120

121121
``` powershell
122-
Set-ADSyncBasicReadPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-SkipAdminSdHolders] [<CommonParameters>]
122+
Set-ADSyncBasicReadPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-IncludeAdminSdHolders] [<CommonParameters>]
123123
```
124124

125125

@@ -149,7 +149,7 @@ This cmdlet will set the following permissions:
149149
To set permissions for the AD DS Connector account when using the ms-Ds-Consistency-Guid attribute as the source anchor (also known as “Let Azure manage the source anchor for me” option), run:
150150

151151
``` powershell
152-
Set-ADSyncMsDsConsistencyGuidPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-SkipAdminSdHolders] [<CommonParameters>]
152+
Set-ADSyncMsDsConsistencyGuidPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-IncludeAdminSdHolders] [<CommonParameters>]
153153
```
154154

155155
or;
@@ -189,7 +189,7 @@ This cmdlet will set the following permissions:
189189
To set permissions for the AD DS Connector account when using Password Writeback, run:
190190

191191
``` powershell
192-
Set-ADSyncPasswordWritebackPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-SkipAdminSdHolders] [<CommonParameters>]
192+
Set-ADSyncPasswordWritebackPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-IncludeAdminSdHolders] [<CommonParameters>]
193193
```
194194

195195

@@ -210,7 +210,7 @@ This cmdlet will set the following permissions:
210210
To set permissions for the AD DS Connector account when using Group Writeback, run:
211211

212212
``` powershell
213-
Set-ADSyncUnifiedGroupWritebackPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-SkipAdminSdHolders] [<CommonParameters>]
213+
Set-ADSyncUnifiedGroupWritebackPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-IncludeAdminSdHolders] [<CommonParameters>]
214214
```
215215
or;
216216

@@ -230,7 +230,7 @@ This cmdlet will set the following permissions:
230230
To set permissions for the AD DS Connector account when using Exchange Hybrid deployment, run:
231231

232232
``` powershell
233-
Set-ADSyncExchangeHybridPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-SkipAdminSdHolders] [<CommonParameters>]
233+
Set-ADSyncExchangeHybridPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-IncludeAdminSdHolders] [<CommonParameters>]
234234
```
235235

236236

@@ -254,7 +254,7 @@ This cmdlet will set the following permissions:
254254
To set permissions for the AD DS Connector account when using Exchange Mail Public Folders feature, run:
255255

256256
``` powershell
257-
Set-ADSyncExchangeMailPublicFolderPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-SkipAdminSdHolders] [<CommonParameters>]
257+
Set-ADSyncExchangeMailPublicFolderPermissions -ADConnectorAccountName <String> -ADConnectorAccountDomain <String> [-IncludeAdminSdHolders] [<CommonParameters>]
258258
```
259259

260260

articles/application-gateway/ingress-controller-install-existing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ appgw:
299299
Apply the Helm changes:
300300
1. Ensure the `AzureIngressProhibitedTarget` CRD is installed with:
301301
```bash
302-
kubectl apply -f https://raw.githubusercontent.com/Azure/application-gateway-kubernetes-ingress/ae695ef9bd05c8b708cedf6ff545595d0b7022dc/crds/AzureIngressProhibitedTarget.yaml
302+
kubectl apply -f https://raw.githubusercontent.com/Azure/application-gateway-kubernetes-ingress/7b55ad194e7582c47589eb9e78615042e00babf3/crds/AzureIngressProhibitedTarget-v1-CRD-v1.yaml
303303
```
304304
2. Update Helm:
305305
```bash

articles/attestation/overview.md

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Azure Attestation is the preferred choice for attesting TEEs as it offers the fo
7373

7474
- Unified framework for attesting multiple environments such as TPMs, SGX enclaves and VBS enclaves
7575
- Allows creation of custom attestation providers and configuration of policies to restrict token generation
76-
- Protects its data while-in use with implementation in an SGX enclave
76+
- Protects its data while-in use with implementation in an SGX enclave or Confidential Virtual Macine based on AMD SEV-SNP
7777
- Highly available service
7878

7979
## How to establish trust with Azure Attestation

articles/cognitive-services/Computer-vision/includes/image-analysis-curl-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To analyze an image for various visual features, do the following steps:
4242
1. Replace the value of `<subscriptionKey>` with your key.
4343
1. Replace the first part of the request URL (`westcentralus`) with the text in your own endpoint URL.
4444
[!INCLUDE [Custom subdomains notice](../../../../includes/cognitive-services-custom-subdomains-note.md)]
45-
1. Optionally, change the image URL in the request body (`http://upload.wikimedia.org/wikipedia/commons/3/3c/Shaki_waterfall.jpg\`) to the URL of a different image to be analyzed.
45+
1. Optionally, change the image URL in the request body (`https://upload.wikimedia.org/wikipedia/commons/thumb/3/3c/Salto_del_Angel-Canaima-Venezuela08.JPG/800px-Salto_del_Angel-Canaima-Venezuela08.JPG`) to the URL of a different image to be analyzed.
4646
1. Open a command prompt window.
4747
1. Paste the command from the text editor into the command prompt window, and then run the command.
4848

articles/cognitive-services/Computer-vision/overview-ocr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The Read OCR model is available in Computer Vision and Form Recognizer with comm
5858

5959
The cloud APIs are the preferred option for most customers because of their ease of integration and fast productivity out of the box. Azure and the Computer Vision service handle scale, performance, data security, and compliance needs while you focus on meeting your customers' needs.
6060

61-
For on-premises deployment, the [Read Docker container (preview)](./computer-vision-how-to-install-containers.md) enables you to deploy the Computer Vision v3.2 generally available OCR capabilities in your own local environment. Containers are great for specific security and data governance requirements.
61+
For on-premises deployment, the [Read Docker container](./computer-vision-how-to-install-containers.md) enables you to deploy the Computer Vision v3.2 generally available OCR capabilities in your own local environment. Containers are great for specific security and data governance requirements.
6262

6363
## OCR data privacy and security
6464

articles/confidential-computing/confidential-vm-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ Confidential VMs *don't support*:
106106
- Ultra disks
107107
- Accelerated Networking
108108
- Live migration
109+
- Screenshots under boot diagnostics
109110

110111

111112
## Next steps

articles/iot-edge/how-to-provision-devices-at-scale-linux-tpm.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,14 @@ After the runtime is installed on your device, configure the device with the inf
320320

321321
<!-- iotedge-1.4 -->
322322
:::moniker range=">=iotedge-1.4"
323-
1. Optionally, uncomment the `payload` parameter to specify the path to a local JSON file. The contents of the file will be [sent to DPS as additional data](../iot-dps/how-to-send-additional-data.md#iot-edge-support) when the device registers. This is useful for [custom allocation](../iot-dps/how-to-use-custom-allocation-policies.md). For example, if you want to allocate your devices based on an IoT Plug and Play model ID without human intervention.
323+
324+
Optionally, uncomment the `payload` parameter to specify the path to a local JSON file. The contents of the file will be [sent to DPS as additional data](../iot-dps/how-to-send-additional-data.md#iot-edge-support) when the device registers. This is useful for [custom allocation](../iot-dps/how-to-use-custom-allocation-policies.md). For example, if you want to allocate your devices based on an IoT Plug and Play model ID without human intervention.
324325
:::moniker-end
325326

326327
<!-- iotedge-2020-11 -->
327328
:::moniker range=">=iotedge-2020-11"
328-
1. Save and close the file.
329+
330+
Save and close the file.
329331

330332
:::moniker-end
331333
<!-- end iotedge-2020-11 -->

articles/machine-learning/how-to-datastore.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,18 @@ ml_client.create_or_update(store)
123123

124124
```python
125125
from azure.ai.ml.entities import AzureBlobDatastore
126-
from azure.ai.ml.entities._datastore.credentials import AccountKeyCredentials
126+
from azure.ai.ml.entities import AccountKeyConfiguration
127127
from azure.ai.ml import MLClient
128128

129129
ml_client = MLClient.from_config()
130130

131131
store = AzureBlobDatastore(
132132
name="blob_protocol_example",
133-
description="Datastore pointing to a blob container using wasbs protocol.",
133+
description="Datastore pointing to a blob container using https protocol.",
134134
account_name="mytestblobstore",
135135
container_name="data-container",
136-
protocol="wasbs",
137-
credentials=AccountKeyCredentials(
136+
protocol="https",
137+
credentials=AccountKeyConfiguration(
138138
account_key="XXXxxxXXXxXXXXxxXXXXXxXXXXXxXxxXxXXXxXXXxXXxxxXXxxXXXxXxXXXxxXxxXXXXxxxxxXXxxxxxxXXXxXXX"
139139
),
140140
)
@@ -146,7 +146,7 @@ ml_client.create_or_update(store)
146146

147147
```python
148148
from azure.ai.ml.entities import AzureBlobDatastore
149-
from azure.ai.ml.entities._datastore.credentials import SasTokenCredentials
149+
from azure.ai.ml.entities import SasTokenConfiguration
150150
from azure.ai.ml import MLClient
151151

152152
ml_client = MLClient.from_config()
@@ -156,7 +156,7 @@ store = AzureBlobDatastore(
156156
description="Datastore pointing to a blob container using SAS token.",
157157
account_name="mytestblobstore",
158158
container_name="data-container",
159-
credentials=SasTokenCredentials(
159+
credentials=SasTokenConfiguration(
160160
sas_token= "?xx=XXXX-XX-XX&xx=xxxx&xxx=xxx&xx=xxxxxxxxxxx&xx=XXXX-XX-XXXXX:XX:XXX&xx=XXXX-XX-XXXXX:XX:XXX&xxx=xxxxx&xxx=XXxXXXxxxxxXXXXXXXxXxxxXXXXXxxXXXXXxXXXXxXXXxXXxXX"
161161
),
162162
)
@@ -301,7 +301,7 @@ az ml datastore create --file my_files_datastore.yml
301301

302302
```python
303303
from azure.ai.ml.entities import AzureFileDatastore
304-
from azure.ai.ml.entities._datastore.credentials import AccountKeyCredentials
304+
from azure.ai.ml.entities import AccountKeyConfiguration
305305
from azure.ai.ml import MLClient
306306

307307
ml_client = MLClient.from_config()
@@ -311,7 +311,7 @@ store = AzureFileDatastore(
311311
description="Datastore pointing to an Azure File Share.",
312312
account_name="mytestfilestore",
313313
file_share_name="my-share",
314-
credentials=AccountKeyCredentials(
314+
credentials=AccountKeyConfiguration(
315315
account_key= "XXXxxxXXXxXXXXxxXXXXXxXXXXXxXxxXxXXXxXXXxXXxxxXXxxXXXxXxXXXxxXxxXXXXxxxxxXXxxxxxxXXXxXXX"
316316
),
317317
)
@@ -323,7 +323,7 @@ ml_client.create_or_update(store)
323323

324324
```python
325325
from azure.ai.ml.entities import AzureFileDatastore
326-
from azure.ai.ml.entities._datastore.credentials import SasTokenCredentials
326+
from azure.ai.ml.entities import SasTokenConfiguration
327327
from azure.ai.ml import MLClient
328328

329329
ml_client = MLClient.from_config()
@@ -333,7 +333,7 @@ store = AzureFileDatastore(
333333
description="Datastore pointing to an Azure File Share using SAS token.",
334334
account_name="mytestfilestore",
335335
file_share_name="my-share",
336-
credentials=SasTokenCredentials(
336+
credentials=SasTokenConfiguration(
337337
sas_token="?xx=XXXX-XX-XX&xx=xxxx&xxx=xxx&xx=xxxxxxxxxxx&xx=XXXX-XX-XXXXX:XX:XXX&xx=XXXX-XX-XXXXX:XX:XXX&xxx=xxxxx&xxx=XXxXXXxxxxxXXXXXXXxXxxxXXXXXxxXXXXXxXXXXxXXXxXXxXX"
338338
),
339339
)

articles/static-web-apps/deploy-nuxtjs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ If the page is a dynamic page, for example `_id.vue`, it won't have enough infor
186186
187187
Make changes to the app by updating the code and pushing it to GitHub. GitHub Actions automatically builds and deploys the app.
188188
189-
For more information, see the Azure Static Web Apps Nuxt 3 deployment preset [documentation](https://v3.nuxtjs.org/guide/deploy/providers/azure/).
189+
For more information, see the Azure Static Web Apps Nuxt 3 deployment preset [documentation](https://nitro.unjs.io/deploy/providers/azure).
190190
191191
> [!div class="nextstepaction"]
192192
> [Set up a custom domain](custom-domain.md)

0 commit comments

Comments
 (0)