Merge branch 'master' into patch-3

andrewconnell · web-flow · commit d7901a5ef1f5 · 2021-09-28T06:16:52.000-04:00
diff --git a/docs/declarative-customization/column-formatting.md b/docs/declarative-customization/column-formatting.md
@@ -1,7 +1,7 @@
 ---
 title: Use column formatting to customize SharePoint
 description: Customize how fields in SharePoint lists and libraries are displayed by constructing a JSON object that describes the elements that are displayed when a field is included in a list view, and the styles to be applied to those elements.
-ms.date: 06/29/2021
+ms.date: 09/28/2021
 ms.localizationpriority: high
 ---
 
@@ -1667,9 +1667,6 @@ The ___location field object has the following properties (with example values):
 }
 ```
 
-> [!NOTE] 
-> Location fields do not currently have a "Format this column" option in the list view and formats applied directly to these fields will need to be done through field settings.
-
 <br/>
 
 The following example shows how a ___location field might be used on a current field.
diff --git a/docs/declarative-customization/customize-default-site-design.md b/docs/declarative-customization/customize-default-site-design.md
@@ -1,65 +1,66 @@
----
-title: Customize default site templates in SharePoint
-description: Customize the default site templates for the SharePoint Team site or Communication site template.
-ms.date: 09/28/2021
-ms.localizationpriority: high
----
-
-# Customize a default site template
-
-SharePoint offers several [site templates that are already available](https://support.microsoft.com/office/apply-and-customize-sharepoint-site-templates-39382463-0e45-4d1b-be27-0e96aeec8398). These are the default site templates and they can be modified by using PowerShell or the REST APIs to control the entire site provisioning experience. For example, you can ensure that your company theme is applied to every site that gets created, or you can make sure a logging mechanism always runs regardless of which site template is chosen.
-
-## Apply a site script to a default site template
-
-To customize a default site template, apply a new template script using PowerShell **Add-SPOSiteDesign** cmdlet or the **CreateSiteDesign** REST API. Specify the **IsDefault** switch to apply the site template as the default template. 
-
-| Parameter            | Value                | Site template type          |
-| :------------------- | :------------------- |:----------------|
-| WebTemplate  | 64 | Team site template |
-| WebTemplate  | 1 | Team site (with group creation disabled) |
-| WebTemplate    | 68 | Communication site template |
-
-
-The following example shows how to use the **IsDefault** switch to apply the Contoso company theme to the default site templates. The site script referenced by ID contains the JSON script to apply the correct theme.
-
-```powershell
-C:\> Add-SPOSiteDesign `
-  -Title "Contoso company theme" `
-  -WebTemplate "68" `
-  -SiteScripts "89516c6d-9f4d-4a57-ae79-36b0c95a817b" `
-  -Description "Applies standard company theme to site" `
-  -IsDefault
-```
-
-<br/>
-
-```javascript
-RestRequest("/_api/Microsoft.SharePoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteDesign", {info:{Title:"Contoso company theme", Description:"Applies standard company theme to site", SiteScriptIds:["89516c6d-9f4d-4a57-ae79-36b0c95a817b"],  WebTemplate:"68", IsDefault: true}});
-```
-
-### Which default site templates are updated?
-
-The default site template for a communication site is the **Topic** template. The default for a team site is the **Team collaboration** template. When you apply a new default site template, it updates the Microsoft-provided default templates.
-
-
-## Restore the default site templates
-
-To restore a site template to the defaults, remove the site template script that you applied. In the previous example, if the site template created had the ID `db752673-18fd-44db-865a-aa3e0b28698e`, you would remove it as shown in the following example.
-
-```powershell
-C:\> Remove-SPOSiteDesign db752673-18fd-44db-865a-aa3e0b28698e
-```
-
-<br/>
-
-```javascript
-RestRequest("/_api/Microsoft.SharePoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteDesign", {id:"db752673-18fd-44db-865a-aa3e0b28698e"});
-```
-
-> [!NOTE]
-> If you're not sure which site template is the default, run the **Get-SPOSiteDesign** cmdlet. It will list all site templates, and indicates which ones are defaults.
-
-## See also
-
-- [SharePoint site template and site script overview](site-design-overview.md)
-- [Browse and customize Microsoft-provided site templates](https://support.microsoft.com/office/apply-and-customize-sharepoint-site-templates-39382463-0e45-4d1b-be27-0e96aeec8398)
+---
+title: Customize default site templates in SharePoint
+description: Customize the default site templates for the SharePoint Team site or Communication site template.
+ms.date: 09/28/2021
+ms.localizationpriority: high
+---
+
+# Customize a default site template
+
+SharePoint offers several [site templates that are already available](https://support.microsoft.com/office/apply-and-customize-sharepoint-site-templates-39382463-0e45-4d1b-be27-0e96aeec8398). These are the default site templates and they can be modified by using PowerShell or the REST APIs to control the entire site provisioning experience. For example, you can ensure that your company theme is applied to every site that gets created, or you can make sure a logging mechanism always runs regardless of which site template is chosen.
+
+## Apply a site script to a default site template
+
+To customize a default site template, apply a new template script using PowerShell **Add-SPOSiteDesign** cmdlet or the **CreateSiteDesign** REST API. Specify the **IsDefault** switch to apply the site template as the default template. 
+
+| Parameter            | Value                | Site template type          |
+| :------------------- | :------------------- |:----------------|
+| WebTemplate  | 64 | Team site template |
+| WebTemplate  | 1 | Team site (with group creation disabled) |
+| WebTemplate    | 68 | Communication site template |
+| WebTemplate    | 69 | Channel site template |
+
+
+The following example shows how to use the **IsDefault** switch to apply the Contoso company theme to the default site templates. The site script referenced by ID contains the JSON script to apply the correct theme.
+
+```powershell
+C:\> Add-SPOSiteDesign `
+  -Title "Contoso company theme" `
+  -WebTemplate "68" `
+  -SiteScripts "89516c6d-9f4d-4a57-ae79-36b0c95a817b" `
+  -Description "Applies standard company theme to site" `
+  -IsDefault
+```
+
+<br/>
+
+```javascript
+RestRequest("/_api/Microsoft.SharePoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteDesign", {info:{Title:"Contoso company theme", Description:"Applies standard company theme to site", SiteScriptIds:["89516c6d-9f4d-4a57-ae79-36b0c95a817b"],  WebTemplate:"68", IsDefault: true}});
+```
+
+### Which default site templates are updated?
+
+The default site template for a communication site is the **Topic** template. The default for a team site is the **Team collaboration** template. When you apply a new default site template, it updates the Microsoft-provided default templates.
+
+
+## Restore the default site templates
+
+To restore a site template to the defaults, remove the site template script that you applied. In the previous example, if the site template created had the ID `db752673-18fd-44db-865a-aa3e0b28698e`, you would remove it as shown in the following example.
+
+```powershell
+C:\> Remove-SPOSiteDesign db752673-18fd-44db-865a-aa3e0b28698e
+```
+
+<br/>
+
+```javascript
+RestRequest("/_api/Microsoft.SharePoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteDesign", {id:"db752673-18fd-44db-865a-aa3e0b28698e"});
+```
+
+> [!NOTE]
+> If you're not sure which site template is the default, run the **Get-SPOSiteDesign** cmdlet. It will list all site templates, and indicates which ones are defaults.
+
+## See also
+
+- [SharePoint site template and site script overview](site-design-overview.md)
+- [Browse and customize Microsoft-provided site templates](https://support.microsoft.com/office/apply-and-customize-sharepoint-site-templates-39382463-0e45-4d1b-be27-0e96aeec8398)
diff --git a/docs/declarative-customization/get-started-create-site-design.md b/docs/declarative-customization/get-started-create-site-design.md
@@ -1,7 +1,7 @@
 ---
 title: Get started creating SharePoint site templates and site scripts
 description: Create site templates to provide reusable lists, themes, layouts, pages, or custom actions so that your users can quickly build new SharePoint sites with the features they need.
-ms.date: 08/23/2021
+ms.date: 09/24/2021
 ms.localizationpriority: high
 ---
 
@@ -109,6 +109,7 @@ The previous cmdlet creates a new site template named Contoso customer tracking.
 | WebTemplate  | 64 | Team site template |
 | WebTemplate 1 | 1 | Team site (with group creation disabled) |
 | WebTemplate    | 68 | Communication site template |
+| WebTemplate    | 69 | Channel site template |
 
 
 The JSON response displays the **ID** of the new site template. You can use it in subsequent cmdlets to update or modify the site template.
@@ -155,6 +156,10 @@ Apply a published site template to a new or existing hub site. Then, all associa
 
 You can also use the `Set-SPOHubSite` cmdlet. Review the [PowerShell cmdlets for SharePoint hub sites](../features/hub-site/hub-site-powershell.md) article.
 
+>[!NOTE]
+> [Channel sites](/sharepoint/teams-connected-sites) are automatically blocked from joining a hub site.
+
+
 ## See also
 
 - [SharePoint site template and site script overview](site-design-overview.md)
diff --git a/docs/declarative-customization/site-design-json-schema.md b/docs/declarative-customization/site-design-json-schema.md
@@ -1,7 +1,7 @@
 ---
 title: Site design JSON schema
 description: JSON schema reference for building site designs for SharePoint.
-ms.date: 10/09/2020
+ms.date: 09/24/2021
 ms.localizationpriority: high
 ---
 
@@ -699,6 +699,9 @@ Get-Content '<Folder_location_to_site_script>\site-script.json' -Raw -Encoding U
 
 Use the `applyTheme` verb to add a custom theme to the site. For more information about how to construct and upload these themes, see [SharePoint site theming](site-theming/sharepoint-site-theming-overview.md). This site action only works for applying custom themes; to apply one of our in-product SharePoint themes, create a copy as a custom one and reference that one.
 
+> [!NOTE]
+> This action is automatically blocked for [channel sites](/sharepoint/teams-connected-sites). 
+
 #### JSON value
 
 - `themeName`: The name of the theme to apply.
@@ -756,6 +759,7 @@ Use the `setSiteBranding` verb to specify the navigation layout, the header layo
 
 > [!NOTE]
 > Setting the navigation layout only works on the communication site template and for the hub navigation.
+> This action is automatically blocked for [channel sites](/sharepoint/teams-connected-sites). 
 
 #### JSON value
 
@@ -798,6 +802,9 @@ Use the `setSiteLogo` verb to specify a logo for your site.
 
 ## Join a hub site
 
+> [!NOTE]
+> This action is automatically blocked for [channel sites](/sharepoint/teams-connected-sites). 
+
 Use the `joinHubSite` verb to join the site to a designated hub site.
 
 #### JSON value
@@ -917,6 +924,9 @@ Use the `triggerFlow` verb to kick off a custom flow.
 
 ## Configure regional settings
 
+> [!NOTE]
+> This action is automatically blocked for [channel sites](/sharepoint/teams-connected-sites). 
+
 Use the `setRegionalSettings` action to configure the regional settings of the site (*/_layouts/15/regionalsetng.aspx*).
 
 #### JSON values
@@ -940,6 +950,9 @@ Use the `setRegionalSettings` action to configure the regional settings of the s
 
 ## Add users (principals) to SharePoint Groups
 
+> [!NOTE]
+> This action is automatically blocked for [channel sites](/sharepoint/teams-connected-sites). 
+
 Use the `addPrincipalToSPGroup` action to manage addition of users and groups to select default SharePoint groups. For more information, see [Understanding SharePoint Groups](https://support.office.com/article/Understanding-SharePoint-groups-94D9B261-161E-4ACE-829E-ECA1C8CD2EB8). This action can be used for licensed users, security groups, and Microsoft 365 groups.
 
 #### JSON values
@@ -977,6 +990,9 @@ Use the `addPrincipalToSPGroup` action to manage addition of users and groups to
 
 ## Manage guest access
 
+> [!NOTE]
+> This action is automatically blocked for [channel sites](/sharepoint/teams-connected-sites). 
+
 Use the `setSiteExternalSharingCapability` action to manage guest access. For more information, see [Manage external sharing for your SharePoint Online environment](https://support.office.com/article/Manage-external-sharing-for-your-SharePoint-Online-environment-C8A462EB-0723-4B0B-8D0A-70FEAFE4BE85).
 
 <!-- update this table matrix -->
diff --git a/docs/declarative-customization/site-design-overview.md b/docs/declarative-customization/site-design-overview.md
@@ -1,7 +1,7 @@
 ---
 title: SharePoint site template and site script overview
 description: Use SharePoint site scripts and site templates to provide custom configurations to apply when new sites are created.
-ms.date: 06/14/2021
+ms.date: 09/24/2021
 ms.localizationpriority: high
 ---
 
@@ -25,6 +25,10 @@ This article describes how you can use site templates and site scripts to provid
 
 Site templates can be used each time a new site is created to apply a consistent set of actions. They can also be applied to existing modern sites (group-connected Team and Communication sites). Most actions typically affect the site itself, such as setting the theme or creating lists. But a site template can also include other actions, such as recording the new site URL to a log, or sending a tweet.
 
+> [!NOTE]
+> - Site templates created using custom site scripts will display in the **From your organization** tab in the site template gallery.
+> - Custom site templates made by your organization will display in the site template gallery based on the type of site chosen by the user - either a communication site or a team site. Therefore, it is likely users will not see all site templates from your organization in the site template gallery. Soon, users will have the ability to browse all site templates provided by your organization regardless of which type of site was chosen.  
+
 You create site templates and register them in SharePoint to one of the modern template sites: the Team site or the Communication site. You can see how this works in the following steps.
 
 1. Go to the SharePoint start page on your developer tenant. 
@@ -114,19 +118,19 @@ Each action in a site script is specified by a **verb** value in the JSON. In th
 - Creating a new list or library (or modifying the default one created with the site)
 - Creating site columns, content types, and configuring other list settings
 - Set site branding properties like navigation layout, header layout and header background
-- Applying a theme
+- Applying a theme**
 - Setting a site logo
-- Adding links to quick launch or hub navigation
+- Adding links to quick launch or hub navigation**
 - Triggering a Power Automate flow
 - Installing a deployed solution from the app catalog
-- Setting regional settings for the site
+- Setting regional settings for the site**
 - Adding principals (users and groups) to SharePoint roles**
 - Setting external sharing capability for the site**
 
 For a complete list of available actions and their parameters, see the [JSON schema](site-design-json-schema.md).
 
 > [!NOTE]
-> - Actions marked with ** are automatically blocked for channel sites.
+> - Actions marked with ** are automatically blocked for [channel sites](/sharepoint/teams-connected-sites).
 > - For libraries and lists, use the PowerShell command [Get-SPOSiteScriptFromList](/powershell/module/sharepoint-online/Get-SPOSiteScriptFromList) to create the site script syntax from an existing SharePoint list. 
 
 Site scripts can be run again on the same site after provisioning. Site scripts are non-destructive, so when they run again, they ensure that the site matches the configuration in the script. 
@@ -235,6 +239,7 @@ In the previous example, the **Add-SPOSiteScript** cmdlet or **CreateSiteScript*
 | WebTemplate  | 64 | Team site template |
 | WebTemplate 1 | 1 | Team site (with group creation disabled) |
 | WebTemplate    | 68 | Communication site template |
+| WebTemplate    | 69 | Channel site template |
 
 
 
diff --git a/docs/spfx/deployment-spfx-teams-solutions.md b/docs/spfx/deployment-spfx-teams-solutions.md
@@ -1,7 +1,7 @@
 ---
 title: Deployment options for SharePoint Framework solutions for Microsoft Teams
 description: Learn what options are available to deploy SharePoint Framework solutions for Microsoft Teams
-ms.date: 07/20/2021
+ms.date: 09/28/2021
 ms.prod: sharepoint
 ms.localizationpriority: high
 ---
@@ -71,7 +71,7 @@ To use your own Microsoft Teams app manifest & app package instead of letting Sh
     > [!IMPORTANT]
     > Don't compress the folder, instead compress the contents of the folder. If you ZIP the folder, it will a top-level subfolder to the resulting ZIP file which isn't a valid app package in Microsoft Teams.
 
-1. Save the **TeamsSPFxApp.zip** in the SPFx solution's **./src/teams** folder.
+1. Save the **TeamsSPFxApp.zip** in the SPFx solution's **./teams** folder.
 1. Create the SPFx package the same way you would with a regular SPFx solution, using **gulp package-solution**. It will include the custom Microsoft Teams app package in the **\*.sppkg**.
 
 ### Dynamically reference the underlying SharePoint site URLs
diff --git a/docs/spfx/viva/get-started/build-first-sharepoint-adaptive-card-extension.md b/docs/spfx/viva/get-started/build-first-sharepoint-adaptive-card-extension.md
@@ -1,7 +1,7 @@
 ---
 title: Build your first SharePoint Adaptive Card Extension
 description: Adaptive Card Extensions (ACEs) are a new SharePoint Framework component type, which enable developers to build rich, native extensions to Viva Connections' Dashboards and SharePoint Pages. In this tutorial, you'll build and explore your first ACE.
-ms.date: 09/08/2021
+ms.date: 09/24/2021
 ms.prod: sharepoint
 ms.localizationpriority: high
 ---
@@ -421,7 +421,7 @@ public onAction(action: IActionArguments): void {
       case 'button2':
         this.setState({
           subTitle: message
-        })
+        });
         break;
     }
   }
