Merge branch 'main' into patch-1

Author: lindalu-MSFT

docs/build-microsoft-365-solutions.md

@@ -6,19 +6,18 @@ ms.localizationpriority: high
 
 # Use your developer subscription to build Microsoft 365 solutions
 
-What do you want to build with your Microsoft 365 developer subscription? Depending on what you are interested in, you can do a lot of different things. Following are some of the products and technology areas that you can start with.
+What do you want to build with your Microsoft 365 developer subscription? Depending on what you are interested in, you can do a lot of different things. The following are some of the products and technology areas that you can start with.
 
 ## Microsoft Teams
 
 Microsoft Teams is a chat-based workspace that integrates with the apps and services that people use to get work done together. The Microsoft Teams developer platform makes it easy for you to integrate your own service, whether you develop custom apps for your enterprise or SaaS applications for teams around the world.
 
-Here's how to get set up and coding with Microsoft Teams:
+To get started building with Microsoft Teams:
 
 1. [Prepare your developer subscription](/microsoftteams/platform/get-started/get-started-tenant).
 2. Set up your development environment. This process will vary depending on the type of app or service you are building. For details, see one of the following:
-
-  - [Get started on the Microsoft Teams platform with Node.js](/microsoftteams/platform/get-started/get-started-nodejs-app-studio)
-  - [Get started on the Microsoft Teams platform with C#/.NET](/microsoftteams/platform/get-started/get-started-dotnet-app-studio)
+      - [Get started on the Microsoft Teams platform with Node.js](/microsoftteams/platform/get-started/get-started-nodejs-app-studio)
+      - [Get started on the Microsoft Teams platform with C#/.NET](/microsoftteams/platform/get-started/get-started-dotnet-app-studio)
 
 ## Microsoft Graph
 
@@ -40,7 +39,7 @@ To automatically configure your sandbox to try out Microsoft Graph scenarios, in
 
 For details, see [Use sample data packs](install-sample-packs.md). 
 
-For more ways to get started working with Microsoft Graph, see the Microsoft Graph [Quick Start](https://developer.microsoft.com/en-us/graph/quick-start).
+For more ways to get started working with Microsoft Graph, see the Microsoft Graph [Quick Start](https://developer.microsoft.com/graph/quick-start) and [documentation](/graph/).
 
 ## Office Add-ins
 
@@ -59,17 +58,6 @@ For more details, see:
 - [Set up your developer subscription for SPFx](/sharepoint/dev/spfx/set-up-your-developer-tenant)
 - [Set up your development environment](/sharepoint/dev/spfx/set-up-your-development-environment)
 
-## SharePoint Add-ins 
-
-A SharePoint Add-in is a self-contained piece of functionality that extends the capabilities of SharePoint websites to solve a well-defined business problem. You can create two types of SharePoint Add-ins: SharePoint-hosted and provider-hosted. For more information, see [SharePoint Add-ins](/sharepoint/dev/sp-add-ins/sharepoint-add-ins).
-
-To get set up and start coding SharePoint Add-ins:
-
-- [Set up your subscription](/sharepoint/dev/spfx/set-up-your-developer-tenant).  
-- Set up your development environment: 
-  - [Get started creating SharePoint-hosted SharePoint Add-ins](/sharepoint/dev/sp-add-ins/get-started-creating-sharepoint-hosted-sharepoint-add-ins)  
-  - [Get started creating provider-hosted SharePoint Add-ins](/sharepoint/dev/sp-add-ins/get-started-creating-provider-hosted-sharepoint-add-ins)  
-
 ## Power Apps
 
 Power Apps for Office 365 is included in your Microsoft 365 E5 developer subscription license. This means that you can create and test unlimited apps with [standard connectors](/connectors/connector-reference/connector-reference-standard-connectors). To use [premium](/connectors/connector-reference/connector-reference-premium-connectors) or custom connectors, and Dataverse you need an additional license. For development and testing purposes, you can use the [Power Apps Developer Plan](https://powerapps.microsoft.com/developerplan). 
@@ -87,10 +75,7 @@ For more information:
 - Watch videos on the [Power Apps channel](https://www.youtube.com/channel/UCGfWR2ekfRFckLjev6eQYLg) on YouTube
 
 
-## See also
+## Related content
 
-- [Join the Microsoft 365 Developer Program](microsoft-365-developer-program.md)
-- [Set up a Microsoft 365 developer subscription](microsoft-365-developer-program-get-started.md) 
-- [Renew an expiring subscription](subscription-expiration-and-renewal.md)
 - [Microsoft 365 Developer Program FAQ](microsoft-365-developer-program-faq.yml)
 - [Microsoft 365 developer documentation](/microsoft-365/developer)

docs/docfx.json

@@ -35,6 +35,7 @@
     "overwrite": [],
     "externalReference": [],
     "globalMetadata": {
+      "ms.service": "office",
       "feedback_system": "Standard",
       "uhfHeaderId": "MSDocsHeader-Dev_Office",
       "searchScope": ["Office dev program"],
@@ -43,7 +44,6 @@
       "ms.author": "o365devx",
       "author": "o365devx",
       "ms.topic": "conceptual",
-      "ms.prod": "office",
       "ms.custom": "dev-program"
     },
     "fileMetadata": {},

docs/install-sample-packs.md

@@ -8,8 +8,6 @@ ms.localizationpriority: high
 
 Your Microsoft 365 Developer Program sandbox subscription comes with sample data to save you time by providing data and content you need to build and test your solutions.
 
-![Screenshot of the sample data pack buttons](images/sample-data-packs.PNG)
-
 ## Sample data installed on the instant sandbox
 
 If you have an instant sandbox, the sample data packs are already pre-installed. Your instant sandbox includes the following sample data:
@@ -21,7 +19,6 @@ If you have an instant sandbox, the sample data packs are already pre-installed.
   - **App Studio / Teams Developer Portal pre-installed and pinned** to help you streamline the creation of your Teams app manifest and app package, plus the card editor and a React control library.
 
     ![Screenshot of the Teams Developer Portal](images/teams-developer-portal.PNG)
-- **SharePoint Framework sample data** – Choose from six site templates that you can install and evaluate as custom solutions for your organization (with one pre-installed).
 
 ## Install sample data packs in your configurable sandbox
 
@@ -50,9 +47,6 @@ The following sample data packs are currently available:
   > [!NOTE]
   > You must install the Users sample data pack before you install Mail and Events.
     
-- SharePoint Framework sample data – Choose from six site templates that you can install and evaluate as custom solutions for your organization (with one pre-installed).
-
-
 ### Install the Users sample data pack
 
 Before you install the Users sample data pack, make sure that you have a Microsoft 365 developer subscription and that you assign a license to yourself as the admin.
@@ -82,100 +76,6 @@ After you've installed the Users sample data pack, you can install mail and even
 
 3. When installation is finished, you'll be notified by email, and the box on your subscription tile will be green.
 
-### Install the SharePoint sample data pack
-
-The SharePoint sample data pack includes six different SharePoint site templates to choose from to experience and model SharePoint solutions for collaboration, communication, engagement, and knowledge management.
-
-These are some of the most popular templates from the [SharePoint PnP look book](https://lookbook.microsoft.com). Today, it's simple to create sample solutions of beautiful, fast sites and pages that look great on any device or screen. Get inspired with these designs or add them to your sandbox tenant to start building your next site.
-
-The templates can be installed on your subscription. After you install one template, you have the option to install the others. The installation process includes the following steps:
-
-1. Select the Template you want from the drop down menu.
-
-  ![Screenshot of the SharePoint template selection screen](images/sharepoint-sample-data.png)
-
-2. Configure custom options for your sites, or accept the default values.
-3. Use the administrator ID of your sandbox tenant and password to authenticate and give permissions to install. 
-
-Installation will proceed automatically.
-
->**Note:** The provisioning of these site templates only works with English Office 365 E3 or Microsoft 365 E5 developer subscriptions, and all content included is English only.
-
-#### What SharePoint templates are available?
-
-The SharePoint sample pack includes seven different templates.
-
-#### Team site with data
-
-The Team site with data template includes multiple lists and document libraries that are automatically associated with a SharePoint team site to help you develop solutions using SharePoint Framework, Power Apps, and Microsoft Graph.
-
-This template includes the following data:
-
-- A contact list with pre-populated contacts
-- A list populated with over 6,000 items
-- Document libraries with sample PowerPoint, Excel, Word, and OneNote documents
-- An events list with announcement items
-
-This template integrates with the Users sample data.
-
-#### Work @ Contoso
-The Work @ Contoso template consists of multiple site collections that are all automatically associated with the hub site to show how all default aggregation capabilities work.
-
-This template contains following structures and assets:
-
-- Main site collection set as a hub site
-- Two communication sites associated with the hub site - Benefits and charity sites
-- One group team site associated with the hub site - Team site
-- Sample news articles in the subsite collections
-- Sample Word, Excel, and PowerPoint files
-- Sample image content used in the site collections
-
-Subsite collections use the same templates, which you can also provision separately from this service.
-
->**Note:** If this template is applied on top of an existing communication site, the welcome page content of the site will be overwritten.
-
-#### Leadership Connection: Leadership news, events, engagement
-
-This leadership site provides insight into the goals and priorities of the leadership team, and inspires engagement with events and conversations.
-
-Adding this design to your tenant will create the following content:
-
-- Example welcome page with demonstration of web parts
-- Example news articles demonstrating different modern page designs
-
-This template integrates with the Users sample data.
-
-#### The Landing: News, resources, personalized content
-
-This communication site is designed to be the place where your employees can find the news and resources they need, plus personalized content tailored just for them.
-
-Adding this design to your tenant will create the following content:
-
-- Demo structure for home site of the portal
-- Custom welcome page structure
-- Six additional sample modern pages and news articles
-- Sample images and Office documents
-
-#### The Perspective: News, video, personalized content
-
-Designed to offer news and personalized content, this site also includes videos to inspire even more engagement.
-Adding this design to your tenant will create the following content:
-
-- Custom welcome page designs
-- Sample page template for news articles
-- 12 sample news articles
-
-#### Crisis Communications: Announcements, news, resources, communities and calls-to-action
-
-Keep people informed, engaged, and moving forward during crises, from extreme weather events to health and safety emergencies. This template creates a central resource for leaders and communicators to share important news and announcements, a single source of truth where people can stay up-to-date, and a place to connect people across the organization.
-
-Adding this design to your tenant will create the following content:
-
-- Custom welcome page built using a web part
-- Four news articles with example content
-
-This template integrates with the Users sample data.
-
 ## Can I install sample data packs on my other Microsoft 365 subscriptions?
 
 No. These sample data packs are only compatible with the Microsoft 365 developer subscription you get as part of the Microsoft 365 Developer Program.
@@ -191,8 +91,6 @@ To see the Mail & Events sample data, in the [**Microsoft 365 Admin Center**](/m
 
 To see the Microsoft Teams sample data, go to **Teams** in your Microsoft 365 E5 subscription. On the Teams tab, you'll see some pre-created teams with chats from sample users in the **Mark 8 Project Team**. The App Studio/Dev Portal app is pre-installed and pinned to the navigation pane.
 
-To see the SharePoint sample data, go to the SharePoint admin center, and choose **Active sites** in the left navigation. You can see the sample sites that are pre-installed and any additional site templates that you install in your sandbox.
-
-## See also
+## Related content
 
-- [Set up a Microsoft 365 developer subscription](microsoft-365-developer-program-get-started.md)
+- [Request a Microsoft 365 developer subscription](microsoft-365-developer-program-get-started.md)

docs/join-with-visual-studio.md

@@ -6,16 +6,16 @@ ms.localizationpriority: high
 
 # Join the Microsoft 365 Developer Program as a Visual Studio subscriber
 
-Visual Studio Professional and Enterprise subscribers qualify for a Microsoft 365 E5 developer subscription that renews automatically, regardless of activity signals, for as long as you remain a subscriber. When you join the program as a Visual Studio subscriber, you can set up a developer sandbox subscription that is linked to your Visual Studio subscription, and it will not be subject to expiration due to inactivity (or our failure to detect activity that is not be in scope for our renewal monitoring).
+Visual Studio subscribers with standard Professional or Enterprise subscriptions qualify for a Microsoft 365 E5 developer subscription that renews automatically for as long as you remain a subscriber. When you join the program as a Visual Studio subscriber, you can set up a developer sandbox subscription that is linked to your Visual Studio subscription. It will not be subject to expiration due to inactivity (or our failure to detect activity that is not in scope for renewal monitoring).
 
 > [!NOTE]
 > Your Microsoft 365 E5 developer subscription is for development purposes only and can be revoked if you use it for purposes other than development. For details, see the [Microsoft 365 Developer Program Terms and Conditions](terms-and-conditions.md).
 
 ## How do I get a renewable Microsoft 365 developer subscription?
 
-If you don't have a Visual Studio Professional or Enterprise subscription and you want one, see the [Visual Studio subscription](https://visualstudio.microsoft.com/vs/pricing/) page.
+If you don't have a Visual Studio standard Professional or Enterprise subscription and you want one, see the [Visual Studio subscription](https://visualstudio.microsoft.com/vs/pricing/) page.
 
-If you already have a Visual Studio Professional or Enterprise subscription, after you join the program, when you set up your Microsoft 365 developer subscription, you have the option to link it to your Visual Studio subscription. For details, see [Set up your Microsoft 365 E5 sandbox subscription](microsoft-365-developer-program-get-started.md#set-up-your-microsoft-365-e5-sandbox-subscription).
+If you already have a Visual Studio standard Professional or Enterprise subscription, after you join the program, when you set up your Microsoft 365 developer subscription, you have the option to link it to your Visual Studio subscription. For details, see [Set up your Microsoft 365 E5 sandbox subscription](microsoft-365-developer-program-get-started.md#set-up-your-microsoft-365-e5-sandbox-subscription).
 
 You can also join the Microsoft 365 Developer Program and get a Microsoft 365 developer subscription from your Visual Studio subscriber portal. Go to [Visual Studio | My Benefits](https://my.visualstudio.com/benefits) and click the **Microsoft 365 Developer subscription (E5)** tile, and you will automatically join the Microsoft 365 developer program with your Visual Studio ID. 
 
@@ -30,4 +30,4 @@ When you link your Microsoft 365 developer subscription to Visual Studio, it wil
 
 When you join the Microsoft 365 Developer Program with your Visual Studio subscription, your Microsoft 365 E5 developer sandbox subscription will automatically renew for the lifetime of your Visual Studio subscription. 
 
-If you join the developer program directly, your Microsoft 365 E5 developer sandbox subscription is good for 90 days and will renew regularly based on your development activity.
+If you join the developer program directly, your Microsoft 365 E5 developer sandbox subscription is good for up to 90 days, depending on your development activity, and will renew regularly for as long as you use it for qualified activities.