Skip to content

Commit 3f71f73

Browse files
authored
Merge branch 'main' into license
2 parents 813a3cd + 36d70e2 commit 3f71f73

5 files changed

Lines changed: 13 additions & 15 deletions

File tree

copilot/multiple-account-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.date: 01/30/2025
2020

2121
> [!NOTE]
2222
> - Multiple account access to Copilot is currently disabled for all work and school documents.
23-
> - Multiple account access to Copilot will be enabled in March 2025 at the earliest
23+
> - Multiple account access to Copilot will be enabled in March 2025 at the earliest.
2424
> - In the meantime, there's a policy setting to turn it off ahead of time. For more information, see [Manage multiple account access to Copilot using Cloud Policy](#manage-multiple-account-access-to-copilot-using-cloud-policy).
2525
2626
## What is multiple account access to Copilot?

microsoft-365/admin/setup/setup-business-basic.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ description: "Learn how to set up your Microsoft 365 Business Basic subscription
3838

3939
Check out all of our small business content on [Small business help & learning](https://go.microsoft.com/fwlink/?linkid=2224585).
4040

41-
## Watch: Set up Microsoft 365 Business Basic
42-
43-
> [!VIDEO https://learn-video.azurefd.net/vod/player?id=af2891e6-92fd-4e0a-a502-3dcbdde4d81e]
44-
45-
If you found this video helpful, check out the [complete training series for small businesses and those new to Microsoft 365](../../business-video/index.yml).
46-
4741
## Add an existing domain to your Microsoft 365 Business Basic subscription
4842

4943
When you purchase Microsoft 365 Business Basic, you have the option of using a domain you own, or buying one during the sign-up.
@@ -74,7 +68,7 @@ When you purchase Microsoft 365 Business Basic, you have the option of using a d
7468
If your hosting provider is GoDaddy or another host enabled with [domain connect](/office365/admin/get-help-with-domains/domain-connect), the process is easy and you'll be automatically asked to sign in and let Microsoft authenticate on your behalf.
7569

7670
![On GoDaddy Confirm Access page, select Authorize.](../../media/godaddyauth.png)
77-
71+
7872
## Add users and assign licenses
7973

8074
You can add users in the wizard, but you can also [add users later](../add-users/add-users.md) in the admin center.

microsoft-365/enterprise/setup-guides-for-microsoft-365.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ Advanced deployment guides in the admin center require authentication to a Micro
7676
|[Prepare your environment guide](https://go.microsoft.com/fwlink/?linkid=2223234)|[Prepare your environment guide](https://go.microsoft.com/fwlink/?linkid=2224195)|The **Prepare your environment guide** helps you prepare your organization's environment for Microsoft 365 and Office 365 services. Whatever your goals are, there are tasks you'll need to complete to ensure a successful deployment. To avoid any errors while preparing your environment, you're provided with step-by-step instructions to connect your domain, add users, assign licenses, set up email with Exchange Online, and install or deploy Office apps.|
7777
|[Email setup guide](https://go.microsoft.com/fwlink/?linkid=2223145)|[Email setup guide](https://go.microsoft.com/fwlink/?linkid=2224461)|The **Email setup guide** provides you with the step-by-step guidance needed for configuring Exchange Online for your organization. This guidance includes setting up new email accounts, migrating email, and configuring email protection. For a successful email setup, use this advisor and you'll receive the recommended migration method based on your organization's current mail system, the number of mailboxes being migrated, and how you want to manage users and their access.|
7878
|[Gmail contacts and calendar advisor](https://go.microsoft.com/fwlink/?linkid=2222987)|[Gmail contacts and calendar advisor](https://go.microsoft.com/fwlink/?linkid=2224296)|When you migrate a Gmail user's mailbox to Microsoft 365, email messages are migrated, but contacts and calendar items are not. The **Gmail contacts and calendar advisor** provides steps for importing Google contacts and Google calendar items to Microsoft 365 using import and export methods with Outlook.com, the Outlook client, or PowerShell.|
79-
||[Microsoft 365 setup guide](https://go.microsoft.com/fwlink/?linkid=2224293)|The **Microsoft 365 setup guide** provides you with guidance when setting up productivity tools, security policies, and device management capabilities. With a Microsoft 365 Business Premium or Microsoft 365 for enterprise subscription, you can use this guide to set up and configure your organization's devices.<br>You'll receive guidance and access to resources to enable your cloud services, update devices to the latest supported version of Windows 10, and join devices to Microsoft Entra ID, all in one central location.|
8079
||[Remote work setup guide](https://go.microsoft.com/fwlink/?linkid=2224692)|The **Remote work setup guide** provides organizations with the tips and resources needed to ensure your users can successfully work remotely, your data is secure, and users' credentials are safeguarded.<br>You'll receive guidance to optimize remote workers' device traffic to both Microsoft 365 resources in the cloud and your organization's network, which will reduce the strain on your remote access VPN infrastructure.|
8180
|[Windows 11 and Surface setup guide](https://go.microsoft.com/fwlink/?linkid=2223054)|[Windows 11 and Surface setup guide](https://go.microsoft.com/fwlink/?linkid=2224778)|The **Windows 11 and Surface setup guide** provides information on deployment capabilities, tools, and strategies for deploying Windows 11 for new devices, existing devices, and Surface devices. You’ll gain knowledge on setting up co-management with Intune, using autopilot for customizing the out-of-box experience, and reviewing endpoint security features. This information will provide a starting point for planning your Windows 11 deployment.|
8281
|[Microsoft Edge setup guide](https://go.microsoft.com/fwlink/?linkid=2223317)|[Microsoft Edge setup guide](https://go.microsoft.com/fwlink/?linkid=2224189)|Microsoft Edge has been rebuilt from the ground up to bring you world-class compatibility and performance, the security and privacy you deserve, and new features designed to bring you the best of the web.<br>The **Microsoft Edge setup guide** will help you configure Enterprise Site Discovery to see which sites accessed in your org might need to use IE mode, review and configure important security features, configure privacy policies and compliance policies to meet your org's requirements, and manage web access on your devices. You can download Microsoft Edge to individual devices, or we'll show you how to deploy to multiple users in your org with Group Policy, Configuration Manager, or Microsoft Intune.|

microsoft-365/includes/office-365-u.s.-government-dod-endpoints.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--THIS FILE IS AUTOMATICALLY GENERATED. MANUAL CHANGES WILL BE OVERWRITTEN.-->
22
<!--Please contact the Office 365 Endpoints team with any questions.-->
3-
<!--USGovDoD endpoints version 2025013000-->
4-
<!--File generated 2025-01-30 06:04:15.4913-->
3+
<!--USGovDoD endpoints version 2025013100-->
4+
<!--File generated 2025-01-31 06:05:00.8203-->
55

66
## Exchange Online
77

@@ -11,7 +11,7 @@ ID | Category | ER | Addresses | Ports
1111
4 | Default<BR>Required | Yes | `outlook-dod.office365.us, webmail.apps.mil` | **TCP:** 143, 25, 587, 993, 995
1212
5 | Default<BR>Required | Yes | `attachments-dod.office365-net.us, autodiscover-s-dod.office365.us, autodiscover.<tenant>.mail.onmicrosoft.com, autodiscover.<tenant>.mail.onmicrosoft.us, autodiscover.<tenant>.onmicrosoft.com, autodiscover.<tenant>.onmicrosoft.us` | **TCP:** 443, 80
1313
6 | Allow<BR>Required | Yes | `*.protection.apps.mil, *.protection.office365.us`<BR>`23.103.191.0/24, 23.103.199.0/25, 23.103.204.0/22, 2001:489a:2202::/62, 2001:489a:2202:8::/62, 2001:489a:2202:2000::/63` | **TCP:** 25, 443
14-
36 | Default<BR>Required | No | `*.apps.mil` | **TCP:** 443
14+
36 | Default<BR>Required | No | | **TCP:** 443
1515

1616
## SharePoint Online and OneDrive for Business
1717

@@ -35,7 +35,7 @@ ID | Category | ER | Addresses | Ports
3535
ID | Category | ER | Addresses | Ports
3636
-- | ------------------- | --- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------
3737
11 | Allow<BR>Required | Yes | `*.dod.online.office365.us`<BR>`52.127.80.0/23, 2001:489a:2208:8000::/49` | **TCP:** 443
38-
12 | Default<BR>Required | No | `*.office365.us` | **TCP:** 443, 80
38+
12 | Default<BR>Required | No | `*.apps.mil, *.office365.us` | **TCP:** 443, 80
3939
13 | Allow<BR>Required | Yes | `*.auth.microsoft.us, *.gov.us.microsoftonline.com, dod-graph.microsoft.us, graph.microsoftazure.us, login.microsoftonline.us`<BR>`20.140.232.0/23, 52.126.194.0/23, 2001:489a:3500::/50` | **TCP:** 443
4040
14 | Default<BR>Required | No | `*.msauth.net, *.msauthimages.us, *.msftauth.net, *.msftauthimages.us, clientconfig.microsoftonline-p.net, graph.windows.net, login-us.microsoftonline.com, login.microsoftonline-p.com, login.microsoftonline.com, login.windows.net, loginex.microsoftonline.com, mscrl.microsoft.com, nexus.microsoftonline-p.com, secure.aadcdn.microsoftonline-p.com` | **TCP:** 443
4141
15 | Allow<BR>Required | Yes | `portal.apps.mil, reports.apps.mil, webshell.dodsuite.office365.us, www.ohome.apps.mil`<BR>`52.127.72.42/32, 52.127.76.42/32, 52.180.251.166/32, 52.181.24.112/32, 52.181.160.113/32, 52.182.24.200/32, 52.182.54.237/32` | **TCP:** 443
@@ -49,4 +49,3 @@ ID | Category | ER | Addresses | Ports
4949
29 | Default<BR>Required | No | `dod-mtis.cortana.ai` | **TCP:** 443
5050
30 | Default<BR>Required | No | `*.aadrm.us, *.informationprotection.azure.us` | **TCP:** 443
5151
31 | Default<BR>Required | No | `pf.events.data.microsoft.com, pf.pipe.aria.microsoft.com` | **TCP:** 443, 80
52-
32 | Default<BR>Required | No | `config.apps.mil` | **TCP:** 443

microsoft-365/syntex/solutions/agreements-setup.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ Before creating a workspace for SharePoint Agreements, you need to ensure:
4848

4949
- Download and install the latest [SharePoint Online Management Shell](https://www.microsoft.com/download/details.aspx?id=35588).
5050

51+
- The minimum required version of the SharePoint Online Management Shell is 16.0.25513.12000.
52+
53+
- It is recommended that only the latest version of the SharePoint Online Management Shell is installed.
54+
55+
- Review instructions at [Get Started with the SharePoint Online Management Shell](/powershell/sharepoint/sharepoint-online/connect-sharepoint-online) to validate the version you have installed, uninstall previous versions or update the current version to ensure the pre-requisites have been met.
56+
5157
> [!NOTE]
5258
> You must be a SharePoint Administrator or Global Administrator to create sites through the SharePoint Online Management Shell.
5359
@@ -71,7 +77,7 @@ Before creating a workspace for SharePoint Agreements, you need to ensure:
7177
```
7278

7379
> [!NOTE]
74-
> The Connect-SPOService might require the use of modern authentication to connect. For information about how to add modern authentication flow to your SPO-Connect cmdlet, see the [Connect-SPOService documentation](/powershell/module/sharepoint-online/connect-sposervice).
80+
> The Connect-SPOService cmdlet might require the use of modern authentication to connect. For information about how to add modern authentication flow to your SPO-Connect cmdlet, see the [Connect-SPOService documentation](/powershell/module/sharepoint-online/connect-sposervice).
7581
7682
4. Run the following command to create a new SharePoint site and set it as an Agreements workspace.
7783

0 commit comments

Comments
 (0)