Skip to content

Commit d945b78

Browse files
author
David Curwin
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into image-scan-may24-2023
2 parents 810f115 + 4b7cc08 commit d945b78

File tree

861 files changed

+18960
-11983
lines changed

Some content is hidden

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

861 files changed

+18960
-11983
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: 15 additions & 0 deletions
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",

.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
]

.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/network-considerations.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ If needed, you can [create the required network security group and rules using A
141141

142142
For Outbound connectivity, you can either keep **AllowVnetOutbound** and **AllowInternetOutBound** or restrict Outbound traffic by using ServiceTags listed in the following table. The ServiceTag for AzureUpdateDelivery must be added via [PowerShell](powershell-create-instance.md).
143143

144-
Filtered Outbound traffic is not supported on Classic deployments.
145-
146144

147145
| Outbound port number | Protocol | Source | Destination | Action | Required | Purpose |
148146
|:--------------------:|:--------:|:------:|:-------------:|:------:|:--------:|:-------:|
@@ -159,13 +157,7 @@ Filtered Outbound traffic is not supported on Classic deployments.
159157

160158
* Used to perform management tasks using PowerShell remoting in your managed domain.
161159
* Without access to this port, your managed domain can't be updated, configured, backed-up, or monitored.
162-
* For managed domains that use a Resource Manager-based virtual network, you can restrict inbound access to this port to the *AzureActiveDirectoryDomainServices* service tag.
163-
* For legacy managed domains using a Classic-based virtual network, you can restrict inbound access to this port to the following source IP addresses: *52.180.183.8*, *23.101.0.70*, *52.225.184.198*, *52.179.126.223*, *13.74.249.156*, *52.187.117.83*, *52.161.13.95*, *104.40.156.18*, and *104.40.87.209*.
164-
165-
> [!NOTE]
166-
> In 2017, Azure AD Domain Services became available to host in an Azure Resource Manager network. Since then, we have been able to build a more secure service using the Azure Resource Manager's modern capabilities. Because Azure Resource Manager deployments fully replace classic deployments, Azure AD DS classic virtual network deployments will be retired on March 1, 2023.
167-
>
168-
> For more information, see the [official deprecation notice](https://azure.microsoft.com/updates/we-are-retiring-azure-ad-domain-services-classic-vnet-support-on-march-1-2023/)
160+
* You can restrict inbound access to this port to the *AzureActiveDirectoryDomainServices* service tag.
169161

170162
### Port 3389 - management using remote desktop
171163

articles/active-directory-domain-services/tutorial-create-replica-set.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: domain-services
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 06/16/2022
12+
ms.date: 05/25/2023
1313
ms.author: justinha
1414

1515
#Customer intent: As an identity administrator, I want to create and use replica sets in Azure Active Directory Domain Services to provide resiliency or geographical distributed managed domain data.
@@ -42,7 +42,7 @@ To complete this tutorial, you need the following resources and privileges:
4242
* If needed, [create and configure an Azure Active Directory Domain Services managed domain][tutorial-create-instance].
4343

4444
> [!IMPORTANT]
45-
> Managed domains created using the Classic deployment model can't use replica sets. You also need to use a minimum of *Enterprise* SKU for your managed domain. If needed, [change the SKU for a managed domain][howto-change-sku].
45+
> You need to use a minimum of *Enterprise* SKU for your managed domain to support replica sets. If needed, [change the SKU for a managed domain][howto-change-sku].
4646
4747
## Sign in to the Azure portal
4848

articles/active-directory-domain-services/use-azure-monitor-workbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ To access the workbook template for the security overview report, complete the f
5454
1. Select your managed domain, such as *aaddscontoso.com*
5555
1. From the menu on the left-hand side, choose **Monitoring > Workbooks**
5656

57-
![Screenshot that hightlights where to select the Security Overview Report and the Account Activity Report.](./media/use-azure-monitor-workbooks/select-workbooks-in-azure-portal.png)
57+
![Screenshot that highlights where to select the Security Overview Report and the Account Activity Report.](./media/use-azure-monitor-workbooks/select-workbooks-in-azure-portal.png)
5858

5959
1. Choose the **Security Overview Report**.
6060
1. From the drop-down menus at the top of the workbook, select your Azure subscription and then an Azure Monitor workspace.

0 commit comments

Comments
 (0)