Skip to content

Commit 170a66a

Browse files
author
Lori Eide
committed
Merge branch 'main' into pva-ga-may
2 parents 33a0055 + 3c05d2c commit 170a66a

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

power-platform/admin/database-security.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ contributors:
1010
ms.custom: "admin-security"
1111
ms.component: pa-admin
1212
ms.topic: conceptual
13-
ms.date: 04/17/2023
13+
ms.date: 04/20/2023
1414
search.audienceType:
1515
- admin
1616
---
@@ -99,8 +99,8 @@ The following table describes which resources can be authored by each security r
9999
|---------|---------|---------|---------|---------|
100100
|Canvas app |X |X |X |X |
101101
|Cloud flow |X (non-solution aware) |X |X (solution aware) |X |
102-
|Connector |X |X |- |X |
103-
|Connection |X |X |- |X |
102+
|Connector |X (non-solution aware) |X |X |X |
103+
|Connection |X |X |X |X |
104104
|Data gateway |X |X |- |X |
105105
|Dataflow |X |X |- |X |
106106
|Dataverse tables |- |- |X |X |

power-platform/admin/security-roles-privileges.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ ms.subservice: admin
66
ms.author: paulliew
77
ms.reviewer: sericks
88
ms.custom: "admin-security"
9-
ms.component: pa-admin
109
ms.topic: conceptual
1110
ms.date: 04/18/2023
12-
search.audienceType:
13-
- admin
1411
---
1512
# Security roles and privileges
1613

@@ -19,7 +16,7 @@ To control data access, you must set up an organizational structure that both pr
1916
You can assign security roles using the new, modern UI, or using the the legacy UI:
2017

2118
- [Security roles and the new, modern UI (preview)](security-roles-privileges.md#security-roles-and-the-new-modern-ui-preview)
22-
- [Security roels and the legacy UI](security-roles-privileges.md#security-roles-and-the-legacy-ui)
19+
- [Security roles and the legacy UI](security-roles-privileges.md#security-roles-and-the-legacy-ui)
2320

2421
## Security roles and the new, modern UI (preview)
2522
> [!Important]

power-platform/guidance/adoption/license-assignment-strategies.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "License assignment strategies | MicrosoftDocs"
33
description: "Guidance for license assignment."
44
author: stjeffer
55
ms.topic: conceptual
6-
ms.date: 04/12/2023
6+
ms.date: 04/20/2023
77
ms.subservice: guidance
88
ms.author: stjeffer
99
ms.reviewer: sericks
@@ -117,4 +117,16 @@ Learn more about on demand license assignment:
117117
- [Licensing auto-claim for Power Apps](/power-platform/release-plan/2023wave1/power-platform-governance-administration/license-autoclaim-power-apps-licenses)
118118
- [Auto-claim policies](/microsoft-365/commerce/licenses/manage-auto-claim-policies)
119119

120+
_Request a license_ streamlines the process of assigning licenses for both users and administrators. Whenever a user tries to use a premium Power App without a license, they can easily request one directly from the product.
121+
122+
Administrators can approve or reject numerous requests simultaneously and add a personalized message for their users.
123+
124+
Administrators also have the option to utilize their organization's request process for custom licenses and adjust the relevant settings in the Microsoft 365 admin center.
125+
126+
Learn more about request a license:
127+
128+
- [Request a license (blog)](https://powerapps.microsoft.com/blog/powerapps-request-license/)
129+
- [Manage self-service license requests](/microsoft-365/commerce/licenses/manage-license-requests?view=o365-worldwide&preserve-view=true)
130+
- [Request a Power Apps premium license](/power-apps/user/request-license)
131+
120132
[!INCLUDE[footer-include](../../includes/footer-banner.md)]

power-platform/guidance/alm-accelerator/branching-environment-strategy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The first time a solution is committed using the ALM Accelerator app, a maker mu
3131

3232
### Feature Commit Branching
3333

34-
When subsequent features are created by the maker a **new feature branch** should be **created from the solution branch**. The branching strategy is similar ot the initial commit strategy, but the feature branch is created from the solution branch instead of the main branch. In this case the main branch remains unchanged and the solution branch is updated with the latest source code until the solution is ready to be deployed to the production environment again providing a version next branch sometimes referred to as a release branch or v-next branch.
34+
When subsequent features are created by the maker a **new feature branch** should be **created from the solution branch**. The branching strategy is similar to the initial commit strategy, but the feature branch is created from the solution branch instead of the main branch. In this case the main branch remains unchanged and the solution branch is updated with the latest source code until the solution is ready to be deployed to the production environment again providing a version next branch sometimes referred to as a release branch or v-next branch.
3535

3636
:::image type="content" source="media/almaccelerator-branching/FeatureRun.png" alt-text="Default, feature branch strategy":::
3737

0 commit comments

Comments
 (0)