Skip to content

Commit 92ac1c5

Browse files
authored
Merge branch 'main' into 24May-Authorupdate
2 parents d41dae1 + 31d00d5 commit 92ac1c5

File tree

1,372 files changed

+29251
-16423
lines changed

Some content is hidden

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

1,372 files changed

+29251
-16423
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,12 @@
746746
"branch": "main",
747747
"branch_mapping": {}
748748
},
749+
{
750+
"path_to_root": "web-apps-node-iot-hub-data-visualization",
751+
"url": "https://github.com/azure-samples/web-apps-node-iot-hub-data-visualization",
752+
"branch": "master",
753+
"branch_mapping": {}
754+
},
749755
{
750756
"path_to_root": "ImmersiveReaderSdk",
751757
"url": "https://github.com/microsoft/immersive-reader-sdk",

.openpublishing.redirection.active-directory.json

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/develop/active-directory-schema-extensions.md",
5+
"redirect_url": "/azure/active-directory/develop/schema-extensions",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/active-directory/develop/active-directory-optional-claims.md",
10+
"redirect_url": "/azure/active-directory/develop/optional-claims",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path_from_root": "/articles/active-directory/develop/active-directory-jwt-claims-customization.md",
515
"redirect_url": "/azure/active-directory/develop/jwt-claims-customization",
@@ -6580,6 +6590,11 @@
65806590
"redirect_url": "/troubleshoot/azure/active-directory/troubleshoot-adding-apps",
65816591
"redirect_document_id": false
65826592
},
6593+
{
6594+
"source_path_from_root": "/articles/active-directory/manage-apps/scripts/powershell-export-apps-with-expriring-secrets.md",
6595+
"redirect_url": "/troubleshoot/azure/active-directory/manage-apps/scripts/powershell-export-apps-with-expiring-secrets",
6596+
"redirect_document_id": false
6597+
},
65836598
{
65846599
"source_path_from_root": "/articles/active-directory/application-config-add-app-problem-problem-adding-gallery-app.md",
65856600
"redirect_url": "/troubleshoot/azure/active-directory/troubleshoot-adding-apps",
@@ -12479,7 +12494,19 @@
1247912494
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-complete-azure-ad-roles-and-resource-roles-review.md",
1248012495
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-complete-roles-and-resource-roles-review",
1248112496
"redirect_document_id": false
12497+
},
12498+
12499+
{
12500+
"source_path_from_root": "/articles/active-directory-domain-services/concepts-migration-benefits.md",
12501+
"redirect_url": "/azure/active-directory-domain-services/overview",
12502+
"redirect_document_id": false
12503+
},
12504+
12505+
{
12506+
"source_path_from_root": "/articles/active-directory-domain-services/migrate-from-classic-vnet.md",
12507+
"redirect_url": "/azure/active-directory-domain-services/overview",
12508+
"redirect_document_id": false
1248212509
}
1248312510

12484-
]
12511+
]
1248512512
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6150,6 +6150,11 @@
61506150
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
61516151
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
61526152
"redirect_document_id": false
6153+
},
6154+
{
6155+
"source_path_from_root": "/articles/azure-monitor/app/opentelemetry-dotnet-exporter.md",
6156+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
6157+
"redirect_document_id": false
61536158
}
61546159

61556160
]

.openpublishing.redirection.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7859,6 +7859,11 @@
78597859
"redirect_url": "https://azure.microsoft.com/updates/azure-maps-elevation-apis-and-render-v2-dem-tiles-will-be-retired-on-5-may-2023",
78607860
"redirect_document_id": false
78617861
},
7862+
{
7863+
"source_path_from_root": "/articles/azure-maps/power-bi-visual-add-bar-chart-layer.md",
7864+
"redirect_url": "/azure/azure-maps/power-bi-visual-add-3d-column-layer",
7865+
"redirect_document_id": false
7866+
},
78627867
{
78637868
"source_path_from_root": "/articles/azure-portal/resource-group-portal-linked-resources.md",
78647869
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
@@ -14901,8 +14906,8 @@
1490114906
},
1490214907
{
1490314908
"source_path_from_root": "/articles/security/security-storage-overview.md",
14904-
"redirect_url": "/azure/security/fundamentals/storage-overview",
14905-
"redirect_document_id": true
14909+
"redirect_url": "/azure/storage/blobs/security-recommendations",
14910+
"redirect_document_id": false
1490614911
},
1490714912
{
1490814913
"source_path_from_root": "/articles/security/azure-security-technical-capabilities.md",

.whatsnew/.microsoft-identity-platform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"relativeLinkPrefix": "/azure/active-directory/develop"
88
},
99
"inclusionCriteria": {
10-
"omitPullRequestTitles" : true,
10+
"omitPullRequestTitles" : false,
1111
"minAdditionsToFile" : 20,
1212
"maxFilesChanged": 50,
1313
"labels": [

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Microsoft Azure Documentation
22

3-
Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
3+
Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
44

55
## Getting Started
66

articles/active-directory-b2c/custom-email-sendgrid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Custom email verification requires the use of a third-party email provider like
3333

3434
## Create a SendGrid account
3535

36-
If you don't already have one, start by setting up a SendGrid account (Azure customers can unlock 25,000 free emails each month). For setup instructions, see the [Create a SendGrid Account](https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#create-a-sendgrid-account) section of [How to send email using SendGrid with Azure](https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#create-a-twilio-sendgrid-accountcreate-a-twilio-sendgrid-account).
36+
If you don't already have one, start by setting up a SendGrid account. For setup instructions, see the [Create a SendGrid Account](https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#create-a-sendgrid-account) section of [How to send email using SendGrid with Azure](https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#create-a-twilio-sendgrid-accountcreate-a-twilio-sendgrid-account).
3737

3838
Be sure to complete the section in which you [create a SendGrid API key](https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#to-find-your-sendgrid-api-key). Record the API key for use in a later step.
3939

articles/active-directory-b2c/tenant-management-check-tenant-creation-permission.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Anyone who creates an Azure Active Directory B2C (Azure AD B2C) becomes the *Glo
2424

2525
- If you haven't already created your own [Azure AD B2C Tenant](tutorial-create-tenant.md), create one now. You can use an existing Azure AD B2C tenant.
2626

27-
## Restrict non-admin users from creating Azure AD B2C tenants (preview)
27+
## Restrict non-admin users from creating Azure AD B2C tenants
2828

2929
As a *Global Administrator* in an Azure AD B2C tenant, you can restrict non-admin users from creating tenants. To do so, use the following steps:
3030

@@ -44,7 +44,7 @@ As a *Global Administrator* in an Azure AD B2C tenant, you can restrict non-admi
4444

4545
1. At the top of the **User Settings** page, select **Save**.
4646

47-
## Check tenant creation permission (preview)
47+
## Check tenant creation permission
4848

4949
Before you create an Azure AD B2C tenant, make sure that you've the permission to do so. Use these steps to check that you've the permission to create a tenant:
5050

@@ -66,4 +66,4 @@ Before you create an Azure AD B2C tenant, make sure that you've the permission t
6666
## Next steps
6767

6868
- [Read tenant name and ID](tenant-management-read-tenant-name.md)
69-
- [Clean up resources and delete tenant](tutorial-delete-tenant.md)
69+
- [Clean up resources and delete tenant](tutorial-delete-tenant.md)

articles/active-directory-domain-services/TOC.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@
5757
href: concepts-custom-attributes.md
5858
- name: Virtual network considerations
5959
href: network-considerations.md
60-
- name: Classic deployment migration benefits
61-
href: concepts-migration-benefits.md
6260
- name: What is Azure Active Directory?
6361
href: ../active-directory/fundamentals/active-directory-whatis.md?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
6462
- name: Azure Active Directory architecture
@@ -87,8 +85,6 @@
8785
href: notifications.md
8886
- name: Delete a managed domain
8987
href: delete-aadds.md
90-
- name: Migrate from a Classic deployment
91-
href: migrate-from-classic-vnet.md
9288
- name: Change SKU
9389
href: change-sku.md
9490
- name: Retrieve data

articles/active-directory-domain-services/concepts-migration-benefits.md

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)