Skip to content

Commit 2009735

Browse files
TimShererWithAquentTimShererWithAquent
authored
Merge pull request #178504 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 5ff3848 + d9019f1 commit 2009735

File tree

5 files changed

+52
-33
lines changed

5 files changed

+52
-33
lines changed

‎articles/active-directory-b2c/localization-string-ids.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ The following are the IDs for a [one-time password technical profile](one-time-p
520520
<LocalizedStrings>
521521
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>
522522
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfMaxRetryAttempted">You have exceeded the number of retries allowed.</LocalizedString>
523-
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfMaxNumberOfCodeGenerated">You have exceeded the number of retries allowed.</LocalizedString>
523+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfMaxNumberOfCodeGenerated">You have exceeded the number of code generation attempts allowed.</LocalizedString>
524524
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfInvalidCode">You have entered the wrong code.</LocalizedString>
525525
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfVerificationFailedRetryAllowed">That code is incorrect. Please try again.</LocalizedString>
526526
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionConflict">Cannot verify the code, please try again later.</LocalizedString>

‎articles/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ Run the following steps in each domain and forest in your organization that cont
9999
1. Open a PowerShell prompt using the Run as administrator option.
100100
1. Run the following PowerShell commands to create a new Azure AD Kerberos Server object both in your on-premises Active Directory domain and in your Azure Active Directory tenant.
101101

102-
> [!NOTE]
103-
> Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
102+
> [!NOTE]
103+
> Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
104104
105-
```powershell
106-
# Specify the on-premises Active Directory domain. A new Azure AD
107-
# Kerberos Server object will be created in this Active Directory domain.
108-
$domain = "contoso.corp.com"
105+
```powershell
106+
# Specify the on-premises Active Directory domain. A new Azure AD
107+
# Kerberos Server object will be created in this Active Directory domain.
108+
$domain = "contoso.corp.com"
109109
110110
# Enter an Azure Active Directory global administrator username and password.
111111
$cloudCred = Get-Credential
@@ -137,13 +137,13 @@ $domain = "contoso.corp.com"
137137

138138
> [!NOTE]
139139
> If your organization protects password-based sign-in and enforces modern authentication methods such as multifactor authentication, FIDO2, or smart card technology, you must use the `-UserPrincipalName` parameter with the User Principal Name (UPN) of a global administrator.
140-
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
141-
> - Replace `[email protected]` in the following example with the UPN of a global administrator.
140+
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
141+
> - Replace `[email protected]` in the following example with the UPN of a global administrator.
142142
143-
```powershell
144-
# Specify the on-premises Active Directory domain. A new Azure AD
145-
# Kerberos Server object will be created in this Active Directory domain.
146-
$domain = "contoso.corp.com"
143+
```powershell
144+
# Specify the on-premises Active Directory domain. A new Azure AD
145+
# Kerberos Server object will be created in this Active Directory domain.
146+
$domain = "contoso.corp.com"
147147
148148
# Enter a UPN of an Azure Active Directory global administrator
149149
$userPrincipalName = "[email protected]"

‎articles/active-directory/verifiable-credentials/verifiable-credentials-configure-issuer.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,5 @@ public async Task<ActionResult> issuanceRequest()
385385

386386
## Next steps
387387

388-
Learn how a third-party application, also known as a relying party application, can verify your credentials with their own Azure AD tenant verifiable credentials API service. See [Configure Azure AD Verifiable Credentials verifier (preview)](verifiable-credentials-configure-verifier.md).
388+
In the [next step](verifiable-credentials-configure-verifier.md), learn how a third-party application, also known as a relying party application, can verify your credentials with its own Azure AD tenant verifiable credentials API service.
389389

390-
In the [next step](verifiable-credentials-configure-verifier.md) you learn how third parties application, also known as relying party application can verify your credentials with their own Azure AD tenant verifiable credentials API service.

‎articles/cognitive-services/language-service/custom-classification/includes/quickstarts/rest-api.md

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@ Use the following URL to create a project and import your tags file. Replace the
8181

8282
### Parameters
8383

84-
Use the following header to authenticate your request.
84+
Pass the following parameter with your request.
8585

8686
|Key|Explanation|Value|
8787
|--|--|--|
8888
|`api-version`| The API version used.| `2021-11-01-preview` |
8989

90+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
91+
9092
### Headers
9193

9294
Use the following header to authenticate your request.
@@ -161,12 +163,14 @@ Use the following URL when creating your API request. Replace the placeholder va
161163

162164
### Parameters
163165

164-
Use the following header to authenticate your request.
166+
Pass the following parameter with your request.
165167

166168
|Key|Explanation|Value|
167169
|--|--|--|
168170
|`api-version`| The API version used.| `2021-11-01-preview` |
169171

172+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
173+
170174
### Headers
171175

172176
Use the following header to authenticate your request.
@@ -194,7 +198,7 @@ Use the following JSON in your request. The model will be named `MyModel` once t
194198
Once you send your API request, you will receive a `202` response indicating success. In the response headers, extract the `location` value. It will be formatted like this:
195199

196200
```rest
197-
{YOUR-ENDPOINT}/language/analyze-text/projects/{YOUR-PROJECT-NAME}/train/jobs/{JOB-ID}
201+
{YOUR-ENDPOINT}/language/analyze-text/projects/{YOUR-PROJECT-NAME}/train/jobs/{JOB-ID}?api-version=xxxx-xx-xx-xxxxxxx
198202
```
199203

200204
`JOB-ID` is used to identify your request, since this operation is asynchronous. You will use this URL in the next step to get the training status.
@@ -216,12 +220,14 @@ Use the following **GET** request to query the status of your model's training p
216220

217221
### Parameters
218222

219-
Use the following header to authenticate your request.
223+
Pass the following parameter with your request.
220224

221225
|Key|Explanation|Value|
222226
|--|--|--|
223227
|`api-version`| The API version used.| `2021-11-01-preview` |
224228

229+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
230+
225231
### Headers
226232

227233
Use the following header to authenticate your request.
@@ -282,12 +288,14 @@ Create a **PUT** request using the following URL, headers, and JSON body to star
282288

283289
### Parameters
284290

285-
Use the following header to authenticate your request.
291+
Pass the following parameter with your request.
286292

287293
|Key|Explanation|Value|
288294
|--|--|--|
289295
|`api-version`| The API version used.| `2021-11-01-preview` |
290296

297+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
298+
291299
### Headers
292300

293301
Use the following header to authenticate your request.
@@ -310,7 +318,7 @@ Use the following JSON in your request. The model will be named `MyModel` once t
310318
Once you send your API request, you will receive a `202` response indicating success. In the response headers, extract the `location` value. It will be formatted like this:
311319

312320
```rest
313-
{YOUR-ENDPOINT}/language/analyze-text/projects/{YOUR-PROJECT-NAME}/deployments/{DEPLOYMENT-NAME}/jobs/{JOB-ID}
321+
{YOUR-ENDPOINT}/language/analyze-text/projects/{YOUR-PROJECT-NAME}/deployments/{DEPLOYMENT-NAME}/jobs/{JOB-ID}?api-version=xxxx-xx-xx-xxxxxxx
314322
```
315323

316324
`JOB-ID` is used to identify your request, since this operation is asynchronous. You will use this URL in the next step to get the publishing status.
@@ -332,12 +340,14 @@ Use the following **GET** request to query the status of your model's publishing
332340

333341
### Parameters
334342

335-
Use the following header to authenticate your request.
343+
Pass the following parameter with your request.
336344

337345
|Key|Explanation|Value|
338346
|--|--|--|
339347
|`api-version`| The API version used.| `2021-11-01-preview` |
340348

349+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
350+
341351
### Headers
342352

343353
Use the following header to authenticate your request.

‎articles/cognitive-services/language-service/custom-named-entity-recognition/includes/quickstarts/rest-api.md

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,14 @@ Use the following URL to create a project and import your tags file. Replace the
7878

7979
### Parameters
8080

81-
Use the following header to authenticate your request.
81+
Pass the following parameter with your request.
8282

8383
|Key|Explanation|Value|
8484
|--|--|--|
8585
|`api-version`| The API version used.| `2021-11-01-preview` |
8686

87+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
88+
8789
### Headers
8890

8991
Use the following header to authenticate your request.
@@ -192,11 +194,13 @@ Use the following URL when creating your API request. Replace the placeholder va
192194

193195
### Parameters
194196

195-
Use the following header to authenticate your request.
197+
Pass the following parameter with your request.
196198

197199
|Key|Explanation|Value|
198200
|--|--|--|
199-
|`api-version`| The API version used. | `2021-11-01-preview` |
201+
|`api-version`| The API version used.| `2021-11-01-preview` |
202+
203+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
200204

201205
### Headers
202206

@@ -225,7 +229,7 @@ Use the following JSON in your request. The model will be named `MyModel` once t
225229
Once you send your API request, you will receive a `202` response indicating success. In the response headers, extract the `location` value. It will be formatted like this:
226230

227231
```rest
228-
{YOUR-ENDPOINT}/language/analyze-text/projects/{YOUR-PROJECT-NAME}/train/jobs/{JOB-ID}
232+
{YOUR-ENDPOINT}/language/analyze-text/projects/{YOUR-PROJECT-NAME}/train/jobs/{JOB-ID}?api-version=xxxx-xx-xx-xxxxxxx
229233
```
230234

231235
`JOB-ID` is used to identify your request, since this operation is asynchronous. You will use this URL in the next step to get the training status.
@@ -246,11 +250,13 @@ Use the following **GET** request to query the status of your model's training p
246250

247251
### Parameters
248252

249-
Use the following header to authenticate your request.
253+
Pass the following parameter with your request.
250254

251255
|Key|Explanation|Value|
252256
|--|--|--|
253-
|`api-version`| The API version used. | `2021-11-01-preview` |
257+
|`api-version`| The API version used.| `2021-11-01-preview` |
258+
259+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
254260

255261
### Headers
256262

@@ -311,11 +317,13 @@ Create a **PUT** request using the following URL, headers, and JSON body to star
311317

312318
### Parameters
313319

314-
Use the following header to authenticate your request.
320+
Pass the following parameter with your request.
315321

316322
|Key|Explanation|Value|
317323
|--|--|--|
318-
|`api-version`| The API version used. | `2021-11-01-preview` |
324+
|`api-version`| The API version used.| `2021-11-01-preview` |
325+
326+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
319327

320328
### Headers
321329

@@ -339,7 +347,7 @@ Use the following JSON in your request. The model will be named `MyModel` once t
339347
Once you send your API request, you will receive a `202` response indicating success. In the response headers, extract the `location` value. It will be formatted like this:
340348

341349
```rest
342-
{YOUR-ENDPOINT}/language/analyze-text/projects/{YOUR-PROJECT-NAME}/deployments/{DEPLOYMENT-NAME}/jobs/{JOB-ID}
350+
{YOUR-ENDPOINT}/language/analyze-text/projects/{YOUR-PROJECT-NAME}/deployments/{DEPLOYMENT-NAME}/jobs/{JOB-ID}?api-version=xxxx-xx-xx-xxxxxxx
343351
```
344352

345353
`JOB-ID` is used to identify your request, since this operation is asynchronous. You will use this URL in the next step to get the publishing status.
@@ -361,11 +369,13 @@ Use the following **GET** request to query the status of your model's publishing
361369

362370
### Parameters
363371

364-
Use the following header to authenticate your request.
372+
Pass the following parameter with your request.
365373

366374
|Key|Explanation|Value|
367375
|--|--|--|
368-
|`api-version`| The API version used. | `2021-11-01-preview` |
376+
|`api-version`| The API version used.| `2021-11-01-preview` |
377+
378+
To pass the parameter, add `?api-version=2021-11-01-preview` to the end of your request URL.
369379

370380
### Headers
371381

0 commit comments

Comments
 (0)