Skip to content

Commit 6c4bfc9

Browse files
authored
Merge pull request #25572 from microsoftgraph/main
Merge to publish.
2 parents 08210e1 + 9a52b9d commit 6c4bfc9

File tree

9 files changed

+305
-291
lines changed

9 files changed

+305
-291
lines changed

.github/pull_request_template.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
**Instructions:** _Add any supporting information, such as a description of the PR changes, here._
2-
3-
1+
> [!IMPORTANT]
2+
> Required for API changes:
3+
> - Link to API.md file: *ADD LINK HERE*
4+
> - Link to **PR** for public-facing schema changes (schema-Prod-beta/v1.0.csdl): *ADD LINK HERE*
45
6+
---
7+
Add other supporting information, such as a description of the PR changes:
58

9+
*ADD INFORMATION HERE*
610

711
---
8-
> [!NOTE]
12+
> [!IMPORTANT]
913
> The following guidance is for Microsoft employees only. Community contributors can ignore this message; our content team will manage the status.
1014
<details><summary><i>After you've created your PR</i>, expand this section for tips and additional instructions.</summary>
1115
1216

1317
- **do not merge** is the default PR status and is automatically added to all open PRs that don't have the **ready to merge** label.
14-
- Add the **ready for content review** label to start a review. Your PR won't be reviewed until you add this label.
18+
- Add the **ready for content review** label to start a review. Only PRs that have met the [minimum requirements for content review](https://dev.azure.com/msazure/One/_wiki/wikis/Microsoft%20Graph%20Partners/707655/Minimum-requirements-for-content-review) and have this label are reviewed.
1519
- If your content reviewer requests changes, review the feedback and address accordingly as soon as possible to keep your pull request moving forward. After you address the feedback, remove the **changes requested** label, add the **review feedback addressed** label, and select the **Re-request review** icon next to the content reviewer's alias. If you can't add labels, add a comment with `#feedback-addressed` to the pull request.
1620
- After the content review is complete, your reviewer will add the **content review complete** label. When the updates in this PR are ready for external customers to use, replace the **do not merge** label with **ready to merge** and the PR will be merged within 24 working hours.
1721
- Pull requests that are inactive for more than 6 weeks will be automatically closed. Before that, you receive reminders at 2 weeks, 4 weeks, and 6 weeks. If you still need the PR, you can reopen or recreate the request.

api-reference/beta/api/domain-verify.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ Validate the ownership of a domain.
1818
> **Important:**
1919
> Only applies to an unverified domain. For an unverified domain, the isVerified property of the [domain](../resources/domain.md) is false.
2020
21+
> [!NOTE]
22+
> Verifying a domain through Microsoft Graph doesn't configure the domain for use with Office 365 services like Exchange. Fully configuring the domain to work with Microsoft 365 products might require extra steps. For more information, see [Microsoft 365 admin setup](/microsoft-365/admin/setup/add-domain).
23+
2124
[!INCLUDE [national-cloud-support](../../includes/all-clouds.md)]
2225

2326
## Permissions

api-reference/beta/resources/domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Namespace: microsoft.graph
1515

1616
Represents a domain associated with the tenant.
1717

18-
Use domain operations to associate domains to a tenant, verify domain ownership, and configure supported services. Domain operations enable registrars to automate domain association for services such as Microsoft 365. For example, as part of domain sign-up, a registrar can enable a vanity domain for email, websites, authentication, etc.
18+
Use domain operations to associate domains to a tenant, verify domain ownership, and configure supported services. Use domain operations to associate domains to a tenant, verify domain ownership, and configure supported services. Verifying a domain through Microsoft Graph doesn't configure the domain for use with Office 365 services like Exchange. Fully configuring the domain to work with Microsoft 365 products might require extra steps. For more information, see [Microsoft 365 admin setup](/microsoft-365/admin/setup/add-domain).
1919

2020
To associate a domain with a tenant:
2121

api-reference/beta/toc/identity-and-access/toc.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,14 @@ items:
657657
href: ../../api/certificateauthorityasentity-update.md
658658
- name: Delete
659659
href: ../../api/certificateauthorityasentity-delete.md
660+
- name: Ux setting
661+
items:
662+
- name: Ux setting
663+
href: ../../resources/uxsetting.md
664+
- name: Get
665+
href: ../../api/uxsetting-get.md
666+
- name: Update
667+
href: ../../api/uxsetting-update.md
660668
- name: Governance
661669
displayName: Identity Governance, Access reviews, Entitlement Management, Terms of Use, Privileged Identity Management, Microsoft Entra ID Governance
662670
items:

api-reference/v1.0/api/domain-verify.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ Validates the ownership of the domain.
1616
> **Important:**
1717
> Only applies to an unverified domain. For an unverified domain, the isVerified property of the [domain](../resources/domain.md) is false.
1818
19+
> [!NOTE]
20+
> Verifying a domain through Microsoft Graph doesn't configure the domain for use with Office 365 services like Exchange. Fully configuring the domain to work with Microsoft 365 products might require extra steps. For more information, see [Microsoft 365 admin setup](/microsoft-365/admin/setup/add-domain).
21+
1922
[!INCLUDE [national-cloud-support](../../includes/all-clouds.md)]
2023

2124
## Permissions

api-reference/v1.0/resources/domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
1313

1414
Represents a domain associated with the tenant.
1515

16-
Use domain operations to associate domains to a tenant, verify domain ownership, and configure supported services. Domain operations enable registrars to automate domain association for services such as Microsoft 365. For example, as part of domain sign-up, a registrar can enable a vanity domain for email, websites, authentication, etc.
16+
Use domain operations to associate domains to a tenant, verify domain ownership, and configure supported services. Verifying a domain through Microsoft Graph doesn't configure the domain for use with Office 365 services like Exchange. Fully configuring the domain to work with Microsoft 365 products might require extra steps. For more information, see [Microsoft 365 admin setup](/microsoft-365/admin/setup/add-domain).
1717

1818
To associate a domain with a tenant:
1919

Lines changed: 7 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)