Skip to content

Commit ad6a3da

Browse files
authored
Merge pull request #230448 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 0075dde + 87275e2 commit ad6a3da

File tree

16 files changed

+44
-55
lines changed

16 files changed

+44
-55
lines changed

articles/active-directory-b2c/tutorial-register-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.subservice: B2C
1919

2020
Before your [applications](application-types.md) can interact with Azure Active Directory B2C (Azure AD B2C), they must be registered in a tenant that you manage. This tutorial shows you how to register a web application using the Azure portal.
2121

22-
A "web application" refers to a traditional web application that performs most of the application logic on the server. They may be built using frameworks like ASP.NET Core, Maven (Java), Flask (Python), and Express (Node.js).
22+
A "web application" refers to a traditional web application that performs most of the application logic on the server. They may be built using frameworks like ASP.NET Core, Spring (Java), Flask (Python), and Express (Node.js).
2323

2424
> [!IMPORTANT]
2525
> If you're using a single-page application ("SPA") instead (e.g. using Angular, Vue, or React), learn [how to register a single-page application](tutorial-register-spa.md).

articles/active-directory/devices/device-management-azure-portal.md

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -107,25 +107,6 @@ To view or copy BitLocker keys, you need to be the owner of the device or have o
107107
- Security Administrator
108108
- Security Reader
109109

110-
## Block users from viewing their BitLocker keys (preview)
111-
In this preview, admins can block self-service BitLocker key access to the registered owner of the device. Default users without the BitLocker read permission will be unable to view or copy their BitLocker key(s) for their owned devices.
112-
113-
To disable/enable self-service BitLocker recovery:
114-
115-
```PowerShell
116-
Connect-MgGraph -Scopes Policy.ReadWrite.Authorization
117-
$authPolicyUri = "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy"
118-
$body = @{
119-
defaultUserRolePermissions = @{
120-
allowedToReadBitlockerKeysForOwnedDevice = $false #Set this to $true to allow BitLocker self-service recovery
121-
}
122-
}| ConvertTo-Json
123-
Invoke-MgGraphRequest -Uri $authPolicyUri -Method PATCH -Body $body
124-
# Show current policy setting
125-
$authPolicy = Invoke-MgGraphRequest -Uri $authPolicyUri
126-
$authPolicy.defaultUserRolePermissions
127-
```
128-
129110
## View and filter your devices (preview)
130111

131112
In this preview, you have the ability to infinitely scroll, reorder columns, and select all devices. You can filter the device list by these device attributes:
@@ -137,6 +118,7 @@ In this preview, you have the ability to infinitely scroll, reorder columns, and
137118
- OS
138119
- Device type (printer, secure VM, shared device, registered device)
139120
- MDM
121+
- Autopilot
140122
- Extension attributes
141123
- Administrative unit
142124
- Owner
@@ -177,8 +159,6 @@ You must be assigned one of the following roles to view or manage device setting
177159
> [!NOTE]
178160
> The **Users may join devices to Azure AD** setting is applicable only to Azure AD join on Windows 10 or newer. This setting doesn't apply to hybrid Azure AD joined devices, [Azure AD joined VMs in Azure](./howto-vm-sign-in-azure-ad-windows.md#enable-azure-ad-login-for-a-windows-vm-in-azure), or Azure AD joined devices that use [Windows Autopilot self-deployment mode](/mem/autopilot/self-deploying) because these methods work in a userless context.
179161
180-
- **Additional local administrators on Azure AD joined devices**: This setting allows you to select the users who are granted local administrator rights on a device. These users are added to the Device Administrators role in Azure AD. Global Administrators in Azure AD and device owners are granted local administrator rights by default.
181-
This option is a premium edition capability available through products like Azure AD Premium and Enterprise Mobility + Security.
182162
- **Users may register their devices with Azure AD**: You need to configure this setting to allow users to register Windows 10 or newer personal, iOS, Android, and macOS devices with Azure AD. If you select **None**, devices aren't allowed to register with Azure AD. Enrollment with Microsoft Intune or mobile device management for Microsoft 365 requires registration. If you've configured either of these services, **ALL** is selected, and **NONE** is unavailable.
183163
- **Require Multi-Factor Authentication to register or join devices with Azure AD**:
184164
- We recommend organizations use the [Register or join devices user](../conditional-access/concept-conditional-access-cloud-apps.md#user-actions) action in Conditional Access to enforce multifactor authentication. You must configure this toggle to **No** if you use a Conditional Access policy to require multifactor authentication.
@@ -192,6 +172,11 @@ This option is a premium edition capability available through products like Azur
192172
> [!NOTE]
193173
> The **Maximum number of devices** setting applies to devices that are either Azure AD joined or Azure AD registered. This setting doesn't apply to hybrid Azure AD joined devices.
194174
175+
- **Additional local administrators on Azure AD joined devices**: This setting allows you to select the users who are granted local administrator rights on a device. These users are added to the Device Administrators role in Azure AD. Global Administrators in Azure AD and device owners are granted local administrator rights by default.
176+
This option is a premium edition capability available through products like Azure AD Premium and Enterprise Mobility + Security.
177+
178+
- **Restrict non-admin users from recovering the BitLocker key(s) for their owned devices (preview)**: In this preview, admins can block self-service BitLocker key access to the registered owner of the device. Default users without the BitLocker read permission will be unable to view or copy their BitLocker key(s) for their owned devices.
179+
195180
- **Enterprise State Roaming**: For information about this setting, see [the overview article](enterprise-state-roaming-overview.md).
196181

197182
## Audit logs
79.5 KB
Loading

articles/active-directory/fundamentals/users-default-permissions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ You can restrict default permissions for member users in the following ways:
6060
| **Create Microsoft 365 groups** | Setting this option to **No** prevents users from creating Microsoft 365 groups. Setting this option to **Some** allows a set of users to create Microsoft 365 groups. Global administrators and user administrators can still create Microsoft 365 groups. To learn how, see [Azure Active Directory cmdlets for configuring group settings](../enterprise-users/groups-settings-cmdlets.md). |
6161
| **Restrict access to Azure AD administration portal** | **What does this switch do?** <br>**No** lets non-administrators browse the Azure AD administration portal. <br>**Yes** Restricts non-administrators from browsing the Azure AD administration portal. Non-administrators who are owners of groups or applications are unable to use the Azure portal to manage their owned resources. </p><p></p><p>**What does it not do?** <br> It doesn't restrict access to Azure AD data using PowerShell, Microsoft GraphAPI, or other clients such as Visual Studio. <br>It doesn't restrict access as long as a user is assigned a custom role (or any role). </p><p></p><p>**When should I use this switch?** <br>Use this option to prevent users from misconfiguring the resources that they own. </p><p></p><p>**When should I not use this switch?** <br>Don't use this switch as a security measure. Instead, create a Conditional Access policy that targets Microsoft Azure Management that blocks non-administrators access to [Microsoft Azure Management](../conditional-access/concept-conditional-access-cloud-apps.md#microsoft-azure-management). </p><p></p><p> **How do I grant only a specific non-administrator users the ability to use the Azure AD administration portal?** <br> Set this option to **Yes**, then assign them a role like global reader. </p><p></p><p>**Restrict access to the Entra administration portal** <br>A Conditional Access policy that targets Microsoft Azure Management targets access to all Azure management. |
6262
| **Restrict non-admin users from creating tenants** | Users can create tenants in the Azure AD and Entra administration portal under Manage tenant. The creation of a tenant is recorded in the Audit log as category DirectoryManagement and activity Create Company. Anyone who creates a tenant becomes the Global Administrator of that tenant. The newly created tenant doesn't inherit any settings or configurations. </p><p></p><p>**What does this switch do?** <br> Setting this option to **Yes** restricts creation of Azure AD tenants to the Global Administrator or tenant creator roles. Setting this option to **No** allows non-admin users to create Azure AD tenants. Tenant create will continue to be recorded in the Audit log. </p><p></p><p>**How do I grant only a specific non-administrator users the ability to create new tenants?** <br> Set this option to Yes, then assign them the tenant creator role.|
63+
| **Restrict non-admin users from reading BitLocker key(s) for their owned devices** | Setting this option to **Yes** restricts users from being able to self-service recover BitLocker key(s) for their owned devices. Setting this option to **No** allows users to recover their BitLocker key(s). |
6364
| **Read other users** | This setting is available in Microsoft Graph and PowerShell only. Setting this flag to `$false` prevents all non-admins from reading user information from the directory. This flag doesn't prevent reading user information in other Microsoft services like Exchange Online.</p><p>This setting is meant for special circumstances, so we don't recommend setting the flag to `$false`. |
6465

6566
The **Restrict non-admin users from creating tenants** option is shown [below](https://portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/UserSettings)

articles/active-directory/fundamentals/whats-new-archive.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ A new policy API is available for the administrators to control tenant wide poli
8989

9090
In some situations, you may want to restrict the ability for end users to self-service BitLocker keys. With this new functionality, you can now turn off self-service of BitLocker keys, so that only specific individuals with right privileges can recover a BitLocker key.
9191

92-
For more information, see: [Block users from viewing their BitLocker keys (preview)](../devices/device-management-azure-portal.md#block-users-from-viewing-their-bitlocker-keys-preview)
92+
For more information, see: [Block users from viewing their BitLocker keys (preview)](../devices/device-management-azure-portal.md#configure-device-settings)
9393

9494

9595
---
@@ -9462,4 +9462,4 @@ For more information, see:
94629462

94639463
- [Get started with Azure Active Directory Identity Protection and Microsoft Graph](../identity-protection/howto-identity-protection-graph-api.md)
94649464

9465-
---
9465+
---

articles/aks/ingress-basic.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ To see the ingress controller in action, run two demo applications in your AKS c
318318
spec:
319319
type: ClusterIP
320320
ports:
321-
- port: 80
321+
- port: 80
322322
selector:
323323
app: aks-helloworld-one
324324
```
@@ -356,7 +356,7 @@ To see the ingress controller in action, run two demo applications in your AKS c
356356
spec:
357357
type: ClusterIP
358358
ports:
359-
- port: 80
359+
- port: 80
360360
selector:
361361
app: aks-helloworld-two
362362
```
@@ -388,7 +388,7 @@ In the following example, traffic to *EXTERNAL_IP/hello-world-one* is routed to
388388
spec:
389389
ingressClassName: nginx
390390
rules:
391-
- http:
391+
- http:
392392
paths:
393393
- path: /hello-world-one(/|$)(.*)
394394
pathType: Prefix
@@ -422,7 +422,7 @@ In the following example, traffic to *EXTERNAL_IP/hello-world-one* is routed to
422422
spec:
423423
ingressClassName: nginx
424424
rules:
425-
- http:
425+
- http:
426426
paths:
427427
- path: /static(/|$)(.*)
428428
pathType: Prefix

articles/aks/use-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ The output should resemble the following:
146146

147147
### Add role assignment
148148

149-
For Vnet, attached Azure disk, static IP address, route table which are outside the default worker node resource group, you need to assign the `Contributor` role on custom resource group.
149+
For VNet, attached Azure disk, static IP address, route table which are outside the default worker node resource group, you need to assign the `Contributor` role on custom resource group.
150150

151151
```azurecli-interactive
152152
az role assignment create --assignee <control-plane-identity-principal-id> --role "Contributor" --scope "<custom-resource-group-resource-id>"

articles/azure-netapp-files/azure-netapp-files-create-volumes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ This article shows you how to create an NFS volume. For SMB volumes, see [Create
7878
* **Virtual network**
7979
Specify the Azure virtual network (VNet) from which you want to access the volume.
8080

81-
The Vnet you specify must have a subnet delegated to Azure NetApp Files. The Azure NetApp Files service can be accessed only from the same Vnet or from a Vnet that is in the same region as the volume through Vnet peering. You can also access the volume from your on-premises network through Express Route.
81+
The VNet you specify must have a subnet delegated to Azure NetApp Files. The Azure NetApp Files service can be accessed only from the same Vnet or from a Vnet that is in the same region as the volume through VNet peering. You can also access the volume from your on-premises network through Express Route.
8282

8383
* **Subnet**
8484
Specify the subnet that you want to use for the volume.
8585
The subnet you specify must be delegated to Azure NetApp Files.
8686
87-
If you have not delegated a subnet, you can click **Create new** on the Create a Volume page. Then in the Create Subnet page, specify the subnet information, and select **Microsoft.NetApp/volumes** to delegate the subnet for Azure NetApp Files. In each Vnet, only one subnet can be delegated to Azure NetApp Files.
87+
If you have not delegated a subnet, you can click **Create new** on the Create a Volume page. Then in the Create Subnet page, specify the subnet information, and select **Microsoft.NetApp/volumes** to delegate the subnet for Azure NetApp Files. In each VNet, only one subnet can be delegated to Azure NetApp Files.
8888

8989
![Create a volume](../media/azure-netapp-files/azure-netapp-files-new-volume.png)
9090

articles/cognitive-services/openai/how-to/managed-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Assigning yourself to the Cognitive Services User role will allow you to use you
6565
Use the access token to authorize your API call by setting the `Authorization` header value.
6666
6767
```bash
68-
curl ${endpoint%/}/openai/deployment/YOUR_DEPLOYMENT_NAME/completions?api-version=2022-12-01 \
68+
curl ${endpoint%/}/openai/deployments/YOUR_DEPLOYMENT_NAME/completions?api-version=2022-12-01 \
6969
-H "Content-Type: application/json" \
7070
-H "Authorization: Bearer $accessToken" \
7171
-d '{ "prompt": "Once upon a time" }'
@@ -85,4 +85,4 @@ Before you can use managed identities for Azure resources to authorize access to
8585
- [Azure Resource Manager template](../../../active-directory/managed-identities-azure-resources/qs-configure-template-windows-vm.md)
8686
- [Azure Resource Manager client libraries](../../../active-directory/managed-identities-azure-resources/qs-configure-sdk-windows-vm.md)
8787
88-
For more information about managed identities, see [Managed identities for Azure resources](../../../active-directory/managed-identities-azure-resources/overview.md).
88+
For more information about managed identities, see [Managed identities for Azure resources](../../../active-directory/managed-identities-azure-resources/overview.md).

articles/expressroute/expressroute-faqs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,8 @@ Your existing circuit will continue advertising the prefixes for Microsoft 365.
440440

441441
* Microsoft peering of ExpressRoute circuits that are configured on or after August 1, 2017 won't have any prefixes advertised until a route filter is attached to the circuit. You'll see no prefixes by default.
442442

443-
### If I have multiple Virtual Networks (Vnets) connected to the same ExpressRoute circuit, can I use ExpressRoute for Vnet-to-Vnet connectivity?
444-
Vnet-to-Vnet connectivity over ExpressRoute isn't recommended. To achieve this, configure [Virtual Network Peering](../virtual-network/virtual-network-peering-overview.md?msclkid=b64a7b6ac19e11eca60d5e3e5d0764f5).
443+
### If I have multiple Virtual Networks (VNets) connected to the same ExpressRoute circuit, can I use ExpressRoute for VNet-to-VNet connectivity?
444+
VNet-to-VNet connectivity over ExpressRoute isn't recommended. To achieve this, configure [Virtual Network Peering](../virtual-network/virtual-network-peering-overview.md?msclkid=b64a7b6ac19e11eca60d5e3e5d0764f5).
445445

446446
## <a name="expressRouteDirect"></a>ExpressRoute Direct
447447

@@ -486,4 +486,4 @@ You can associate a single ExpressRoute Direct circuit with multiple ExpressRout
486486

487487
### Does the ExpressRoute service store customer data?
488488

489-
No.
489+
No.

0 commit comments

Comments
 (0)