Merge pull request #7028 from dksimpson/dks-us1737442-1

Rebranding changes for Office 365

Author: PRMerger19

docs/cross-platform/cross-platform-mobile-development-in-visual-studio.md

@@ -13,7 +13,7 @@ ms.workload:
 ---
 # Cross-platform mobile development in Visual Studio
 
-You can build apps for Android, iOS, and Windows devices by using Visual Studio.  As you design your app, use tools in Visual Studio to easily add connected services such as Office 365, Azure App Service, and Application Insights.
+You can build apps for Android, iOS, and Windows devices by using Visual Studio.  As you design your app, use tools in Visual Studio to easily add connected services such as Microsoft 365, Azure App Service, and Application Insights.
 
 Build your apps by using C# and the .NET Framework, HTML and JavaScript, or C++. Share code, strings, images, and in some cases even the user interface.
 
@@ -162,6 +162,6 @@ With Visual Studio Tools for Xamarin, you can target Android, iOS, and Windows i
 
 ## See also
 
-- [Add Office 365 APIs to a Visual Studio project](/office/developer-program/office-365-developer-program)
+- [Add Microsoft 365 APIs to a Visual Studio project](/office/developer-program/office-365-developer-program)
 - [Azure App Services - Mobile Apps](https://azure.microsoft.com/services/app-service/mobile/)
 - [Visual Studio App Center](/appcenter)

docs/data-tools/connect-to-data-in-an-access-database-windows-forms.md

@@ -23,7 +23,7 @@ To use these procedures, you need a Windows Forms or WPF project and either an A
 
 ## Create a dataset for an .accdb file
 
-Connect to databases created with Office 365, Access 2013, Access 2010, or Access 2007 by using the following procedure.
+Connect to databases created with Microsoft 365, Access 2013, Access 2010, or Access 2007 by using the following procedure.
 
 1. Open a Windows Forms or WPF application project in Visual Studio.
 

docs/get-started/csharp/tutorial-aspnet-core-ef-step-01.md

@@ -79,7 +79,7 @@ Note that for most of the project templates you can also choose to enable Docker
 
 - No Authentication.
 - Individual User Accounts. These are stored in a local or Azure-based database.
-- Work or School Accounts. This option uses Active Directory, Azure AD, or Office 365 for authentication.
+- Work or School Accounts. This option uses Active Directory, Azure AD, or Microsoft 365 for authentication.
 - Windows Authentication. Suitable for intranet applications.
 
 Select the standard Web Application template with No Authentication and click **Create**.

docs/ide/advanced-feature-overview.md

@@ -84,7 +84,7 @@ You can use Visual Studio to build apps and games for macOS, Linux, and Windows,
 
 ## Connect to databases
 
-**Server Explorer** helps you browse and manage SQL Server instances and assets locally, remotely, and on Azure, Salesforce.com, Office 365, and websites. To open **Server Explorer**, on the main menu, choose **View** > **Server Explorer**. For more information on using Server Explorer, see [Add new connections](../data-tools/add-new-connections.md).
+**Server Explorer** helps you browse and manage SQL Server instances and assets locally, remotely, and on Azure, Salesforce.com, Microsoft 365, and websites. To open **Server Explorer**, on the main menu, choose **View** > **Server Explorer**. For more information on using Server Explorer, see [Add new connections](../data-tools/add-new-connections.md).
 
 [SQL Server Data Tools (SSDT)](/sql/ssdt/download-sql-server-data-tools-ssdt) is a powerful development environment for SQL Server, Azure SQL Database, and Azure SQL Data Warehouse. It enables you to build, debug, maintain, and refactor databases. You can work with a database project, or directly with a connected database instance on- or off-premises.
 

docs/ide/work-with-multiple-user-accounts.md

@@ -10,7 +10,7 @@ ms.workload:
 ---
 # Work with multiple user accounts
 
-If you have multiple Microsoft accounts and/or work or school accounts, you can add them all to Visual Studio so that you can access the resources from any account without having to sign in to it separately. Azure, Application Insights, Azure DevOps, and Office 365 services all support the streamlined sign-in experience.
+If you have multiple Microsoft accounts and/or work or school accounts, you can add them all to Visual Studio so that you can access the resources from any account without having to sign in to it separately. Azure, Application Insights, Azure DevOps, and Microsoft 365 services all support the streamlined sign-in experience.
 
 After you add multiple accounts on one machine, that set of accounts roams with you if you sign in to Visual Studio on another machine.
 
@@ -47,7 +47,7 @@ The next time you open **Server Explorer**, the resources for that subscription
 
 ### Access Azure Active Directory in a Web project
 
-Azure Active Directory (AAD) enables support for end-user single sign-in in ASP.NET MVC web apps or AD authentication in web API services. Domain authentication is different from individual user account authentication. Users that have access to your Active Directory domain can use their existing AAD accounts to connect to your web applications. Office 365 apps can also use domain authentication.
+Azure Active Directory (AAD) enables support for end-user single sign-in in ASP.NET MVC web apps or AD authentication in web API services. Domain authentication is different from individual user account authentication. Users that have access to your Active Directory domain can use their existing AAD accounts to connect to your web applications. Microsoft 365 apps can also use domain authentication.
 
 ::: moniker range="vs-2017"
 

docs/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md

@@ -104,15 +104,15 @@ To make sure that you have access to everything you want when you use Visual Stu
 | Cookiecutter<br>Explorer template<br>discovery <br><br>Cookiecutter <br>Explorer project<br> creation | api.github.com <br>raw.githubusercontent.com <br>go.microsoft.com<br><br>pypi.org <br> pypi.python.org | https/443<br> | Used to discover online templates from our recommended feed and from GitHub repositories <br><br>Used to create a project from a cookiecutter template that requires a one-time on-demand installation of a cookiecutter Python package from the Python package index (PyPI) |
 | Python package <br>discovery<br><br>Python package <br>management<br><br>New <br>Python <br> project <br>templates | pypi.org<br> <br>pypi.python.org <br>bootstrap.pypa.io<br><br>go.microsoft.com | https/443 | Provides the ability to search for pip packages<br><br>Used to install pip automatically if it is missing <br><br>Used to resolve the following new Python project templates to cookiecutter template URLs:<br> - Classifier Project<br>- Clustering Project <br> - Regression Project <br> - PyGame using PyKinect <br> - Pyvot Project |
 | Office web <br>add-in <br> Manifest <br>Verification <br>Service | verificationservice.osi.office.net | https/443 | Used to validate manifests for Office web add-ins |
-| SharePoint and <br>Office Add-ins | sharepoint.com<br> office365.com<br> microsoftonline.com <br> outlook.com | https/443 | Used to publish and test SharePoint and Office Add-ins to SharePoint Online and Office 365 |
+| SharePoint and <br>Office Add-ins | sharepoint.com<br> microsoft.com/microsoft-365<br> microsoftonline.com <br> outlook.com | https/443 | Used to publish and test SharePoint and Office Add-ins to SharePoint Online and Microsoft 365 |
 | Workflow Manager <br>Test Service<br> Host | | http/12292 | A firewall rule that is created automatically for testing SharePoint add-ins with workflows |
 | Automatically collected <br>reliability statistics <br>and other <br>Customer Experience <br>Improvement Programs (CEIP)<br> for Azure SDK and <br>for SQL Tools <br><br> | vortex.data.microsoft.com<br> <br>dc.services.visualstudio.com | https/443 | Used to send reliability statistics (crash/unresponsive data) from the user to Microsoft. Actual crash/unresponsive dumps will still be uploaded if Windows Error Reporting is enabled; only statistical information will be suppressed; <br>Used to reveal anonymous usage patterns for the Azure Tools SDK extension to Visual Studio, and for usage patterns for the SQL tooling to Visual Studio |
 | Visual Studio <br> Customer Experience <br>Improvement Program (CEIP) <br><br>PerfWatson.exe | vortex.data.microsoft.com<br>dc.services.visualstudio.com<br>visualstudio-devdiv-c2s.msedge.net<br>az667904.vo.msecnd.net <br>scus-breeziest-in.cloudapp.net<br> | https/443 | Used to collect anonymous usage patterns and error logs <br><br>Used to track UI freeze issues |
 | Creation and<br>Management of <br>Azure resources | management.azure.com <br>management.core.windows.net | https/443 | Used for creating Azure Websites or other resources to support the publishing of web applications, Azure Functions, or WebJobs |
 | Updated web publish tooling <br>checks and extension <br>recommendations | marketplace.visualstudio.com | https/443 | Used for checking for the availability of updated publish tooling. If disabled, a potential recommended extension for web publishing may not be shown |
 | Updated Azure Resource <br>Creation Endpoint Information | \*.blob.core.windows.net | https/443 | Used to update the endpoints used for the creation of Azure Resources for certain Azure Services. If disabled, the last downloaded or built in endpoint locations are used instead |
 | Remote debugging and <br>Remote profiling of <br>Azure Websites | &#42;.cloudapp.net <br> &#42;.azurewebsites.net | 4022 | Used for attaching the remote debugger to Azure Websites. If disabled, attaching the remote debugger to Azure Websites will not work |
-| Active Directory <br>Graph | graph.windows.net | https/443 | Used to provision  new Azure Active Directory applications. Also used by the Office 365 MSGraph- connected service provider |
+| Active Directory <br>Graph | graph.windows.net | https/443 | Used to provision  new Azure Active Directory applications. Also used by the Microsoft 365 MSGraph- connected service provider |
 | Azure Functions <br>CLI Update <br>Check | functionscdn.azureedge.net | https/443 | Used for checking for updated versions of the Azure Functions CLI. If disabled, a cached copy (or the copy carried by the Azure Functions component) of the CLI will be used instead |
 | Cordova | npmjs.org<br>gradle.org | http/80 &<br/>https/443 | HTTP is used for Gradle downloads during build; HTTPS is used to include Cordova plug-ins in projects |
 | Cloud explorer | 1. &#60;clusterendpoint&#62; <br>Service Fabric <br>2. &#60;management endpoint&#62;<br>General Cloud Exp <br>3. &#60;graph endpoint&#62;<br>General Cloud Exp<br>4. &#60;storage account endpoint&#62;<br>Storage Nodes <br>5. &#60;Azure portal URLs&#62;<br>General Cloud Exp <br>6. &#60;key vault endpoints&#62; <br>Azure Resource Manager VM Nodes<br>7. &#60;PublicIPAddressOfCluster&#62;<br>Service Fabric Remote debugging and ETW Traces | <br>1.https/19080<br>2. https/443<br>3. https/443<br>4. https/443<br>5. https/443<br>6. https/443<br>7.tcp/dynamic | 1. Example: test12.eastus.cloudapp.com<br>2. Retrieves subscriptions and retrieves/manages Azure resources<br>3. Retrieves Azure Stack subscriptions<br>4. Manages Storage resources (example: mystorageaccount.blob.core.windows.net)<br>5. "Open in Portal" context menu option (opens a resource in the Azure portal)<br>6. Creates and uses key vaults for VM debugging (Example: myvault.vault.azure.net) <br><br>7. Dynamically allocates block of ports based on number of nodes in the cluster and the available ports. <br><br>A port block will try to get three times the number of nodes with minimum of 10 ports.<br><br>For Streaming traces, an attempt is made to get the port block from 810. If any of that port block is already used, then an attempt is made to get the next block, and so on. (It the load balancer is empty, then ports from 810 are most likely used) <br><br>Similarly for debugging, four sets of the ports blocks are reserved: <br>- connectorPort: 30398, <br>- forwarderPort: 31398, <br>- forwarderPortx86: 31399,<br>- fileUploadPort: 32398<br> |

docs/vsto/configuring-a-computer-to-develop-office-solutions.md

@@ -21,7 +21,7 @@ To create VSTO Add-ins and customizations for Microsoft Office, install a suppor
 |--------------|------------------------|
 |Visual Studio 2017| Any edition with the **Office/SharePoint development** workload.|
 |.NET Framework|- The .NET Framework 4 or later.|
-|Microsoft Office|<ul><li>Any suite edition of Office including Office Professional Plus for Office 365.</li><li>Any of the following standalone applications:<br /><br /> <ul><li>Excel</li><li>InfoPath (Office 2013 and Office 2010 only)</li><li>Outlook</li><li>PowerPoint</li><li>Project</li><li>Visio</li><li>Word</li></ul></li></ul><br /> Visual Basic for Applications (VBA) must be installed as part of Office. **Important:** Click-to-Run versions of Office 2010 applications are not supported.|
+|Microsoft Office|<ul><li>Any suite edition of Office including Microsoft 365 apps for enterprise.</li><li>Any of the following standalone applications:<br /><br /> <ul><li>Excel</li><li>InfoPath (Office 2013 and Office 2010 only)</li><li>Outlook</li><li>PowerPoint</li><li>Project</li><li>Visio</li><li>Word</li></ul></li></ul><br /> Visual Basic for Applications (VBA) must be installed as part of Office. **Important:** Click-to-Run versions of Office 2010 applications are not supported.|
 
 For detailed installation steps, see [How to: Configure a computer to develop Office solutions](../vsto/how-to-configure-a-computer-to-develop-office-solutions.md).
 

docs/vsto/development-best-practices-for-com-vsto-and-vba-add-ins-in-office.md

@@ -51,7 +51,7 @@ If the solution consists of an add-in and a process that is external to Office,
 Set the version number of the binaries in your solution and increment it with each update. This will make it easier for users to identify changes between versions and assess compatibility.
 
 ## Provide support statements for the latest versions of Office
-Customers are asking ISVs to provide support statements for their COM, VSTO and VBA add-ins that run in Office. Listing your explicit support statements helps customers using Office 365 ProPlus readiness tools understand your support.
+Customers are asking ISVs to provide support statements for their COM, VSTO and VBA add-ins that run in Office. Listing your explicit support statements helps customers using Microsoft 365 apps for enterprise readiness tools understand your support.
 
 To provide support statements for Office client applications (for example, Word or Excel), first verify that your add-ins run in the current Office release, and then commit to providing updates if your add-in breaks in a future release. You do not have to test your add-ins when Microsoft releases a new build, or an update to Office. Microsoft rarely changes the COM, VSTO and VBA extensibility platform in Office, and these changes will be well documented.
 

docs/vsto/office-and-sharepoint-development-in-visual-studio.md

@@ -38,7 +38,7 @@ ms.workload:
 
  Find out how to use the new [Office Add-in model](/office/dev/add-ins/overview/office-add-ins) to extend the Office experience for your users.
 
- These add-ins have small footprints compared to VSTO add-ins and solutions, and you can build them by using almost any web programming technology such as HTML5, JavaScript, CSS3, and XML.  To get started, use the Office Developer Tools in Visual Studio, or the lightweight web-based tool code-named Napa Office 365 Development Tools, which lets you create projects, write code, and run your add-ins in a browser.
+ These add-ins have small footprints compared to VSTO add-ins and solutions, and you can build them by using almost any web programming technology such as HTML5, JavaScript, CSS3, and XML.  To get started, use the Office Developer Tools in Visual Studio, which lets you create projects, write code, and run your add-ins in a browser.
 
  ![Apps for Office and SharePoint conceptual model](../vsto/media/officeandsharepointapps2015.png "Apps for Office and SharePoint conceptual model")
 

subscriptions/mpsa.md

@@ -12,13 +12,13 @@ description:  Visual Studio subscriptions in a Microsoft Products and Services A
 # Visual Studio subscriptions in a Microsoft Products and Services Agreement (MPSA)
 If you have purchased Visual Studio Subscriptions through the MPSA program, there are a few things to be aware of before you can become a Visual Studio subscriptions administrator and assign subscriptions to your users. If you have already been set up as an administrator, you can go directly to the Visual Studio subscriptions [Administration Portal](https://manage.visualstudio.com/).
 
-MPSA customers now manage assets purchased through MPSA in a new portal called the [Business Center](https://businessaccount.microsoft.com/Customer), which supports functionalities similar to the Volume Licensing Service Center (VLSC). These include viewing your License Summary, Orders, Downloads, Keys, Users, etc. However, Visual Studio subscriptions in MPSA behave much like Cloud Services. The Business Center also uses work accounts to sign in, instead of Microsoft Accounts (MSA). If your organization uses cloud services such as Office 365 or Azure Active Directory, and your email is part of either of these two services, it is already a work account. This will allow you to register to Business Center with your existing password. If your organization is not using cloud services and your email is not a work account, you may use it to register to the Business Center.
+MPSA customers now manage assets purchased through MPSA in a new portal called the [Business Center](https://businessaccount.microsoft.com/Customer), which supports functionalities similar to the Volume Licensing Service Center (VLSC). These include viewing your License Summary, Orders, Downloads, Keys, Users, etc. However, Visual Studio subscriptions in MPSA behave much like Cloud Services. The Business Center also uses work accounts to sign in, instead of Microsoft Accounts (MSA). If your organization uses cloud services such as Microsoft 365 or Azure Active Directory, and your email is part of either of these two services, it is already a work account. This will allow you to register to Business Center with your existing password. If your organization is not using cloud services and your email is not a work account, you may use it to register to the Business Center.
 
 In addition, the Visual Studio subscriptions [Administration Portal](https://manage.visualstudio.com/) is where the subscriptions will be assigned to subscribers once you become a Visual Studio subscriptions administrator. In MPSA, Visual Studio subscriptions must be provisioned to their respective management portal, which is the Visual Studio Subscriptions Administration Portal. To do that, you need to associate your Purchasing Account to a tenant (i.e. contoso.onmicrosoft.com).
 
 Please note that there are two types of tenants - managed tenants and unmanaged tenants. A managed tenant refers to a tenant that is already being managed by administrators within the organization.
 
-An unmanaged tenant is a tenant without any administrators assigned and is not usable for Online Services such as Office 365. Unmanaged tenants are also created when registering to the Business Center with an email that is not a work account. If you were asked to create a password when registering to the Business Center, this means your email was not a work account and it created an unmanaged tenant.
+An unmanaged tenant is a tenant without any administrators assigned and is not usable for Online Services such as Microsoft 365. Unmanaged tenants are also created when registering to the Business Center with an email that is not a work account. If you were asked to create a password when registering to the Business Center, this means your email was not a work account and it created an unmanaged tenant.
 
 Here are a few requirements/steps needed to become a Visual Studio Subscriptions administrator prior to completing the tenant association.