Skip to content

Commit a5faef3

Browse files
authored
Merge pull request #185271 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 1db98d4 + 9420a7b commit a5faef3

16 files changed

+62
-27
lines changed

articles/active-directory-b2c/date-transformations.md

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,43 @@ Use this claims transformation to determine if first date plus the `timeSpanInSe
197197
- **operator**: later than
198198
- **timeSpanInSeconds**: 7776000 (90 days)
199199
- Output claims:
200-
- **result**: true
201-
200+
- **result**: true
201+
202+
## IsTermsOfUseConsentRequired
203+
204+
Determine whether a `dateTime` claim type is earlier or greater than a specific date. The result is a new Boolean claim with a value of `true` or `false`.
205+
206+
| Item | TransformationClaimType | Data type | Notes |
207+
| ---- | ----------------------- | --------- | ----- |
208+
| InputClaim | termsOfUseConsentDateTime | dateTime | The `dateTime` claim type to check whether it is earlier or later than the `termsOfUseTextUpdateDateTime` input parameter. Undefined value returns `true` result. |
209+
| InputParameter | termsOfUseTextUpdateDateTime | dateTime | The `dateTime` claim type to check whether it is earlier or later than the `termsOfUseConsentDateTime` input claim. The time part of the date is optional. |
210+
| OutputClaim | result | boolean | The claim type that's produced after this claims transformation has been invoked. |
211+
212+
Use this claims transformation to determine whether a `dateTime` claim type is earlier or greater than a specific date. For example, check whether a user has consented to the latest version of your terms of use (TOU) or terms of service. To check the last time a user consented, store the last time the user accepted the TOU in an [extension attribute](user-profile-attributes.md#extension-attributes). When your TOU wording changes, update the `termsOfUseTextUpdateDateTime` input parameter with the time of the change. Then, call this claims transformation to compare the dates. If the claims transformation returns `true`, the `termsOfUseConsentDateTime` value is earlier than the `termsOfUseTextUpdateDateTime` value, and you can ask the user to accept the updated TOU.
213+
214+
```xml
215+
<ClaimsTransformation Id="IsTermsOfUseConsentRequired" TransformationMethod="IsTermsOfUseConsentRequired">
216+
<InputClaims>
217+
<InputClaim ClaimTypeReferenceId="extension_termsOfUseConsentDateTime" TransformationClaimType="termsOfUseConsentDateTime" />
218+
</InputClaims>
219+
<InputParameters>
220+
<InputParameter Id="termsOfUseTextUpdateDateTime" DataType="dateTime" Value="2021-11-15T00:00:00" />
221+
</InputParameters>
222+
<OutputClaims>
223+
<OutputClaim ClaimTypeReferenceId="termsOfUseConsentRequired" TransformationClaimType="result" />
224+
</OutputClaims>
225+
</ClaimsTransformation>
226+
```
227+
228+
### IsTermsOfUseConsentRequired example
229+
230+
- Input claims:
231+
- **termsOfUseConsentDateTime**: 2020-03-09T09:15:00
232+
- Input parameters:
233+
- **termsOfUseTextUpdateDateTime**: 2021-11-15
234+
- Output claims:
235+
- **result**: true
236+
202237
## GetCurrentDateTime
203238

204239
Get the current UTC date and time and add the value to a claim type.

articles/aks/concepts-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ With the Azure RBAC integration, AKS will use a Kubernetes Authorization webhook
213213

214214
As shown in the above diagram, when using the Azure RBAC integration, all requests to the Kubernetes API will follow the same authentication flow as explained on the [Azure Active Directory integration section](#azure-ad-integration).
215215

216-
If the identity making the request exists in Azure AD, Azure will team with Kubernetes RBAC to authorize the request. If the identity exists outside of Azure AD (i.e., a Kubernetes service account), authorization will deter to the normal Kubernetes RBAC.
216+
If the identity making the request exists in Azure AD, Azure will team with Kubernetes RBAC to authorize the request. If the identity exists outside of Azure AD (i.e., a Kubernetes service account), authorization will defer to the normal Kubernetes RBAC.
217217

218218
In this scenario, you use Azure RBAC mechanisms and APIs to assign users built-in roles or create custom roles, just as you would with Kubernetes roles.
219219

articles/app-service/deploy-content-sync.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Because of underlying differences in the APIs, **OneDrive for Business** is not
5656
Start a sync by running the following command and replacing \<group-name> and \<app-name>:
5757

5858
```azurecli-interactive
59-
az webapp deployment source sync –-resource-group <group-name> -name <app-name>
59+
az webapp deployment source sync --resource-group <group-name> --name <app-name>
6060
```
6161

6262
# [Azure PowerShell](#tab/powershell)
@@ -82,4 +82,4 @@ Invoke-AzureRmResourceAction -ResourceGroupName <group-name> -ResourceType Micro
8282
## Next steps
8383

8484
> [!div class="nextstepaction"]
85-
> [Deploy from local Git repo](deploy-local-git.md)
85+
> [Deploy from local Git repo](deploy-local-git.md)

articles/azure-functions/durable/quickstart-python-vscode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To complete this tutorial:
2929

3030
* Durable Functions require an Azure storage account. You need an Azure subscription.
3131

32-
* Make sure that you have version 3.6, 3.7, or 3.8 of [Python](https://www.python.org/) installed.
32+
* Make sure that you have version 3.7, 3.8, or 3.9 of [Python](https://www.python.org/) installed.
3333

3434
[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
3535

articles/azure-functions/set-runtime-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ You can change the runtime version used by your function app. Because of the pot
6060

6161
You can also view and set the `FUNCTIONS_EXTENSION_VERSION` from the Azure CLI.
6262

63-
Using the Azure CLI, view the current runtime version with the [az functionapp config appsettings set](/cli/azure/functionapp/config/appsettings) command.
63+
Using the Azure CLI, view the current runtime version with the [az functionapp config appsettings list](/cli/azure/functionapp/config/appsettings) command.
6464

6565
```azurecli-interactive
6666
az functionapp config appsettings list --name <function_app> \

articles/azure-maps/how-to-use-map-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You can embed a map in a web page by using the Map Control client-side JavaScrip
5151
```
5252

5353
> [!NOTE]
54-
> Typescript definitions can be imported into your application by adding the following code:
54+
> TypeScript definitions can be imported into your application by adding the following code:
5555
>
5656
> ```javascript
5757
> import * as atlas from 'azure-maps-control';

articles/backup/backup-azure-database-postgresql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can configure backup on multiple databases across multiple Azure PostgreSQL
2828

2929
:::image type="content" source="./media/backup-azure-database-postgresql/create-or-add-backup-policy-inline.png" alt-text="Screenshot showing the option to add a backup policy." lightbox="./media/backup-azure-database-postgresql/create-or-add-backup-policy-expanded.png":::
3030

31-
1. **Select Azure Postgres databases to back up**: Choose one of the Azure PostgreSQL servers across subscriptions if they're in the same region as that of the vault. Expand the arrow to see the list of databases within a server.
31+
1. **Select Azure PostgreSQL databases to back up**: Choose one of the Azure PostgreSQL servers across subscriptions if they're in the same region as that of the vault. Expand the arrow to see the list of databases within a server.
3232

3333
>[!Note]
3434
>You can't (and don't need to) back up the databases *azure_maintenance* and *azure_sys*. Additionally, you can't back up a database already backed-up to a Backup vault.
@@ -155,4 +155,4 @@ Choose from the list of retention rules that were defined in the associated Back
155155

156156
## Next steps
157157

158-
[Troubleshoot PostgreSQL database backup by using Azure Backup](backup-azure-database-postgresql-troubleshoot.md)
158+
[Troubleshoot PostgreSQL database backup by using Azure Backup](backup-azure-database-postgresql-troubleshoot.md)

articles/cosmos-db/sql/sql-api-sdk-node.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ While it was possible to use the v2 SDK in the browser, it was not an ideal expe
197197
Not always the most visible changes, but they help our team ship better code, faster.
198198

199199
* Use rollup for production builds (#104)
200-
* Update to Typescript 3.5 (#327)
200+
* Update to TypeScript 3.5 (#327)
201201
* Convert to TS project references. Extract test folder (#270)
202202
* Enable noUnusedLocals and noUnusedParameters (#275)
203203
* Azure Pipelines YAML for CI builds (#298)

articles/data-factory/connector-troubleshoot-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ You can refer to the troubleshooting pages for each connector to see problems sp
2424
- [Azure Blob Storage](connector-troubleshoot-azure-blob-storage.md)
2525
- [Azure Cosmos DB (including SQL API connector)](connector-troubleshoot-azure-cosmos-db.md)
2626
- [Azure Data Lake (Gen1 and Gen2)](connector-troubleshoot-azure-data-lake.md)
27-
- [Azure database for PostgreSQL](connector-troubleshoot-postgresql.md)
27+
- [Azure Database for PostgreSQL](connector-troubleshoot-postgresql.md)
2828
- [Azure Files storage](connector-troubleshoot-azure-files.md)
2929
- [Azure Synapse Analytics, Azure SQL Database, and SQL Server](connector-troubleshoot-synapse-sql.md)
3030
- [DB2](connector-troubleshoot-db2.md)

articles/iot-edge/how-to-provision-single-device-linux-symmetric.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ sudo apt-get remove iotedge
282282
::: moniker range=">=iotedge-2020-11"
283283

284284
```bash
285-
sudo apt-get remove aziot-edge
285+
sudo apt-get remove --purge aziot-edge
286286
```
287287

288288
::: moniker-end

0 commit comments

Comments
 (0)