Skip to content

Commit

Permalink
Merge pull request #26182 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
publish main to live 10:30 AM 8/7
  • Loading branch information
shdyas authored Aug 7, 2024
2 parents b1f201e + 29e2fba commit cc09c0d
Show file tree
Hide file tree
Showing 11 changed files with 122 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .acrolinx-config.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{:changed-files-limit 60
:allowed-branchname-matches ["main" "release-.*"]
:allowed-filename-matches ["microsoft-365/" "copilot/" "defender/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
:allowed-filename-matches ["microsoft-365/" "copilot/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]

:use-gh-statuses true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Check out all of our small business content on [Small business help & learning](
> [!NOTE]
> If your organization uses Microsoft 365 operated by 21Vianet in China, see [How to buy a domain for Microsoft 365 operated by 21Vianet](#how-to-buy-a-domain-for-microsoft-365-operated-by-21vianet).
*To Add, modify or remove domains you **must** be a **Global Administrator** of a [business or enterprise plan](https://products.office.com/business/office). These changes affect the whole tenant. *Customized administrators* or *regular users* won't be able to make these changes.*
*To Add, modify or remove domains you **must** be a **Domain Name Administrator** of a [business or enterprise plan](https://products.office.com/business/office). These changes affect the whole tenant. *Customized administrators* or *regular users* can't make these changes.*

**[Check the Domains FAQ](../setup/domains-faq.yml)** if you don't find what you're looking for.

Expand Down Expand Up @@ -77,10 +77,10 @@ You can choose from the following top-level domains for your domain.
> When you select **Buy domain**, you may be redirected to your Microsoft partner's website if the tenant is purchased/managed through a Microsoft partner.
## Domain Privacy
We offer a free Domain Privacy Subscription with the purchase of a domain. This keeps your contact information attached to the registration of your domain with ICANN private. [Learn more.](https://whois.icann.org/en/privacy-and-proxy-services)
We offer a free Domain Privacy Subscription with the purchase of a domain that keeps your contact information attached to the registration of your domain with ICANN private. [Learn more.](https://whois.icann.org/en/privacy-and-proxy-services)

## Buy a domain from another domain registrar
If you want to buy a domain from a domain registrar other than [GoDaddy](https://www.godaddy.com), we recommend you use one below that supports automatic setup (Domain Connect).
If you want to buy a domain from a domain registrar other than [GoDaddy](https://www.godaddy.com), we recommend you use one listed that supports automatic setup (Domain Connect).

- [Aruba](https://hosting.aruba.it/en/home.aspx)
- [1&1 IONOS](https://www.1and1.com/)
Expand All @@ -104,7 +104,7 @@ Request the transfer at the registrar that you want to move your domain to. Look

## How to buy a domain for Microsoft 365 operated by 21Vianet

If you don't already have your own domain, you can easily buy one online at a domain name registrar, domain reseller, or even at your current Internet provider. You get a domain name when you sign up for Microsoft 365 operated by 21Vianet, for example, contoso.partner.onmschina.cn. But you may want to use a custom domain name, like fourthcoffee.com.
If you don't already have your own domain, you can easily buy one online at a domain name registrar, domain reseller, or even at your current Internet provider. You get a domain name when you sign up for Microsoft 365 operated by 21Vianet, for example, contoso.partner.onmschina.cn. But you might want to use a custom domain name, like fourthcoffee.com.

To set up a domain in Microsoft 365, you must own a domain and change some of the DNS records for your domain.

Expand Down
34 changes: 17 additions & 17 deletions microsoft-365/admin/setup/add-domain.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Check out [Microsoft 365 small business help](https://go.microsoft.com/fwlink/?l

## Before you begin

To add, modify, or remove domains, you **must** be a **Domain Name Administrator** or **Global Administrator** of a [business or enterprise plan](https://products.office.com/business/office). These changes affect the whole tenant; *Customized administrators* or *regular users* won't be able to make these changes.
To add, modify, or remove domains, you **must** be a **Domain Name Administrator** of a [business or enterprise plan](https://products.office.com/business/office). These changes affect the whole tenant; *Customized administrators* or *regular users* can't make these changes.

> [!TIP]
> If you need help with the steps in this topic, consider [working with a Microsoft small business specialist](https://go.microsoft.com/fwlink/?linkid=2186871). With Business Assist, you and your employees get around-the-clock access to small business specialists as you grow your business, from onboarding to everyday use.
Expand All @@ -57,7 +57,7 @@ Check out this video and others on our [YouTube channel](https://go.microsoft.co

> [!VIDEO https://www.microsoft.com/videoplayer/embed/RE4dN8c?autoplay=false]
Your company might need multiple domain names for different purposes. For example, you might want to add a different spelling of your company name because customers are already using it and their communications have failed to reach you.
Your company might need multiple domain names for different purposes. For example, you might want to add a different spelling of your company name because customers are already using it and their communications failed to reach you.

> Where possible, we recommend that your organization use a custom domain name, as it can enhance your email's appearance and improve it's reputation.
Expand All @@ -69,7 +69,7 @@ Your company might need multiple domain names for different purposes. For exampl
1. Enter the new domain name that you want to add, and then select **Next**.
1. Sign in to your domain registrar, and then select **Next**.
1. Choose the services for your new domain.
1. Select **Next** > **Authorize** > **Next**, and then **Finish**. Your new domain has been added.
1. Select **Next** > **Authorize** > **Next**, and then **Finish**. Your new domain is added.

## Add a domain

Expand All @@ -95,28 +95,28 @@ Follow these steps to add, set up, or continue setting up a domain.

5. Choose how you want to verify that you own the domain.

1. If your domain registrar uses [Domain Connect](#domain-connect-registrars-integrating-with-microsoft-365), Microsoft [will set up your records automatically](../get-help-with-domains/domain-connect.md) by having you sign in to your registrar and confirm the connection to Microsoft 365. You'll be returned to the admin center and Microsoft will then automatically verify your domain.
2. You can use a TXT record to verify your domain. Select this and select **Next** to see instructions for how to add this DNS record to your registrar's website. This can take up to 30 minutes to verify after you've added the record.
3. You can add a text file to your domain's website. Select and download the .txt file from the setup wizard, then upload the file to your website's top level folder. The path to the file should look similar to: `http://mydomain.com/ms39978200.txt`. We'll confirm you own the domain by finding the file on your website.
1. If your domain registrar uses [Domain Connect](#domain-connect-registrars-integrating-with-microsoft-365), Microsoft [will set up your records automatically](../get-help-with-domains/domain-connect.md) by having you sign in to your registrar and confirm the connection to Microsoft 365. You are returned to the admin center and Microsoft automatically verifies your domain.
2. You can use a TXT record to verify your domain. Select this and select **Next** to see instructions for how to add this DNS record to your registrar's website. It can take up to 30 minutes to verify after you add the record.
3. You can add a text file to your domain's website. Select and download the .txt file from the setup wizard, then upload the file to your website's top level folder. The path to the file should look similar to: `http://mydomain.com/ms39978200.txt`. We confirm you own the domain by finding the file on your website.

6. Choose how you want to make the DNS changes required for Microsoft to use your domain.

1. Choose **Add the DNS records for me** if your registrar supports [Domain Connect](#domain-connect-registrars-integrating-with-microsoft-365), and Microsoft [will set up your records automatically](../get-help-with-domains/domain-connect.md) by having you sign in to your registrar and confirm the connection to Microsoft 365.
2. Choose **I'll add the DNS records myself** if you want to attach only specific Microsoft 365 services to your domain or if you want to skip this for now and do this later. **Choose this option if you know exactly what you're doing.**
2. Choose **I'll add the DNS records myself** if you want to attach only specific Microsoft 365 services to your domain or if you want to skip it for now and do this later. **Choose this option if you know exactly what you're doing.**

7. If you chose to *add DNS records yourself*, select **Next** and you'll see a page with all the records that you need to add to your registrars website to set up your domain.
7. If you chose to *add DNS records yourself*, select **Next** and you see a page with all the records that you need to add to your registrars website to set up your domain.

If the portal doesn't recognize your registrar, you can [follow these general instructions.](../get-help-with-domains/create-dns-records-at-any-dns-hosting-provider.md)

If you don't know the DNS hosting provider or domain registrar for your domain, see [Find your domain registrar or DNS hosting provider](../get-help-with-domains/find-your-domain-registrar.md).

If you want to wait for later, either unselect all the services and click **Continue**, or in the previous domain connection step choose **More Options** and select **Skip this for now**.
If you want to wait for later, either unselect all the services and select **Continue**, or in the previous domain connection step choose **More Options** and select **Skip this for now**.

8. Select **Finish** - you're done!

## Add or edit custom DNS records

Follow the steps below to add a custom record for a website or 3rd party service.
Follow these steps to add a custom record for a website or third party service.

1. Sign in to the <a href="https://go.microsoft.com/fwlink/p/?linkid=2024339" target="_blank">Microsoft 365 admin center</a>.

Expand All @@ -134,7 +134,7 @@ Follow the steps below to add a custom record for a website or 3rd party service

[Domain Connect](https://www.domainconnect.org/) enabled registrars let you add your domain to Microsoft 365 in a three-step process that takes minutes.

In the wizard, we'll just confirm that you own the domain, and then automatically set up your domain's records, so email comes to Microsoft 365 and other Microsoft 365 services, like Teams, work with your domain.
In the wizard, we confirm that you own the domain, and then automatically set up your domain's records, so email comes to Microsoft 365 and other Microsoft 365 services, like Teams, work with your domain.

> [!NOTE]
> Make sure you disable any popup blockers in your browser before you start the setup wizard.
Expand All @@ -155,16 +155,16 @@ In the wizard, we'll just confirm that you own the domain, and then automaticall

### What happens to my email and website?

After you finish setup, the MX record for your domain is updated to point to Microsoft 365 and all email for your domain will start coming to Microsoft 365. Make sure you've added users and set up mailboxes in Microsoft 365 for everyone who gets email on your domain!
After you finish setup, the MX record for your domain is updated to point to Microsoft 365 and all email for your domain will start coming to Microsoft 365. Make sure you add users and set up mailboxes in Microsoft 365 for everyone who gets email on your domain!

If you have a website that you use with your business, it will keep working where it is. The Domain Connect setup steps don't affect your website.
If you have a website that you use with your business, it keeps working where it is. The Domain Connect setup steps don't affect your website.

### Add an onmicrosoft.com domain

Each Microsoft 365 organization can have up to five onmicrosoft.com domains.

> [!NOTE]
> You must be a Global admin or a Domain Name admin to add a domain.
> You must be a Domain Name admin to add a domain.
> Creating an additional .onmicrosoft domain and using it as your default will not do a rename for SharePoint Online. To make changes to your .onmicrosoft SharePoint domain you would need to use the [SharePoint domain rename preview](/sharepoint/change-your-sharepoint-domain-name) (currently available to any tenant with less than 10,000 sites).
> If you're using Microsoft 365 mail services, removal of your initial .onmicrosoft domain is not supported.
Expand All @@ -189,13 +189,13 @@ To add an onmicrosoft.com domain:
> [!NOTE]
> Make sure to verify the spelling and accuracy of the domain name you entered. You are limited to five onmicrosoft.com domains, and currently they cannot be deleted once they are created.
5. Select **Add domain**. When successfully added, you will see a message stating this.
5. Select **Add domain**. When successfully added, you'll see a message stating this.

![Screenshot of domain added successfully.](../../media/domain-added.png)

You can set any domain you own as your default domain.
You can set any domain you own as your default domain.

For more details on how to add an onmicrosoft.com domain, see [Add or replace your onmicrosoft.com domain](add-or-replace-your-onmicrosoftcom-domain.md).
For more information on how to add an onmicrosoft.com domain, see [Add or replace your onmicrosoft.com domain](add-or-replace-your-onmicrosoftcom-domain.md).

## Related content

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ It serves as a default email routing address for your Microsoft 365 environment.

You can change your fallback domain in the Microsoft 365 admin center. Common reasons customers change their fallback domain include:

- Not knowing the company name to use when they first signed up for Microsoft 365. Now that they know the company name, they want their users to have login account names that are appropriate.
- They want to change how their SharePoint URLs look like when they create a new site. SharePoint URLs in your Microsoft 365 environment are created based on your fallback domain name. If you did not use the correct company name when you first signed up, your SharePoint URLs for your sites will continue to use that name when you create new SharePoint sites.
- Not knowing the company name to use when they first signed up for Microsoft 365. Now that they know the company name, they want their users to have sign in account names that are appropriate.
- They want to change how their SharePoint URLs look like when they create a new site. SharePoint URLs in your Microsoft 365 environment are created based on your fallback domain name. If you didn't use the correct company name when you first signed up, your SharePoint URLs for your sites continue to use that name when you create new SharePoint sites.


While you can add additional onmicrosoft.com domains, only one onmicrosoft.com domain can be used as your fallback domain. The steps in this article describe how to:
While you can add more onmicrosoft.com domains, only one onmicrosoft.com domain can be used as your fallback domain. The steps in this article describe how to:
- Create a new onmicrosoft.com domain
- Assign it as your fallback domain

Expand All @@ -62,7 +62,7 @@ While you can add additional onmicrosoft.com domains, only one onmicrosoft.com d
## Before you begin

To add, modify, or remove domains, you **must** be a **Domain Name Administrator** of a [business or enterprise plan](https://products.office.com/business/office). These changes affect the whole tenant; *Customized administrators* or *regular users* won't be able to make these changes.
To add, modify, or remove domains, you **must** be a **Domain Name Administrator** of a [business or enterprise plan](https://products.office.com/business/office). These changes affect the whole tenant; *Customized administrators* or *regular users* aren't able to make these changes.


## Add a new onmicrosoft.com domain
Expand All @@ -83,7 +83,7 @@ To add, modify, or remove domains, you **must** be a **Domain Name Administrator
> [!NOTE]
> Make sure to verify the spelling and accuracy of the domain name you entered. You are limited to five onmicrosoft.com domains, and currently they cannot be deleted once they are created.
5. Select **Add domain**. When successfully added, you will see a message stating this.
5. Select **Add domain**. When successfully added, you'll see a message stating this.

![Screenshot of domain added successfully.](../../media/domain-added.png)

Expand All @@ -95,19 +95,19 @@ To add, modify, or remove domains, you **must** be a **Domain Name Administrator
> [!NOTE]
> Before changing your fallback domain to a new onmicrosoft.com domain, you may want to consider changing your onmicrosoft.com SharePoint domain. Creating an additional onmicrosoft domain and using it as your fallback domain will not do a rename for SharePoint Online. Your existing SharePoint and OneDrive URLs will remain the same. You are able to change your.onmicrosoft SharePoint domain through the PowerShell steps provided in [SharePoint domain rename preview](/sharepoint/change-your-sharepoint-domain-name) (currently available to any tenant with less than 10,000 sites).
After you have created your new onmicrosoft.com domain, do the following to change it to your fallback domain.
After you create your new onmicrosoft.com domain, do the following to change it to your fallback domain.

1. In the Microsoft 365 admin center, select **Settings**, and then select **Domains**.

2. Select the new onmicrosoft.com domain you had created.
2. Select the new onmicrosoft.com domain that you created.

![Select a domains.](../../media/onmicrosoft-domains-added.png)

3. On the domain's property page, select **Make fallback domain**.

![Screenshot of selecting a new fallback domain.](../../media/new-fallback.png)

4. A message will display on the page stating that your fallback domain has changed to the new domain.
4. A message displays on the page stating that your fallback domain has changed to the new domain.

![Successfully added new fallback domain.](../../media/fallback-success.png)

Expand Down
2 changes: 2 additions & 0 deletions microsoft-365/enterprise/sync-users-multi-tenant-orgs.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ This procedure updates the *MTO_Sync_\<TenantID\>* synchronization configuration

Calendar sharing allows users in each multitenant organization (MTO) tenant to view free/busy (time only) calendar availability information.

> [!NOTE]
> Calendar sharing via Multitenant collaboration portal is currently not available in Microsoft 365 GCC, GCC High, DoD, or Microsoft 365 China (operated by 21Vianet).
> [!IMPORTANT]
> Microsoft recommends that you use roles with the fewest permissions. Using lower permissioned accounts helps improve security for your organization. Global Administrator is a highly privileged role that should be limited to emergency scenarios when you can't use an existing role.
Expand Down
Loading

0 comments on commit cc09c0d

Please sign in to comment.