Skip to content

Commit b06c7e2

Browse files
authored
Merge pull request #90234 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 4778004 + d9bbe71 commit b06c7e2

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed

articles/active-directory/manage-apps/methods-for-assigning-users-and-groups.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Before you can assign users and groups to an application, you must require user
4646

4747
To assign one or more users to an application directly, follow the steps below:
4848

49-
1. Open the [**Azure portal**](https://portal.azure.com/) and sign in as a **Global Administrator.**
49+
1. Open the [**Azure portal**](https://portal.azure.com/) and sign in as a **Global Administrator or as a non-admin application owner.**
5050

5151
2. Open the **Azure Active Directory Extension** by clicking **All services** at the top of the main left hand navigation menu.
5252

@@ -84,7 +84,7 @@ After a short period of time, the users you have selected will be able to launch
8484

8585
To assign one or more groups to an application directly, follow the steps below:
8686

87-
1. Open the [**Azure portal**](https://portal.azure.com/) and sign in as a **Global Administrator.**
87+
1. Open the [**Azure portal**](https://portal.azure.com/) and sign in as a **Global Administrator** or as a non-admin application owner with an Azure AD Premium license assigned.
8888

8989
2. Open the **Azure Active Directory Extension** by clicking **All services** at the top of the main left hand navigation menu.
9090

articles/azure-functions/durable/durable-functions-entities.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static void Counter([EntityTrigger] IDurableEntityContext ctx)
4646
{
4747
case "add":
4848
int amount = ctx.GetInput<int>();
49-
currentValue += operand;
49+
currentValue += amount;
5050
break;
5151
case "reset":
5252
currentValue = 0;
@@ -330,4 +330,4 @@ There are some important differences, however, that are worth noting:
330330
## Next steps
331331

332332
> [!div class="nextstepaction"]
333-
> [Learn about task hubs](durable-functions-task-hubs.md)
333+
> [Learn about task hubs](durable-functions-task-hubs.md)

articles/cognitive-services/personalizer/ethics-responsible-use.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ When choosing use cases for Personalizer:
5858

5959
* Start the design process considering how the personalization helps your users.
6060
* Consider the negative consequences in the real world if some items aren't ranked for users due to personalization patterns or exploration.
61-
* Consider self-fulfilling prophecy loops. This may happen if a personalization reward trains a model so it may subsequently further exclude a demographic group from accessing relevant content. For example, most people in a low-income neighborhood don't obtain a premium insurance offer, and slowly nobody in the neighborhood tends to see the offer at all.
61+
* Consider whether your use case constitutes automated processing which significantly affects data subjects that is regulated under [GDPR](https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:32016R0679) Article 22 or other laws.
62+
* Consider self-fulfilling prophecy loops. This may happen if a personalization reward trains a model so it may subsequently further exclude a demographic group from accessing relevant content. For example, most people in a low-income neighborhood don't obtain a premium insurance offer, and slowly nobody in the neighborhood tends to see the offer at all if there isn't enough exploration.
6263
* Save copies of models and learning policies in case it is necessary to reproduce Personalizer in the future. You can do this periodically or every model refresh period.
6364
* Consider the level of exploration adequate for the space and how to use it as a tool to mitigate "echo chamber" effects.
6465

articles/storage/common/storage-redundancy-gzrs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Geo-zone-redundant storage (GZRS) (preview) marries the high availability of [zo
1717

1818
With a GZRS storage account, you can continue to read and write data if an availability zone becomes unavailable or is unrecoverable. Additionally, your data is also durable in the case of a complete regional outage or a disaster in which the primary region isn’t recoverable. GZRS is designed to provide at least 99.99999999999999% (16 9's) durability of objects over a given year. GZRS also offers the same [scalability targets](storage-scalability-targets.md) as LRS, ZRS, GRS, or RA-GRS. You can optionally enable read access to data in the secondary region with read-access geo-zone-redundant storage (RA-GZRS) if your applications need to be able to read data in the event of a disaster in the primary region.
1919

20-
Microsoft recommends using GZRS for applications requiring consistency, durability, high availability, excellent performance, and resilience for diaster recovery. For the additional security of read access to the secondary region in the event of a regional disaster, enable RA-GZRS for your storage account.
20+
Microsoft recommends using GZRS for applications requiring consistency, durability, high availability, excellent performance, and resilience for disaster recovery. For the additional security of read access to the secondary region in the event of a regional disaster, enable RA-GZRS for your storage account.
2121

2222
## About the preview
2323

159 KB
Loading
44 KB
Loading

articles/virtual-network/tutorial-connect-virtual-networks-portal.md

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,28 +76,19 @@ Log in to the Azure portal at https://portal.azure.com.
7676

7777
|Setting|Value|
7878
|---|---|
79-
|Name|myVirtualNetwork1-myVirtualNetwork2|
79+
|Name of the peering from myVirtualNetwork1 to remote virtual network|myVirtualNetwork1-myVirtualNetwork2 - When the page first loads, you'll see the phrase "remote virtual network" here. After you choose the remote virtual network, the phrase "remote virtual network" will be replaced with the name of the remote virtual network.|
8080
|Subscription| Select your subscription.|
81-
|Virtual network|myVirtualNetwork2 - To select the *myVirtualNetwork2* virtual network, select **Virtual network**, then select **myVirtualNetwork2**. You can select a virtual network in the same region or in a different region.|
81+
|Virtual network|myVirtualNetwork2 - To select the *myVirtualNetwork2* virtual network, select **Virtual network**, then select **myVirtualNetwork2 (myResourceGroup)**. You can select a virtual network in the same region or in a different region.|
82+
|Name of the peering from myVirtualNetwork2 to myVirtualNetwork1|myVirtualNetwork2-myVirtualNetwork1|
8283

83-
![Peering settings](./media/tutorial-connect-virtual-networks-portal/peering-settings.png)
84+
![Peering settings](./media/tutorial-connect-virtual-networks-portal/peering-settings-bidirectional.png)
8485

85-
The **PEERING STATUS** is *Initiated*, as shown in the following picture:
86+
The **PEERING STATUS** is *Connected*, as shown in the following picture:
8687

87-
![Peering status](./media/tutorial-connect-virtual-networks-portal/peering-status.png)
88+
![Peering status](./media/tutorial-connect-virtual-networks-portal/peering-status-connected.png)
8889

8990
If you don't see the status, refresh your browser.
9091

91-
4. In the **Search** box at the top of the Azure portal, begin typing *MyVirtualNetwork2*. When **myVirtualNetwork2** appears in the search results, select it.
92-
5. Complete steps 2-3 again, with the following changes, and then select **OK**:
93-
94-
|Setting|Value|
95-
|---|---|
96-
|Name|myVirtualNetwork2-myVirtualNetwork1|
97-
|Virtual network|myVirtualNetwork1|
98-
99-
The **PEERING STATUS** is *Connected*. Azure also changed the peering status for the *myVirtualNetwork2-myVirtualNetwork1* peering from *Initiated* to *Connected.* Virtual network peering is not fully established until the peering status for both virtual networks is *Connected.*
100-
10192
## Create virtual machines
10293

10394
Create a VM in each virtual network so that you can communicate between them in a later step.

0 commit comments

Comments
 (0)