Skip to content

Commit fafcf5b

Browse files
committed
Merge branch 'main' of github.com:MicrosoftDocs/azure-docs-pr into remove-opt-in
2 parents 375a8d0 + 09addbb commit fafcf5b

File tree

969 files changed

+14493
-8292
lines changed

Some content is hidden

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

969 files changed

+14493
-8292
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
{
414414
"path_to_root": "azureml-examples-vj",
415415
"url": "https://github.com/azure/azureml-examples",
416-
"branch": "vijetajo-patch-2",
416+
"branch": "main",
417417
"branch_mapping": {}
418418
},
419419
{

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4575,6 +4575,11 @@
45754575
"redirect_url": "/azure/active-directory/reports-monitoring/howto-access-activity-logs",
45764576
"redirect_document_id": true
45774577
},
4578+
{
4579+
"source_path_from_root": "/articles/active-directory/reports-monitoring/overview-sign-in-diagnostics.md",
4580+
"redirect_url": "/azure/active-directory/reports-monitoring/howto-use-sign-in-diagnostics",
4581+
"redirect_document_id": true
4582+
},
45784583
{
45794584
"source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-missing-data-download.md",
45804585
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22203,6 +22203,16 @@
2220322203
"redirect_url": "/azure/active-directory/develop/zero-trust-for-developers",
2220422204
"redirect_document_id": false
2220522205
},
22206+
{
22207+
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-protocols.md",
22208+
"redirect_url": "/azure/active-directory/develop/v2-protocols",
22209+
"redirect_document_id": false
22210+
},
22211+
{
22212+
"source_path_from_root": "/articles/active-directory/develop/msal-net-aad-b2c-considerations.md",
22213+
"redirect_url": "/azure/active-directory/develop/msal-net-b2c-considerations",
22214+
"redirect_document_id": false
22215+
},
2220622216
{
2220722217
"source_path_from_root": "/articles/active-directory/develop/active-directory-how-applications-are-added.md",
2220822218
"redirect_url": "/azure/active-directory/develop/how-applications-are-added",

.openpublishing.redirection.virtual-desktop.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@
189189
"source_path_from_root": "/articles/virtual-desktop/fslogix-office-app-rule-editor.md",
190190
"redirect_url": "/azure/virtual-desktop/install-office-on-wvd-master-image",
191191
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/virtual-desktop/app-attach-glossary.md",
195+
"redirect_url": "/azure/virtual-desktop/what-is-app-attach",
196+
"redirect_document_id": false
192197
}
193198
]
194199
}

articles/active-directory-domain-services/join-rhel-linux-vm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,21 +311,21 @@ To verify that the VM has been successfully joined to the managed domain, start
311311
1. Create a new SSH connection from your console. Use a domain account that belongs to the managed domain using the `ssh -l` command, such as `[email protected]` and then enter the address of your VM, such as *rhel.aaddscontoso.com*. If you use the Azure Cloud Shell, use the public IP address of the VM rather than the internal DNS name.
312312

313313
```bash
314-
sudo ssh -l [email protected] rhel.aaddscontoso.com
314+
ssh -l [email protected] rhel.aaddscontoso.com
315315
```
316316

317317
1. When you've successfully connected to the VM, verify that the home directory was initialized correctly:
318318
319319
```bash
320-
sudo pwd
320+
pwd
321321
```
322322
323323
You should be in the */home* directory with your own directory that matches the user account.
324324
325325
1. Now check that the group memberships are being resolved correctly:
326326
327327
```bash
328-
sudo id
328+
id
329329
```
330330
331331
You should see your group memberships from the managed domain.

articles/active-directory/authentication/howto-authentication-passwordless-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ For a full list of endpoints needed to use Microsoft online products, see [Offic
106106
To check if the Windows 10 client device has the right domain join type, use the following command:
107107

108108
```console
109-
Dsregcmd/status
109+
Dsregcmd /status
110110
```
111111

112112
The following sample output shows that the device is Azure AD joined as *AzureADJoined* is set to *YES*:

articles/active-directory/authentication/howto-authentication-passwordless-phone.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,17 @@ Users can register for passwordless phone sign-in directly within the Microsoft
8787
6. Once signed-in, continue following the additional steps to set up phone sign-in.
8888

8989
### Guided registration with My Sign-ins
90+
> [!NOTE]
91+
> Users will only be able to register Microsoft Authenticator via combined registration if the Microsoft Authenticator authentication mode is to Any or Push.
92+
9093
To register the Microsoft Authenticator app, follow these steps:
9194

9295
1. Browse to [https://aka.ms/mysecurityinfo](https://aka.ms/mysecurityinfo).
9396
1. Sign in, then select **Add method** > **Authenticator app** > **Add** to add Microsoft Authenticator.
9497
1. Follow the instructions to install and configure the Microsoft Authenticator app on your device.
9598
1. Select **Done** to complete Microsoft Authenticator configuration.
9699

97-
### Enable phone sign-in
100+
#### Enable phone sign-in
98101

99102
After users registered themselves for the Microsoft Authenticator app, they need to enable phone sign-in:
100103

5.28 KB
Loading

articles/active-directory/azuread-dev/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
- name: Add app roles in your application
127127
href: ../develop/howto-add-app-roles-in-azure-ad-apps.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
128128
- name: Branding guidelines
129-
href: ../develop/howto-add-branding-in-azure-ad-apps.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
129+
href: /azure/active-directory/develop/howto-add-branding-in-apps
130130
- name: Terms of Service and Privacy Statement
131131
href: ../develop/howto-add-terms-of-service-privacy-statement.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
132132
- name: Bring an app to market

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,13 @@
2727
href: onboard-enable-controller-after-onboarding.md
2828
- name: Add an account/ subscription/ project after onboarding is complete
2929
href: onboard-add-account-after-onboarding.md
30-
- name: View risk metrics in your authorization system
30+
- name: View information about your Authorization Systems
3131
expanded: false
3232
items:
3333
- name: View key statistics and data about your authorization system
3434
href: ui-dashboard.md
3535
- name: View data about the activity in your authorization system
3636
href: product-dashboard.md
37-
- name: View information about your Authorization Systems
38-
expanded: false
39-
items:
4037
- name: View and configure settings for data collection
4138
href: product-data-sources.md
4239
- name: View current billable resources in your authorization system

0 commit comments

Comments
 (0)