@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.80d195f

package/docs/docs/cmd/booking/business/business-list.md

@@ -0,0 +1,21 @@
+# booking business list
+
+Lists all Microsoft Bookings businesses that are created for the tenant.
+
+## Usage
+
+```sh
+m365 booking business list [options]
+```
+
+## Options
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Returns a list of all Microsoft Bookings businesses that are created for the tenant.
+
+```sh
+m365 booking business list
+```

package/docs/docs/cmd/flow/flow-disable.md

@@ -13,7 +13,7 @@ m365 flow disable [options]
 `-n, --name <name>`
 : The name of the Power Automate flow to disable
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment for which to disable Power Automate flow
 
 `--asAdmin`
@@ -37,11 +37,11 @@ If the Power Automate flow with the name you specified doesn't exist, you will g
 Disables Power Automate flow owned by the currently signed-in user
 
 ```sh
-m365 flow disable --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d
+m365 flow disable --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d
 ```
 
 Disables Power Automate flow owned by another user
 
 ```sh
-m365 flow disable --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --asAdmin
+m365 flow disable --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --asAdmin
 ```

package/docs/docs/cmd/flow/flow-enable.md

@@ -13,7 +13,7 @@ m365 flow enable [options]
 `-n, --name <name>`
 : The name of the Power Automate flow to enable
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment for which to enable Power Automate
 
 `--asAdmin`

package/docs/docs/cmd/flow/flow-export.md

@@ -13,7 +13,7 @@ m365 flow export [options]
 `-i, --id <id>`
 : The id of the Power Automate flow to export
 
-`-e, --environment <environment>`
+`-e, --environmentNameName <environmentName>`
 : The name of the environment for which to export the flow
 
 `-n, --packageDisplayName [packageDisplayName]`
@@ -50,23 +50,23 @@ If the Power Automate flow with the id you specified doesn't exist, you will get
 Export the specified Power Automate flow as a ZIP file
 
 ```sh
-m365 flow export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d
+m365 flow export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d
 ```
 
 Export the specified Power Automate flow as a JSON file
 
 ```sh
-m365 flow export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --format json
+m365 flow export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --format json
 ```
 
 Export the specified Power Automate flow as a ZIP file, specifying a Display Name of 'My flow name' to be embedded into the package
 
 ```sh
-m365 flow export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName 'My flow name'
+m365 flow export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName 'My flow name'
 ```
 
 Export the specified Power Automate flow as a ZIP file with the filename 'MyFlow.zip' saved to the current directory
 
 ```sh
-m365 flow export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --path './MyFlow.zip'
+m365 flow export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --path './MyFlow.zip'
 ```

package/docs/docs/cmd/flow/flow-get.md

@@ -13,7 +13,7 @@ m365 flow get [options]
 `-n, --name <name>`
 : The name of the Power Automate flow to get information about
 
-`-e, --environment <environment>`
+`-e, --environmentNameName <environmentName>`
 : The name of the environment for which to retrieve available flows
 
 `--asAdmin`
@@ -37,11 +37,11 @@ If the Power Automate flow with the name you specified doesn't exist, you will g
 Get information about the specified Power Automate flow owned by the currently signed-in user
 
 ```sh
-m365 flow get --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d
+m365 flow get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d
 ```
 
 Get information about the specified Power Automate flow owned by another user
 
 ```sh
-m365 flow get --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --asAdmin
+m365 flow get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --asAdmin
 ```

package/docs/docs/cmd/flow/flow-list.md

@@ -10,7 +10,7 @@ m365 flow list [options]
 
 ## Options
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment for which to retrieve available flows
 
 `--asAdmin`
@@ -32,11 +32,11 @@ By default, the `flow list` command returns only your flows. To list all flows,
 List all your flows in the given environment
 
 ```sh
-m365 flow list --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5
+m365 flow list --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
 ```
 
 List all flows in the given environment
 
 ```sh
-m365 flow list --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --asAdmin
+m365 flow list --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --asAdmin
 ```

package/docs/docs/cmd/flow/flow-remove.md

@@ -13,7 +13,7 @@ m365 flow remove [options]
 `-n, --name <name>`
 : The name of the Power Automate flow to remove
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment to which the flow belongs
 
 `--asAdmin`
@@ -37,23 +37,23 @@ If the Power Automate flow with the name you specified doesn't exist, you will g
 Removes the specified Power Automate flow owned by the currently signed-in user
 
 ```sh
-m365 flow remove --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d
+m365 flow remove --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d
 ```
 
 Removes the specified Power Automate flow owned by the currently signed-in user without confirmation
 
 ```sh
-m365 flow remove --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --confirm
+m365 flow remove --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --confirm
 ```
 
 Removes the specified Power Automate flow owned by another user
 
 ```sh
-m365 flow remove --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --asAdmin
+m365 flow remove --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --asAdmin
 ```
 
 Removes the specified Power Automate flow owned by another user without confirmation
 
 ```sh
-m365 flow remove --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --asAdmin --confirm
+m365 flow remove --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --asAdmin --confirm
 ```

package/docs/docs/cmd/flow/run/run-cancel.md

@@ -13,10 +13,10 @@ m365 flow run cancel [options]
 `-n, --name <name>`
 : The name of the run to cancel
 
-`-f, --flow <flow>`
+`-f, --flowName <flowName>`
 : The name of the flow to cancel the run for
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment where the flow is located
 
 --8<-- "docs/cmd/_global.md"
@@ -37,5 +37,5 @@ If the run with the name you specified doesn't exist, you will get the `The work
 Cancel the given run of the specified flow
 
 ```sh
-m365 flow run cancel --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flow 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62
+m365 flow run cancel --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62
 ```

package/docs/docs/cmd/flow/run/run-get.md

@@ -13,10 +13,10 @@ m365 flow run get [options]
 `-n, --name <name>`
 : The name of the run to get information about
 
-`-f, --flow <flow>`
+`-f, --flowName <flowName>`
 : The name of the Power Automate flow for which to retrieve information
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment where the flow is located
 
 --8<-- "docs/cmd/_global.md"
@@ -37,5 +37,5 @@ If the run with the name you specified doesn't exist, you will get the `The prov
 Get information about the given run of the specified Power Automate flow
 
 ```sh
-m365 flow run get --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flow 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62
+m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62
 ```

package/docs/docs/cmd/flow/run/run-list.md

@@ -10,10 +10,10 @@ m365 flow run list [options]
 
 ## Options
 
-`-f, --flow <flow>`
+`-f, --flowName <flowName>`
 : The name of the Microsoft Flow to retrieve the runs for
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment to which the flow belongs
 
 --8<-- "docs/cmd/_global.md"
@@ -32,5 +32,5 @@ If the Microsoft Flow with the name you specified doesn't exist, you will get th
 List runs of the specified Microsoft Flow
 
 ```sh
-m365 flow run list --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flow 5923cb07-ce1a-4a5c-ab81-257ce820109a
+m365 flow run list --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a
 ```

package/docs/docs/cmd/flow/run/run-resubmit.md

@@ -13,10 +13,10 @@ m365 flow run resubmit [options]
 `-n, --name <name>`
 : The name of the run to resubmit
 
-`-f, --flow <flow>`
+`-f, --flowName <flowName>`
 : The name of the flow to resubmit the run for
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment where the Flow is located
 
 `--confirm`
@@ -40,11 +40,11 @@ If the run with the name you specified doesn't exist, you will get the `The work
 Resubmits a specific flow run for the specified Microsoft Flow
 
 ```sh
-m365 flow run resubmit --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flow 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62
+m365 flow run resubmit --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62
 ```
 
 Resubmits a specific flow run for the specified Microsoft Flow without prompting for confirmation
 
 ```sh
-m365 flow run resubmit --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flow 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --confirm
+m365 flow run resubmit --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --confirm
 ```

package/docs/docs/cmd/outlook/message/message-move.md

@@ -10,7 +10,7 @@ m365 outlook message move [options]
 
 ## Options
 
-`--messageId <messageId>`
+`--id <id>`
 : ID of the message to move
 
 `--sourceFolderName [sourceFolderName]`
@@ -32,20 +32,20 @@ m365 outlook message move [options]
 Move the specified message to another folder specified by ID
 
 ```sh
-m365 outlook message move --messageId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALdyzhHAAA= --sourceFolderId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OAAuAAAAAAAiQ8W967B7TKBjgx9rVEURAQAiIsqMbYjsT5e-T7KzowPTAAAAAAEKAAA= --targetFolderId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OAAuAAAAAAAiQ8W967B7TKBjgx9rVEURAQAiIsqMbYjsT5e-T7KzowPTAAAeUO-fAAA=
+m365 outlook message move --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALdyzhHAAA= --sourceFolderId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OAAuAAAAAAAiQ8W967B7TKBjgx9rVEURAQAiIsqMbYjsT5e-T7KzowPTAAAAAAEKAAA= --targetFolderId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OAAuAAAAAAAiQ8W967B7TKBjgx9rVEURAQAiIsqMbYjsT5e-T7KzowPTAAAeUO-fAAA=
 ```
 
 Move the specified message to another folder specified by name
 
 ```sh
-m365 outlook message move --messageId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALdyzhHAAA= --sourceFolderName Inbox --targetFolderName "Project X"
+m365 outlook message move --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALdyzhHAAA= --sourceFolderName Inbox --targetFolderName "Project X"
 ```
 
 Move the specified message to another folder specified by its well-known
 name
 
 ```sh
-m365 outlook message move --messageId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALdyzhHAAA= --sourceFolderName inbox --targetFolderName archive
+m365 outlook message move --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALdyzhHAAA= --sourceFolderName inbox --targetFolderName archive
 ```
 
 ## More information

package/docs/docs/cmd/pa/connector/connector-export.md

@@ -16,7 +16,7 @@ m365 flow connector export
 
 ## Options
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment where the custom connector to export is located
 
 `-c, --connector <connector>`
@@ -39,11 +39,11 @@ If no output folder has been specified, the `pa connector export` command will c
 Export the specified custom connector
 
 ```sh
-m365 pa connector export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --connector shared_connector-201-5f20a1f2d8d6777a75-5fa602f410652f4dfa
+m365 pa connector export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --connector shared_connector-201-5f20a1f2d8d6777a75-5fa602f410652f4dfa
 ```
 
 Export the specified custom connector to the specific directory
 
 ```sh
-m365 pa connector export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --connector shared_connector-201-5f20a1f2d8d6777a75-5fa602f410652f4dfa --outputFolder connector
+m365 pa connector export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --connector shared_connector-201-5f20a1f2d8d6777a75-5fa602f410652f4dfa --outputFolder connector
 ```

package/docs/docs/cmd/pa/connector/connector-list.md

@@ -16,7 +16,7 @@ m365 flow connector list
 
 ## Options
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment for which to retrieve custom connectors
 
 --8<-- "docs/cmd/_global.md"
@@ -31,5 +31,5 @@ m365 flow connector list
 List all custom connectors in the given environment
 
 ```sh
-m365 pa connector list --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5
+m365 pa connector list --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
 ```

package/docs/docs/cmd/pa/solution/solution-reference-add.md

@@ -10,7 +10,7 @@ m365 pa solution reference add [options]
 
 ## Options
 
-`-p, --path <path>`
+`-p, --projectPath <projectPath>`
 : The path to the referenced project
 
 --8<-- "docs/cmd/_global.md"
@@ -26,7 +26,7 @@ The CDS solution project and the PowerApps component framework project cannot ha
 Adds a reference inside the CDS Solution project in the current directory to the PowerApps component framework project at `./projects/ExampleProject`
 
 ```sh
-m365 pa solution reference add --path ./projects/ExampleProject
+m365 pa solution reference add --projectPath ./projects/ExampleProject
 ```
 
 ## More information

package/docs/docs/cmd/search/externalconnection/externalconnection-remove.md

@@ -0,0 +1,40 @@
+# search externalconnection remove
+
+Allow the administrator to remove a specific external connection used in Microsoft Search.
+
+## Usage
+
+```sh
+m365 search externalconnection remove [options]
+```
+
+## Options
+
+`-i, --id [id]`
+: ID of the External Connection to remove. Specify either `id` or `name`
+
+`-n, --name [name]`
+: Name of the External Connection to remove. Specify either `id` or `name`
+
+`--confirm`
+: Don't prompt for confirming removing the connection
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+If the command finds multiple external connections used in Microsoft Search with the specified name, it will prompt you to disambiguate which external connection it should remove, listing the discovered IDs.
+
+## Examples
+
+Removes external connection with id _MyApp_
+
+```sh
+m365 search externalconnection remove --id "MyApp"
+```
+
+Removes external connection with name _Test_. Will NOT prompt for confirmation before removing.
+
+```sh
+m365 search externalconnection remove --name "Test" --confirm
+```

package/docs/docs/cmd/spfx/package/package-generate.md

@@ -16,7 +16,7 @@ m365 spfx package generate
 `-d, --webPartDescription <webPartDescription>`
 : Description of the web part to generate. Displayed in the tool box when adding web part to page
 
-`-n, --packageName <packageName>`
+`-n, --name <name>`
 : Name of the package to generate. Used among others for the .sppkg file. Must be unique in the app catalog to avoid collisions with other solutions.
 
 `--html <html>`
@@ -54,5 +54,5 @@ m365 spfx package generate
 Generate a web part that shows the weather for Amsterdam. Load web part contents from a local file. Allow the web part to be deployed to all sites. Expose the web part in Teams as a personal tab.
 
 ```sh
-m365 spfx package generate --webPartTitle "Amsterdam weather" --webPartDescription "Shows weather in Amsterdam" --packageName amsterdam-weather --html @amsterdam-weather.html --allowTenantWideDeployment --enableForTeams all
+m365 spfx package generate --webPartTitle "Amsterdam weather" --webPartDescription "Shows weather in Amsterdam" --name amsterdam-weather --html @amsterdam-weather.html --allowTenantWideDeployment --enableForTeams all
 ```

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

@@ -16,7 +16,7 @@ m365 spo app add [options]
 `--overwrite`
 : Set to overwrite the existing package file
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 `-u, --appCatalogUrl [appCatalogUrl]`
@@ -51,7 +51,7 @@ m365 spo app add --filePath sharepoint/solution/spfx.sppkg --overwrite
 Add the _spfx.sppkg_ package to the site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_
 
 ```sh
-m365 spo app add --filePath c:\spfx.sppkg --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
+m365 spo app add --filePath c:\spfx.sppkg --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-deploy.md

@@ -22,7 +22,7 @@ m365 spo app deploy [options]
 `--skipFeatureDeployment`
 : If the app supports tenant-wide deployment, deploy it to the whole tenant
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 --8<-- "docs/cmd/_global.md"
@@ -46,7 +46,7 @@ m365 spo app deploy --id 058140e3-0e37-44fc-a1d3-79c487d371a3
 Deploy the specified app in the site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_
 
 ```sh
-m365 spo app deploy --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
+m365 spo app deploy --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
 ```
 
 Deploy the app with the specified name in the tenant app catalog. Try to resolve the URL of the tenant app catalog automatically.

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

@@ -19,7 +19,7 @@ m365 spo app get [options]
 `-u, --appCatalogUrl [appCatalogUrl]`
 : URL of the tenant or site collection app catalog. It must be specified when the scope is `sitecollection`
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 --8<-- "docs/cmd/_global.md"
@@ -53,7 +53,7 @@ m365 spo app get --name solution.sppkg --appCatalogUrl https://contoso.sharepoin
 Return details about the app with ID _b2307a39-e878-458b-bc90-03bc578531d6_ available in the site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_.
 
 ```sh
-m365 spo app get --id b2307a39-e878-458b-bc90-03bc578531d6 --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
+m365 spo app get --id b2307a39-e878-458b-bc90-03bc578531d6 --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-install.md

@@ -16,7 +16,7 @@ m365 spo app install [options]
 `-s, --siteUrl <siteUrl>`
 : Absolute URL of the site to install the app in
 
-`--scope [scope]`
+`--appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 --8<-- "docs/cmd/_global.md"
@@ -36,7 +36,7 @@ m365 spo app install --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https:/
 Install the app with ID _b2307a39-e878-458b-bc90-03bc578531d6_ in the _https://contoso.sharepoint.com_ site from site collection app catalog.
 
 ```sh
-m365 spo app install --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --scope sitecollection
+m365 spo app install --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --appCatalogScope sitecollection
 ```
 
 ## More information

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

@@ -10,7 +10,7 @@ m365 spo app list [options]
 
 ## Options
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Target app catalog. `tenant,sitecollection`. Default `tenant`
 
 `-u, --appCatalogUrl [appCatalogUrl]`
@@ -37,7 +37,7 @@ m365 spo app list
 Return the list of available apps from a site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_.
 
 ```sh
-m365 spo app list --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
+m365 spo app list --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-remove.md

@@ -16,7 +16,7 @@ m365 spo app remove [options]
 `-u, --appCatalogUrl [appCatalogUrl]`
 : URL of the tenant or site collection app catalog. It must be specified when the scope is `sitecollection`
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 `--confirm`
@@ -55,7 +55,7 @@ m365 spo app remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --appCatalogUrl ht
 Remove the specified app from a site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_.
 
 ```sh
-m365 spo app remove --id d95f8c94-67a1-4615-9af8-361ad33be93c --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1/AppCatalog
+m365 spo app remove --id d95f8c94-67a1-4615-9af8-361ad33be93c --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1/AppCatalog
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-retract.md

@@ -16,7 +16,7 @@ m365 spo app retract [options]
 `-u, --appCatalogUrl [appCatalogUrl]`
 : URL of the tenant or site collection app catalog. It must be specified when the scope is `sitecollection`
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 `--confirm`
@@ -55,7 +55,7 @@ m365 spo app retract --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --confirm
 Retract the specified app from a site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_.
 
 ```sh
-m365 spo app retract --id d95f8c94-67a1-4615-9af8-361ad33be93c --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
+m365 spo app retract --id d95f8c94-67a1-4615-9af8-361ad33be93c --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-uninstall.md

@@ -16,7 +16,7 @@ m365 spo app uninstall [options]
 `-s, --siteUrl <siteUrl>`
 : Absolute URL of the site to uninstall the app from
 
-`--scope [scope]`
+`--appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 `--confirm`
@@ -45,7 +45,7 @@ m365 spo app uninstall --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https
 Uninstall the app with ID _b2307a39-e878-458b-bc90-03bc578531d6_ from the _https://contoso.sharepoint.com_ site where the app is deployed to the site collection app catalog of _https://contoso.sharepoint.com_.
 
 ```sh
-m365 spo app uninstall --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --scope sitecollection
+m365 spo app uninstall --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --appCatalogScope sitecollection
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-upgrade.md

@@ -16,7 +16,7 @@ m365 spo app upgrade [options]
 `-s, --siteUrl <siteUrl>`
 : Absolute URL of the site to upgrade the app in
 
-`--scope [scope]`
+`--appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 --8<-- "docs/cmd/_global.md"
@@ -36,7 +36,7 @@ m365 spo app upgrade --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https:/
 Upgrade the app with ID _b2307a39-e878-458b-bc90-03bc578531d6_ in the _https://contoso.sharepoint.com_ site from site collection app catalog.
 
 ```sh
-m365 spo app upgrade --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --scope sitecollection
+m365 spo app upgrade --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --appCatalogScope sitecollection
 ```
 
 ## More information

package/docs/docs/cmd/spo/apppage/apppage-set.md

@@ -13,7 +13,7 @@ m365 spo apppage set [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the page to update is located
 
-`-n, --pageName <pageName>`
+`-n, --name <name>`
 : The name of the page to be updated, eg. page.aspx
 
 `-d, --webPartData <webPartData>`
@@ -26,5 +26,5 @@ m365 spo apppage set [options]
 Updates the single-part app page located in a site with url https://contoso.sharepoint.com. Web part data is stored in the `$webPartData` variable
 
 ```sh
-m365 spo apppage set --webUrl "https://contoso.sharepoint.com" --pageName "Contoso.aspx" --webPartData $webPartData
+m365 spo apppage set --webUrl "https://contoso.sharepoint.com" --name "Contoso.aspx" --webPartData $webPartData
 ```

package/docs/docs/cmd/spo/cdn/cdn-policy-list.md

@@ -10,7 +10,7 @@ m365 spo cdn policy list [options]
 
 ## Options
 
-`-t, --type [type]`
+`-t, --cdnType [cdnType]`
 : Type of CDN to manage. `Public,Private`. Default `Public`
 
 --8<-- "docs/cmd/_global.md"
@@ -20,7 +20,7 @@ m365 spo cdn policy list [options]
 
 ## Remarks
 
-Using the `-t, --type` option you can choose whether you want to manage the settings of the Public (default) or Private CDN. If you don't use the option, the command will use the Public CDN.
+Using the `-t, --cdnType` option you can choose whether you want to manage the settings of the Public (default) or Private CDN. If you don't use the option, the command will use the Public CDN.
 
 ## Examples
 
@@ -33,7 +33,7 @@ m365 spo cdn policy list
 Show the list of policies configured for the Private CDN
 
 ```sh
-m365 spo cdn policy list --type Private
+m365 spo cdn policy list --cdnType Private
 ```
 
 ## More information