Skip to content

Commit 4cc8185

Browse files
committed
Merge branch 'main' into release-ga-orbital
2 parents 4f736f5 + e87575a commit 4cc8185

File tree

107 files changed

+669
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+669
-295
lines changed

.openpublishing.redirection.json

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27757,7 +27757,72 @@
2775727757
"source_path_from_root": "/articles/virtual-machines/workloads/sap/dbms_guide_sapase.md",
2775827758
"redirect_url": "/azure/virtual-machines/workloads/sap/dbms-guide-sapase",
2775927759
"redirect_document_id": false
27760+
},
27761+
{
27762+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/dbms_guide_general.md",
27763+
"redirect_url": "/azure/virtual-machines/workloads/sap/dbms-guide-general",
27764+
"redirect_document_id": false
2776027765
},
27766+
{
27767+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/dbms_guide_ibm.md",
27768+
"redirect_url": "/azure/virtual-machines/workloads/sap/dbms-guide-ibm",
27769+
"redirect_document_id": false
27770+
},
27771+
{
27772+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/dbms_guide_maxdb.md",
27773+
"redirect_url": "/azure/virtual-machines/workloads/sap/dbms-guide-maxdb",
27774+
"redirect_document_id": false
27775+
},
27776+
{
27777+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/dbms_guide_oracle.md",
27778+
"redirect_url": "/azure/virtual-machines/workloads/sap/dbms-guide-oracle",
27779+
"redirect_document_id": false
27780+
},
27781+
{
27782+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/dbms_guide_sqlserver.md",
27783+
"redirect_url": "/azure/virtual-machines/workloads/sap/dbms-guide-sqlserver",
27784+
"redirect_document_id": false
27785+
},
27786+
{
27787+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-supported-product-on-azure.md",
27788+
"redirect_url": "/azure/virtual-machines/workloads/sap/supported-product-on-azure",
27789+
"redirect_document_id": false
27790+
},
27791+
{
27792+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-rise-integration.md",
27793+
"redirect_url": "/azure/virtual-machines/workloads/sap/rise-integration",
27794+
"redirect_document_id": false
27795+
},
27796+
{
27797+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-proximity-placement-scenarios.md",
27798+
"redirect_url": "/azure/virtual-machines/workloads/sap/proximity-placement-scenarios",
27799+
"redirect_document_id": false
27800+
},
27801+
{
27802+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-planning-supported-configurations.md",
27803+
"redirect_url": "/azure/virtual-machines/workloads/sap/planning-supported-configurations",
27804+
"redirect_document_id": false
27805+
},
27806+
{
27807+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-iq-deployment-guide.md",
27808+
"redirect_url": "/azure/virtual-machines/workloads/sap/dbms-guide-sapiq",
27809+
"redirect_document_id": false
27810+
},
27811+
{
27812+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-certifications.md",
27813+
"redirect_url": "/azure/virtual-machines/workloads/sap/certifications",
27814+
"redirect_document_id": false
27815+
},
27816+
{
27817+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-ha-availability-zones.md",
27818+
"redirect_url": "/azure/virtual-machines/workloads/sap/high-availability-zones",
27819+
"redirect_document_id": false
27820+
},
27821+
{
27822+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-deployment-checklist.md",
27823+
"redirect_url": "/azure/virtual-machines/workloads/sap/deployment-checklist",
27824+
"redirect_document_id": false
27825+
},
2776127826
{
2776227827
"source_path_from_root": "/articles/migrate/how-to-scale-assessment.md",
2776327828
"redirect_url": "scale-hyper-v-assessment",

articles/active-directory/cloud-infrastructure-entitlement-management/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
- name: Manage users, roles, and their access levels
9090
expanded: false
9191
items:
92+
- name: Add or remove a user in Permissions Management
93+
href: how-to-add-remove-user-to-group.md
9294
- name: Manage users and groups
9395
href: ui-user-management.md
9496
# - name: Define and manage users, roles, and access levels
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
title: Add or remove a user in Permissions Management through the Microsoft Entra admin center
3+
description: How to add or remove a user in Permissions Management through Azure Active Directory (AD).
4+
services: active-directory
5+
author: jenniferf-skc
6+
manager: amycolannino
7+
ms.service: active-directory
8+
ms.subservice: ciem
9+
ms.workload: identity
10+
ms.topic: how-to
11+
ms.date: 12/28/2022
12+
ms.author: jfields
13+
---
14+
15+
# Add or remove a user in Permissions Management
16+
17+
This article describes how you can add or remove a new user for a group in Permissions Management.
18+
19+
> [!NOTE]
20+
> Permissions Management entitlements work through group-based access. To add a new user, you must add a user to a group through Azure Active Directory (AD).
21+
22+
## Add a user
23+
24+
1. Navigate to the [Microsoft Entra admin center](https://entr.microsoft.com/#home).
25+
1. From the Azure Active Directory tile, select **Go to Azure Active Directory**.
26+
1. From the navigation pane, select the **Groups** drop-down menu, then **All groups**.
27+
1. Select the group name for the group you want to add the user to.
28+
1. From the group's **Manage** menu, click **Members**.
29+
1. Click **+ Add members**, then search for the user you want to add from the list.
30+
> [!NOTE]
31+
> In order to add a user to a group, you must be the group owner. If you're not the owner of the
32+
selected group, please reach out to the group owner. If you don't know who the owner of the group is,
33+
select **Owners** under the group's **Manage** menu.
34+
7. Click **Select**. Your user has been added.
35+
8. Click the **Refresh** button to refresh your screen and view the user you've added.
36+
37+
38+
## Remove a user
39+
40+
1. Navigate to the Microsoft [Entra admin center](https://entr.microsoft.com/#home).
41+
1. From the Azure Active Directory tile, select **Go to Azure Active Directory**.
42+
1. From the navigation pane, select the **Groups** drop-down menu, then **All groups**.
43+
1. Select the group name for the group you want to remove the user from.
44+
1. From the groups **Manage** menu, click **Members**.
45+
1. Search for the user you want to remove from the list, then check the box next to their name.
46+
> [!NOTE]
47+
> In order to remove a user from a group, you must be the group owner. If you're not the owner of the
48+
selected group, please reach out to the group owner. If you don't know who the owner of the group is,
49+
select **Owners** under the group's **Manage** menu.
50+
7. Click **X Remove**, then click **Yes**. The user is removed from the group.
51+
52+
53+
## Next steps
54+
55+
- For more information on managing users and groups, see [Manage users and groups with the User management dashboard](ui-user-management.md).
56+
- For more information on setting group permissions, see [Select group-based permissions settings](how-to-create-group-based-permissions.md).

articles/aks/node-access.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,7 @@ aks-nodepool1-12345678-vmss000001 Ready agent 13m v1.19.9 10.240.0.
3939
aksnpwin000000 Ready agent 87s v1.19.9 10.240.0.67 <none> Windows Server 2019 Datacenter 10.0.17763.1935 docker://19.3.1
4040
```
4141

42-
Us the `kubectl debug` command to run a container image on the node to connect to it.
43-
44-
```bash
45-
kubectl debug node/aks-nodepool1-12345678-vmss000000 -it --image=mcr.microsoft.com/dotnet/runtime-deps:6.0
46-
```
47-
48-
The following command starts a privileged container on your node and connects to it.
42+
Use the `kubectl debug` command to run a container image on the node to connect to it. The following command starts a privileged container on your node and connects to it.
4943

5044
```bash
5145
kubectl debug node/aks-nodepool1-12345678-vmss000000 -it --image=mcr.microsoft.com/dotnet/runtime-deps:6.0

articles/application-gateway/application-gateway-autoscaling-zone-redundant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: fasttrack-edit, references_regions
1414

1515
Application Gateway and WAF can be configured to scale in two modes:
1616

17-
- **Autoscaling** - With autoscaling enabled, the Application Gateway and WAF v2 SKUs scale out or in based on application traffic requirements. This mode offers better elasticity to your application and eliminates the need to guess the application gateway size or instance count. This mode also allows you to save cost by not requiring the gateway to run at peak-provisioned capacity for expected maximum traffic load. You must specify a minimum and optionally maximum instance count. Minimum capacity ensures that Application Gateway and WAF v2 don't fall below the minimum instance count specified, even without traffic. Each instance is roughly equivalent to 10 more reserved Capacity Units. Zero signifies no reserved capacity and is purely autoscaling in nature. You can also optionally specify a maximum instance count, which ensures that the Application Gateway doesn't scale beyond the specified number of instances. You'll only be billed for the amount of traffic served by the Gateway. The instance counts can range from 0 to 125. The default value for maximum instance count is 20 if not specified.
17+
- **Autoscaling** - With autoscaling enabled, the Application Gateway and WAF v2 SKUs scale out or in based on application traffic requirements. This mode offers better elasticity to your application and eliminates the need to guess the application gateway size or instance count. This mode also allows you to save cost by not requiring the gateway to run at peak-provisioned capacity for expected maximum traffic load. You must specify a minimum and optionally maximum instance count. Minimum capacity ensures that Application Gateway and WAF v2 don't fall below the minimum instance count specified, even without traffic. Each instance is roughly equivalent to 10 more reserved Capacity Units. Zero signifies no reserved capacity and is purely autoscaling in nature. You can also optionally specify a maximum instance count, which ensures that the Application Gateway doesn't scale beyond the specified number of instances. You'll only be billed for the amount of traffic served by the Gateway. The instance counts can range from 0 to 125. The default value for maximum instance count is 10 if not specified.
1818
- **Manual** - You can also choose Manual mode where the gateway won't autoscale. In this mode, if there's more traffic than what Application Gateway or WAF can handle, it could result in traffic loss. With manual mode, specifying instance count is mandatory. Instance count can vary from 1 to 125 instances.
1919

2020
## Autoscaling and High Availability

articles/applied-ai-services/form-recognizer/containers/form-recognizer-container-install-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You'll also need the following to use Form Recognizer containers:
3232
| **Familiarity with Docker** | You should have a basic understanding of Docker concepts, like registries, repositories, containers, and container images, as well as knowledge of basic `docker` [terminology and commands](/dotnet/architecture/microservices/container-docker-introduction/docker-terminology). |
3333
| **Docker Engine installed** | <ul><li>You need the Docker Engine installed on a [host computer](#host-computer-requirements). Docker provides packages that configure the Docker environment on [macOS](https://docs.docker.com/docker-for-mac/), [Windows](https://docs.docker.com/docker-for-windows/), and [Linux](https://docs.docker.com/engine/installation/#supported-platforms). For a primer on Docker and container basics, see the [Docker overview](https://docs.docker.com/engine/docker-overview/).</li><li> Docker must be configured to allow the containers to connect with and send billing data to Azure. </li><li> On **Windows**, Docker must also be configured to support **Linux** containers.</li></ul> |
3434
|**Form Recognizer resource** | A [**single-service Azure Form Recognizer**](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) or [**multi-service Cognitive Services**](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) resource in the Azure portal. To use the containers, you must have the associated key and endpoint URI. Both values are available on the Azure portal Form Recognizer **Keys and Endpoint** page: <ul><li>**{FORM_RECOGNIZER_KEY}**: one of the two available resource keys.<li>**{FORM_RECOGNIZER_ENDPOINT_URI}**: the endpoint for the resource used to track billing information.</li></li></ul>|
35-
| **Computer Vision API resource** | **To process business cards, ID documents, or Receipts, you'll need a Computer Vision resource.** <ul><li>You can access the Recognize Text feature as either an Azure resource (the REST API or SDK) or a **cognitive-services-recognize-text** [container](../../../cognitive-services/Computer-vision/computer-vision-how-to-install-containers.md#get-the-container-image-with-docker-pull). The usual [billing](#billing) fees apply.</li> <li>If you use the **cognitive-services-recognize-text** container, make sure that your Computer Vision key for the Form Recognizer container is the key specified in the Computer Vision `docker run` or `docker compose` command for the **cognitive-services-recognize-text** container and your billing endpoint is the container's endpoint (for example, `http://localhost:5000`). If you use both the Computer Vision container and Form Recognizer container together on the same host, they can't both be started with the default port of *5000*. </li></ul></br>Pass in both the key and endpoints for your Computer Vision Azure cloud or Cognitive Services container:<ul><li>**{COMPUTER_VISION_KEY}**: one of the two available resource keys.</li><li> **{COMPUTER_VISION_ENDPOINT_URI}**: the endpoint for the resource used to track billing information.</li></ul> |
35+
| **Computer Vision API resource** | **To process business cards, ID documents, or Receipts, you'll need a Computer Vision resource.** <ul><li>You can access the Recognize Text feature as either an Azure resource (the REST API or SDK) or a **cognitive-services-recognize-text** [container](../../../cognitive-services/Computer-vision/computer-vision-how-to-install-containers.md#get-the-container-image). The usual [billing](#billing) fees apply.</li> <li>If you use the **cognitive-services-recognize-text** container, make sure that your Computer Vision key for the Form Recognizer container is the key specified in the Computer Vision `docker run` or `docker compose` command for the **cognitive-services-recognize-text** container and your billing endpoint is the container's endpoint (for example, `http://localhost:5000`). If you use both the Computer Vision container and Form Recognizer container together on the same host, they can't both be started with the default port of *5000*. </li></ul></br>Pass in both the key and endpoints for your Computer Vision Azure cloud or Cognitive Services container:<ul><li>**{COMPUTER_VISION_KEY}**: one of the two available resource keys.</li><li> **{COMPUTER_VISION_ENDPOINT_URI}**: the endpoint for the resource used to track billing information.</li></ul> |
3636

3737
|Optional|Purpose|
3838
|---------|----------|

0 commit comments

Comments
 (0)