@pnp/cli-microsoft365 6.0.0-beta.a9609a1 → 6.0.0-beta.b62b543

package/docs/docs/cmd/spo/list/list-view-list.md

@@ -10,27 +10,36 @@ m365 spo list view list [options]
 
 ## Options
 
-`-u, --webUrl <webUrl>`
+ `-u, --webUrl <webUrl>`
 : URL of the site where the list is located
 
-`-i, --listId [listId]`
-: ID of the list for which to list configured views. Specify `listId` or `listTitle` but not both
+ `-i, --listId [listId]`
+: ID of the list for which to list configured views. Specify either `listId`, `listTitle`, or `listUrl`.
 
-`-t, --listTitle [listTitle]`
-: Title of the list for which to list configured views. Specify `listId` or `listTitle` but not both
+ `-t, --listTitle [listTitle]`
+: Title of the list for which to list configured views. Specify either `listId`, `listTitle`, or `listUrl`.
+
+ `--listUrl [listUrl]`
+: Server- or site-relative URL of the list. Specify either `listId` , `listTitle` or `listUrl`.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Examples
 
-List all views for a list with title *Documents* located in site *https://contoso.sharepoint.com/sites/project-x*
+List all views for a list by title
 
 ```sh
 m365 spo list view list --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle Documents
 ```
 
-List all views for a list with ID *0cd891ef-afce-4e55-b836-fce03286cccf* located in site *https://contoso.sharepoint.com/sites/project-x*
+List all views for a list by ID
 
 ```sh
 m365 spo list view list --webUrl https://contoso.sharepoint.com/sites/project-x --listId 0cd891ef-afce-4e55-b836-fce03286cccf
 ```
+
+List all views for a list by URL
+
+```sh
+m365 spo list view list --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl '/sites/project-x/lists/Events'
+```

package/docs/docs/cmd/spo/list/list-view-remove.md

@@ -14,10 +14,13 @@ m365 spo list view remove [options]
 : URL of the site where the list to remove the view from is located
 
 `--listId [listId]`
-: ID of the list from which the view should be removed. Specify either `listId` or `listTitle` but not both
+: ID of the list from which the view should be removed. Specify either `listId`, `listTitle`, or `listUrl`.
 
 `--listTitle [listTitle]`
-: Title of the list from which the view should be removed. Specify either `listId` or `listTitle` but not both
+: Title of the list from which the view should be removed. Specify either `listId`, `listTitle`, or `listUrl`.
+
+ `--listUrl [listUrl]`
+: Server- or site-relative URL of the list. Specify either `listId` , `listTitle` or `listUrl`.
 
 `--id [id]`
 : ID of the view to remove. Specify either `id` or `title` but not both
@@ -32,7 +35,7 @@ m365 spo list view remove [options]
 
 ## Examples
 
-Remove view with ID _cc27a922-8224-4296-90a5-ebbc54da2e81_ from the list with ID _0cd891ef-afce-4e55-b836-fce03286cccf_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Remove view from the list by ID _0cd891ef-afce-4e55-b836-fce03286cccf_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
 m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listId 0cd891ef-afce-4e55-b836-fce03286cccf --id cc27a922-8224-4296-90a5-ebbc54da2e81
@@ -50,6 +53,12 @@ Remove view with title _MyView_ from a list with title _Documents_ located in si
 m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle Documents --title MyView
 ```
 
+Remove view with title _MyView_ from a list with url _/sites/project-x/lists/Events_ located in site _https://contoso.sharepoint.com/sites/project-x_
+
+```sh
+m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl '/sites/project-x/lists/Events' --viewTitle MyView
+```
+
 Remove view with ID _cc27a922-8224-4296-90a5-ebbc54da2e81_ from a list with title _Documents_ located in site _https://contoso.sharepoint.com/sites/project-x_ without being asked for confirmation
 
 ```sh

package/docs/docs/cmd/spo/list/list-view-set.md

@@ -14,10 +14,13 @@ m365 spo list view set [options]
 : URL of the site where the list is located
 
 `--listId [listId]`
-: ID of the list where the view is located. Specify `listTitle` or `listId` but not both
+: ID of the list where the view is located. Specify either `listId`, `listTitle`, or `listUrl`.
 
 `--listTitle [listTitle]`
-: Title of the list where the view is located. Specify `listTitle` or `listId` but not both
+: Title of the list where the view is located. Specify either `listId`, `listTitle`, or `listUrl`.
+
+ `--listUrl [listUrl]`
+: Server- or site-relative URL of the list. Specify either `listId` , `listTitle` or `listUrl`.
 
 `--id [id]`
 : ID of the view to update. Specify `title` or `id` but not both
@@ -33,6 +36,9 @@ Specify properties to update using their names, eg. `--Title 'New Title' --JSLin
 
 When updating list formatting, the value of the CustomFormatter property must be XML-escaped, eg. `&lt;` instead of `<`.
 
+!!! warning "Escaping JSON in PowerShell"
+    When updating list view formatting for a view with the `--CustomFormatter` option, it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../../user-guide/using-cli.md#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../../user-guide/using-cli.md#passing-complex-content-into-cli-options) instead.
+
 ## Examples
 
 Update the title of the list view specified by its name
@@ -44,11 +50,19 @@ m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x -
 Update the title of the list view specified by its ID
 
 ```sh
-m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --id 330f29c5-5c4c-465f-9f4b-7903020ae1ce --Title 'All events'
+m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl '/sites/project-x/lists/Events' --id 330f29c5-5c4c-465f-9f4b-7903020ae1ce --Title 'All events'
 ```
 
 Update view formatting of the specified list view
 
-```sh
-m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --title 'All items' --CustomFormatter '`{"schema":"https://developer.microsoft.com/json-schemas/sp/view-formatting.schema.json","additionalRowClass": "=if([$DueDate] &lt;= @now, 'sp-field-severity--severeWarning', '')"}`'
-```
+=== "PowerShell"
+
+    ```sh
+    m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --viewTitle 'All items' --CustomFormatter '{\"schema\":\"https://developer.microsoft.com/json-schemas/sp/view-formatting.schema.json\",\"additionalRowClass\": \"=if([$DueDate] &lt;= @now, ''sp-field-severity--severeWarning'', '''')\"}'
+    ```
+
+=== "Bash"
+
+    ```sh
+    m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --viewTitle 'All items' --CustomFormatter "{\"schema\":\"https://developer.microsoft.com/json-schemas/sp/view-formatting.schema.json\",\"additionalRowClass\": \"=if([$DueDate] &lt;= @now, 'sp-field-severity--severeWarning', '')\"}"
+    ```

package/docs/docs/cmd/spo/list/list-webhook-set.md

@@ -31,6 +31,9 @@ m365 spo list webhook set [options]
 `-e, --expirationDateTime [expirationDateTime]`
 : The new expiration date. _Note: Expiration Time cannot be more than 6 months in future_
 
+`-c, --clientState [clientState]`
+: A client state information that will be passed through notifications.
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
@@ -51,8 +54,12 @@ Update the expiration date of a webhook with a specific ID attached to a list wi
 m365 spo list webhook set --webUrl https://contoso.sharepoint.com/sites/ninja --listTitle Documents --id cc27a922-8224-4296-90a5-ebbc54da2e81 --expirationDateTime 2018-10-09T18:15
 ```
 
-Update the notification url of a webhook with a specific ID attached to a list with a specific URL in a specific site to a specific URL and the expiration date to a specific date
+Update the notification url and clientState of a webhook with a specific ID attached to a list with a specific URL in a specific site to a specific URL and the expiration date to a specific date
 
 ```sh
-m365 spo list webhook set --webUrl https://contoso.sharepoint.com/sites/ninja --listUrl '/sites/ninja/Documents' --id cc27a922-8224-4296-90a5-ebbc54da2e81 --notificationUrl https://contoso-functions.azurewebsites.net/webhook --expirationDateTime 2019-03-02
+m365 spo list webhook set --webUrl https://contoso.sharepoint.com/sites/ninja --listUrl '/sites/ninja/Documents' --id cc27a922-8224-4296-90a5-ebbc54da2e81 --notificationUrl https://contoso-functions.azurewebsites.net/webhook --expirationDateTime 2019-03-02 --clientState 'My client state'
 ```
+
+## Respone
+
+The command won't return a response on success.

package/docs/docs/cmd/spo/listitem/listitem-list.md

@@ -11,31 +11,31 @@ m365 spo listitem list [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: URL of the site from which the item should be retrieved
+: URL of the site from which the item should be retrieved.
 
 `-i, --listId [listId]`
-: ID of the list to retrieve items from. Specify `listId` or `listTitle` but not both
+: ID of the list to retrieve items from. Specify `listId` or `listTitle` but not both.
 
 `-l, --listId [listId]`
-: ID of the list where the item should be added. Specify either `listTitle`, `listId` or `listUrl`
+: ID of the list where the item should be added. Specify either `listTitle`, `listId`, or `listUrl` but not multiple.
 
 `-t, --listTitle [listTitle]`
-: Title of the list where the item should be added. Specify either `listTitle`, `listId` or `listUrl`
+: Title of the list where the item should be added. Specify either `listTitle`, `listId`, or `listUrl` but not multiple.
 
 `-q, --camlQuery [camlQuery]`
-: CAML query to use to query the list of items with
+: CAML query to use to query the list of items with.
 
 `-f, --fields [fields]`
-: Comma-separated list of fields to retrieve. Will retrieve all fields if not specified and json output is requested. Specify `camlQuery` or `fields` but not both
+: Comma-separated list of fields to retrieve. Will retrieve all fields if not specified and json output is requested. Specify `camlQuery` or `fields` but not both.
 
 `-l, --filter [filter]`
-: OData filter to use to query the list of items with. Specify `camlQuery` or `filter` but not both
+: OData filter to use to query the list of items with. Specify `camlQuery` or `filter` but not both.
 
 `-p, --pageSize [pageSize]`
-: Number of list items to return. Specify `camlQuery` or `pageSize` but not both
+: Number of list items to return. Specify `camlQuery` or `pageSize` but not both.
 
 `-n, --pageNumber [pageNumber]`
-: Page number to return if `pageSize` is specified (first page is indexed as value of 0)
+: Page number to return if `pageSize` is specified (first page is indexed as value of 0).
 
 --8<-- "docs/cmd/_global.md"
 

package/docs/docs/cmd/spo/listitem/listitem-roleassignment-remove.md

@@ -11,31 +11,31 @@ m365 spo listitem roleassignment remove [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: URL of the site where the listitem is located
+: URL of the site where the listitem is located.
 
 `-i, --listId [listId]`
-: ID of the list. Specify either listId, listTitle or listUrl but not multiple.
+: ID of the list. Specify either `listId`, `listTitle`, or `listUrl` but not multiple.
 
 `-t, --listTitle [listTitle]`
-: Title of the list. Specify either listId, listTitle or listUrl but not multiple.
+: Title of the list. Specify either `listId`, `listTitle`, or `listUrl` but not multiple.
 
 `--listUrl [listUrl]`
-: Relative URL of the list. Specify either listId, listTitle or listUrl but not multiple.
+: Relative URL of the list. Specify either `listId`, `listTitle`, or `listUrl` but not multiple.
 
 `--listItemId <listItemId>`
 : Id of the listitem to remove the role from.
 
 `--principalId [principalId]`
-: SharePoint ID of principal it may be either user id or group id we want to remove permissions Specify principalId only when upn or groupName are not used.
+: SharePoint ID of principal it may be either user id or group id we want to remove permissions. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--upn [upn]`
-: upn/email of user. Specify either upn or principalId.
+: upn/email of user. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--groupName [groupName]`
-: enter group name of Azure AD or SharePoint group. Specify either groupName or principalId.
+: enter group name of Azure AD or SharePoint group. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--confirm`
-: Don't prompt for confirming removing the role assignment
+: Don't prompt for confirming removing the role assignment.
 
 --8<-- "docs/cmd/_global.md"
 

package/docs/docs/cmd/spo/page/page-clientsidewebpart-add.md

@@ -11,31 +11,31 @@ m365 spo page clientsidewebpart add [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: URL of the site where the page to add the web part to is located
+: URL of the site where the page to add the web part to is located.
 
 `-n, --pageName <pageName>`
-: Name of the page to which add the web part
+: Name of the page to which add the web part.
 
 `--standardWebPart [standardWebPart]`
-: Name of the standard web part to add (see the possible values below)
+: Name of the standard web part to add (see the possible values below). Specify either `standardWebPart` or `webPartId` but not both.
 
 `--webPartId [webPartId]`
-: ID of the custom web part to add
+: ID of the custom web part to add. Specify either `standardWebPart` or `webPartId` but not both.
 
 `--webPartProperties [webPartProperties]`
-: JSON string with web part properties to set on the web part. Specify `webPartProperties` or `webPartData` but not both
+: JSON string with web part properties to set on the web part. Specify `webPartProperties` or `webPartData` but not both.
 
 `--webPartData [webPartData]`
-: JSON string with web part data as retrieved from the web part maintenance mode. Specify `webPartProperties` or `webPartData` but not both
+: JSON string with web part data as retrieved from the web part maintenance mode. Specify `webPartProperties` or `webPartData` but not both.
 
 `--section [section]`
-: Number of the section to which the web part should be added (1 or higher)
+: Number of the section to which the web part should be added (1 or higher).
 
 `--column [column]`
-: Number of the column in which the web part should be added (1 or higher)
+: Number of the column in which the web part should be added (1 or higher).
 
 `--order [order]`
-: Order of the web part in the column
+: Order of the web part in the column.
 
 --8<-- "docs/cmd/_global.md"
 
@@ -45,7 +45,8 @@ If the specified `pageName` doesn't refer to an existing modern page, you will g
 
 To add a standard web part to the page, specify one of the following values: _ContentRollup, BingMap, ContentEmbed, DocumentEmbed, Image, ImageGallery, LinkPreview, NewsFeed, NewsReel, PowerBIReportEmbed, QuickChart, SiteActivity, VideoEmbed, YammerEmbed, Events, GroupCalendar, Hero, List, PageTitle, People, QuickLinks, CustomMessageRegion, Divider, MicrosoftForms, Spacer_.
 
-When specifying the JSON string with web part properties on Windows, you have to escape double quotes in a specific way. Considering the following value for the _webPartProperties_ option: `{"Foo":"Bar"}`, you should specify the value as \`"{""Foo"":""Bar""}"\`. In addition, when using PowerShell, you should use the `--%` argument.
+!!! warning "Escaping JSON in PowerShell"
+    When using the `--webPartProperties` option it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../../user-guide/using-cli.md#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../../user-guide/using-cli.md#passing-complex-content-into-cli-options) instead.
 
 ## Examples
 
@@ -67,20 +68,14 @@ Add a custom web part to the modern page
 m365 spo page clientsidewebpart add --webUrl https://contoso.sharepoint.com/sites/a-team --pageName page.aspx --webPartId 3ede60d3-dc2c-438b-b5bf-cc40bb2351e1
 ```
 
-Using PowerShell, add the standard Bing Map web part with the specific properties to a modern page
-
-```PowerShell
-m365 --% spo page clientsidewebpart add --webUrl https://contoso.sharepoint.com/sites/a-team --pageName page.aspx --standardWebPart BingMap --webPartProperties `"{""Title"":""Foo location""}"`
-```
-
-Using Windows command line, add the standard Bing Map web part with the specific properties to a modern page
+Add the standard Bing Map web part with the specific properties to a modern page
 
 ```sh
-m365 spo page clientsidewebpart add --webUrl https://contoso.sharepoint.com/sites/a-team --pageName page.aspx --standardWebPart BingMap --webPartProperties `"{""Title"":""Foo location""}"`
+m365 spo page clientsidewebpart add --webUrl https://contoso.sharepoint.com/sites/a-team --pageName page.aspx --standardWebPart BingMap --webPartProperties '{"Title":"Foo location"}'
 ```
 
 Add the standard Image web part with the preconfigured image
 
 ```sh
-m365 spo page clientsidewebpart add --webUrl https://contoso.sharepoint.com/sites/a-team --pageName page.aspx --standardWebPart Image --webPartData '`{ "dataVersion": "1.8", "serverProcessedContent": {"htmlStrings":{},"searchablePlainTexts":{"captionText":""},"imageSources":{"imageSource":"/sites/team-a/SiteAssets/work-life-balance.png"},"links":{}}, "properties": {"imageSourceType":2,"altText":"a group of people on a beach","overlayText":"Work life balance","fileName":"48146-OFF12_Justice_01.png","siteId":"27664b85-067d-4be9-a7d7-89b2e804d09f","webId":"a7664b85-067d-4be9-a7d7-89b2e804d09f","listId":"37664b85-067d-4be9-a7d7-89b2e804d09f","uniqueId":"67664b85-067d-4be9-a7d7-89b2e804d09f","imgWidth":650,"imgHeight":433,"fixAspectRatio":false,"isOverlayTextEnabled":true}}`'
+m365 spo page clientsidewebpart add --webUrl https://contoso.sharepoint.com/sites/a-team --pageName page.aspx --standardWebPart Image --webPartData '{ "dataVersion": "1.8", "serverProcessedContent": {"htmlStrings":{},"searchablePlainTexts":{"captionText":""},"imageSources":{"imageSource":"/sites/team-a/SiteAssets/work-life-balance.png"},"links":{}}, "properties": {"imageSourceType":2,"altText":"a group of people on a beach","overlayText":"Work life balance","fileName":"48146-OFF12_Justice_01.png","siteId":"27664b85-067d-4be9-a7d7-89b2e804d09f","webId":"a7664b85-067d-4be9-a7d7-89b2e804d09f","listId":"37664b85-067d-4be9-a7d7-89b2e804d09f","uniqueId":"67664b85-067d-4be9-a7d7-89b2e804d09f","imgWidth":650,"imgHeight":433,"fixAspectRatio":false,"isOverlayTextEnabled":true}}'
 ```

package/docs/docs/cmd/spo/page/page-control-set.md

@@ -31,7 +31,8 @@ m365 spo page control set [options]
 
 If the specified `pageName` doesn't refer to an existing modern page, you will get a `File doesn't exists` error.
 
-When specifying the JSON string with web part properties on Windows, you have to escape double quotes in a specific way. Considering the following value for the _webPartProperties_ option: `{"Foo":"Bar"}`, you should specify the value as \`"{""Foo"":""Bar""}"\`. In addition, when using PowerShell, you should use the `--%` argument.
+!!! warning "Escaping JSON in PowerShell"
+    When using the `--webPartProperties` option it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../../user-guide/using-cli.md#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../../user-guide/using-cli.md#passing-complex-content-into-cli-options) instead.
 
 ## Examples
 

package/docs/docs/cmd/spo/{hubsite/hubsite-theme-sync.md → site/site-hubsite-theme-sync.md}

@@ -1,11 +1,11 @@
-# spo hubsite theme sync
+# spo site hubsite theme sync
 
-Applies any theme updates from the parent hub site.
+Applies any theme updates from the hub site the site is connected to.
 
 ## Usage
 
 ```sh
-m365 spo hubsite theme sync [options]
+m365 spo site hubsite theme sync [options]
 ```
 
 ## Options
@@ -22,10 +22,10 @@ m365 spo hubsite theme sync [options]
 
 ## Examples
 
-Applies any theme updates from the parent hub site to the site with URL https://contoso.sharepoint.com/sites/project-x
+Applies any theme updates from the hub site to a specific site
 
 ```sh
-m365 spo hubsite theme sync --webUrl https://contoso.sharepoint.com/sites/project-x
+m365 spo site hubsite theme sync --webUrl https://contoso.sharepoint.com/sites/project-x
 ```
 
 ## More information

package/docs/docs/cmd/spo/sitedesign/sitedesign-get.md

@@ -11,10 +11,10 @@ m365 spo sitedesign get [options]
 ## Options
 
 `-i, --id [id]`
-: Site design ID. Specify either id or title but not both
+: Site design ID. Specify either `id` or `title` but not both.
 
 `--title [title]`
-: Site design title. Specify either id or title but not both
+: Site design title. Specify either `id` or `title` but not both.
 
 --8<-- "docs/cmd/_global.md"
 

package/docs/docs/cmd/spo/term/term-add.md

@@ -45,6 +45,11 @@ m365 spo term add [options]
 !!! important
     To use this command you have to have permissions to access the tenant admin site.
 
+## Remarks
+
+!!! warning "Escaping JSON in PowerShell"
+    When using the `--customProperties` and/or `--localCustomProperties` options it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../../user-guide/using-cli.md#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../../user-guide/using-cli.md#passing-complex-content-into-cli-options) instead.
+
 ## Examples
 
 Add taxonomy term with the specified name to the term group and term set specified by their names

package/docs/docs/cmd/spo/term/term-set-add.md

@@ -33,6 +33,11 @@ m365 spo term set add [options]
 !!! important
     To use this command you have to have permissions to access the tenant admin site.
 
+## Remarks
+
+!!! warning "Escaping JSON in PowerShell"
+    When using the `--customProperties` option it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../../user-guide/using-cli.md#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../../user-guide/using-cli.md#passing-complex-content-into-cli-options) instead.
+
 ## Examples
 
 Add taxonomy term set to the term group specified by ID
@@ -56,5 +61,5 @@ m365 spo term set add --name PnP-Organizations --termGroupId 0e8f395e-ff58-4d45-
 Add taxonomy term set and set its custom properties
 
 ```sh
-m365 spo term set add --name PnP-Organizations --termGroupId 0e8f395e-ff58-4d45-9ff7-e331ab728beb --customProperties '`{"Property":"Value"}`'
+m365 spo term set add --name PnP-Organizations --termGroupId 0e8f395e-ff58-4d45-9ff7-e331ab728beb --customProperties '{"Property":"Value"}'
 ```

package/docs/docs/cmd/spo/web/web-roleassignment-add.md

@@ -11,22 +11,22 @@ m365 spo web roleassignment add [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: URL of the site
+: URL of the site.
 
 `--principalId [principalId]`
-: SharePoint ID of principal it may be either user id or group id we want to add permissions to. Specify principalId only when upn or groupName are not used.
+: SharePoint ID of principal it may be either user id or group id we want to add permissions to. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--upn [upn]`
-: upn/email of user to assign role to. Specify either upn or principalId
+: upn/email of user to assign role to. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--groupName [groupName]`
-: enter group name of Azure AD or SharePoint group.. Specify either groupName or principalId
+: enter group name of Azure AD or SharePoint group. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--roleDefinitionId [roleDefinitionId]`
-: ID of role definition. Specify either roleDefinitionId or roleDefinitionName but not both
+: ID of role definition. Specify either `roleDefinitionId` or `roleDefinitionName` but not both.
 
 `--roleDefinitionName [roleDefinitionName]`
-: enter the name of a role definition, like 'Contribute', 'Read', etc. Specify either roleDefinitionId or roleDefinitionName but not both
+: enter the name of a role definition, like 'Contribute', 'Read', etc. Specify either `roleDefinitionId` or `roleDefinitionName` but not both.
 
 --8<-- "docs/cmd/_global.md"
 

package/docs/docs/cmd/spo/web/web-roleassignment-remove.md

@@ -11,16 +11,16 @@ m365 spo web roleassignment remove [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: URL of the site
+: URL of the site.
 
 `--principalId [principalId]`
-: SharePoint ID of principal it may be either user id or group id we want to add permissions to. Specify principalId only when upn or groupName are not used.
+: SharePoint ID of principal it may be either user id or group id we want to add permissions to. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--upn [upn]`
-: Upn/email of user to assign role to. Specify upn only when principalId or groupName are not used.
+: Upn/email of user to assign role to. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--groupName [groupName]`
-: Enter group name of Azure AD or SharePoint group. Specify groupName only when principalId or upn are not used.
+: Enter group name of Azure AD or SharePoint group. Specify either `principalId`, `upn`, or `groupName` but not multiple.
 
 `--confirm [confirm]`
 : Don't prompt for confirming removing the roleassignment.

package/docs/docs/cmd/teams/channel/channel-get.md

@@ -10,20 +10,20 @@ m365 teams channel get [options]
 
 ## Options
 
-`-i, --teamId [teamId]`
-: The ID of the team to which the channel belongs to. Specify either teamId or teamName but not both
+`--teamId [teamId]`
+: The ID of the team to which the channel belongs to. Specify either `teamId` or `teamName` but not both.
 
 `--teamName [teamName]`
-: The display name of the team to which the channel belongs to. Specify either teamId or teamName but not both
+: The display name of the team to which the channel belongs to. Specify either `teamId` or `teamName` but not both.
 
-`-c, --id [id]`
-: The ID of the channel for which to retrieve more information. Specify either id or name but not both
+`-i, --id [id]`
+: The ID of the channel for which to retrieve more information. Specify either `id` or `name` but not both.
 
 `--name [name]`
-: The display name of the channel for which to retrieve more information. Specify either id or name but not both
+: The display name of the channel for which to retrieve more information. Specify either `id` or `name` but not both.
 
 `--primary`
-: Gets the default channel, General, of a team. If specified, id or name are not needed
+: Gets the default channel, General, of a team. If specified, id or name are not needed.
 
 --8<-- "docs/cmd/_global.md"
 

package/docs/docs/cmd/teams/channel/channel-remove.md

@@ -10,17 +10,20 @@ m365 teams channel remove [options]
 
 ## Options
 
-`-c, --id [id]`
-: The ID of the channel to remove
+`--teamId [teamId]`
+: The ID of the team to which the channel to remove belongs. Specify either `teamId` or `teamName` but not both.
 
-`-n, --name [name]`
-: The name of the channel to remove. Specify id or name but not both
+`--teamName [teamName]`
+: The display name of the team to which the channel to remove belongs. Specify either `teamId` or `teamName` but not both.
+
+`-i, --id [id]`
+: The ID of the channel to remove. Specify `id` or `name` but not both.
 
-`-i, --teamId <teamId>`
-: The ID of the team to which the channel to remove belongs
+`-n, --name [name]`
+: The name of the channel to remove. Specify `id` or `name` but not both.
 
 `--confirm`
-: Don't prompt for confirmation
+: Don't prompt for confirmation.
 
 --8<-- "docs/cmd/_global.md"
 
@@ -45,13 +48,13 @@ m365 teams channel remove --id 19:f3dcbb1674574677abcae89cb626f1e6@thread.skype
 Remove the specified Microsoft Teams channel by Name
 
 ```sh
-m365 teams channel remove --name 'name' --teamId d66b8110-fcad-49e8-8159-0d488ddb7656
+m365 teams channel remove --name 'name' --teamName "Team Name"
 ```
 
 Remove the specified Microsoft Teams channel by Name without confirmation
 
 ```sh
-m365 teams channel remove --name 'name' --teamId d66b8110-fcad-49e8-8159-0d488ddb7656 --confirm 
+m365 teams channel remove --name 'name' --teamName "Team Name" --confirm 
 ```
 
 ## More information

package/docs/docs/cmd/teams/channel/channel-set.md

@@ -10,17 +10,23 @@ m365 teams channel set [options]
 
 ## Options
 
-`-i, --teamId <teamId>`
-: The ID of the team where the channel to update is located
+`--teamId [teamId]`
+: The ID of the team where the channel to update is located. Specify either `teamId` or `teamName` but not both.
 
-`--name <name>`
-: The name of the channel to update
+`--teamName [teamName]`
+: The display name of the team where the channel to update is located. Specify either `teamId` or `teamName` but not both.
+
+`-i, --id [id]`
+: The ID of the channel to update. Specify either `id` or `name` but not both.
+
+`--name [name]`
+: The name of the channel to update. Specify either `id` or `name` but not both.
 
 `--newName [newName]`
-: The new name of the channel
+: The new name of the channel.
 
 `--description [description]`
-: The description of the channel
+: The description of the channel.
 
 --8<-- "docs/cmd/_global.md"
 
@@ -37,3 +43,4 @@ Set new display name for the specified channel in the given Microsoft Teams team
 ```sh
 m365 teams channel set --teamId "00000000-0000-0000-0000-000000000000" --name Reviews --newName Projects
 ```
+