@pnp/cli-microsoft365 7.0.0-beta.99e75a7 → 7.0.0-beta.aa2d71e

package/docs/docs/cmd/spo/folder/folder-move.mdx

@@ -14,44 +14,71 @@ m365 spo folder move [options]
 
 ```md definition-list
 `-u, --webUrl <webUrl>`
-: The URL of the site where the folder is located
+: The URL of the site where the folder is located.
 
-`-s, --sourceUrl <sourceUrl>`
-: The server- or site-relative URL of the folder to move
+`-s, --sourceUrl [sourceUrl]`
+: The server-, site-relative or absolute decoded URL of the folder to move. Specify either `sourceUrl` or `sourceId` but not both.
+
+`-i, --sourceId [sourceId]`
+: The ID of the folder to move. Specify either `sourceUrl` or `sourceId` but not both.
 
 `-t, --targetUrl <targetUrl>`
-: Server-relative URL where to move the folder
+: Server-relative or absolute decoded URL where to move the folder.
+
+`--newName [newName]`
+: The new name of the destination folder.
+
+`--nameConflictBehavior [nameConflictBehavior]`
+: Behavior when a file or folder with the same name is already present at the destination. Possible values: `fail`, `rename`. The default is `fail`.
 
-`--allowSchemaMismatch`
-: Ignores any missing fields in the target destination and moves the folder anyway
+`--retainEditorAndModified`
+: Use this option to retain the editor and modified date. When not specified, these values are reset.
+
+`--bypassSharedLock`
+: This indicates whether a folder with a share lock can still be moved. Use this option to move a folder that is locked.
 ```
 
 <Global />
 
 ## Remarks
 
-When you move a folder using the `spo folder move` command, all of the document versions are moved.
+All folder versions are retained while moving a folder.
+
+When you specify a value for `nameConflictBehavior`, consider the following:
+
+- `fail` will throw an error when the destination folder already exists.
+- `rename` will add a suffix (e.g. folder1) when the destination folder already exists.
 
 ## Examples
 
-Move folder to a document library in another site collection
+Move a folder to a document library in another site collection by server-relative URL
 
 ```sh
-m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/MyFolder --targetUrl /sites/test2/Shared%20Documents/
+m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/sites/project-x/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents/Reports January"
 ```
 
-Move folder to a document library in the same site collection
+Move a folder to another location using site-relative URLs and rename it
 
 ```sh
-m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/MyFolder --targetUrl /sites/test1/HRDocuments/
+m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents" --newName "Reports January"
 ```
 
-Move folder to a document library in another site collection. Allow for schema mismatch
+Move a folder to another location and use a new name on conflict
 
 ```sh
-m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/sp1.pdf --targetUrl /sites/test2/Shared%20Documents/ --allowSchemaMismatch
+m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/sites/project-x/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents/Project files" --nameConflictBehavior rename
 ```
 
+Move a folder referenced by its ID to another document library and retain editor and modified date
+
+```sh
+m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceId b8cc341b-9c11-4f2d-aa2b-0ce9c18bcba2 --targetUrl "/sites/project-x/Project files" --retainEditorAndModified
+```
+
+## Response
+
+The command won't return a response on success.
+
 ## More information
 
 - Move items from a SharePoint document library: [https://support.office.com/en-us/article/move-or-copy-items-from-a-sharepoint-document-library-00e2f483-4df3-46be-a861-1f5f0c1a87bc](https://support.office.com/en-us/article/move-or-copy-items-from-a-sharepoint-document-library-00e2f483-4df3-46be-a861-1f5f0c1a87bc)

package/docs/docs/cmd/spo/orgassetslibrary/orgassetslibrary-add.mdx

@@ -16,11 +16,14 @@ m365 spo orgassetslibrary add [options]
 `--libraryUrl <libraryUrl>`
 : The URL of the library to promote.
 
-`--thumbnailUrl <thumbnailUrl>`
+`--thumbnailUrl [thumbnailUrl]`
 : The URL of the thumbnail to render.
 
 `--cdnType [cdnType]`
 : Specifies the CDN type. Allowed values `Public`, `Private`. Default `Private`.
+
+`--orgAssetType [orgAssetType]`
+: Specifies the type of organizational library. Allowed values `ImageDocumentLibrary`, `OfficeTemplateLibrary`, `OfficeFontLibrary`. Defaults to `ImageDocumentLibrary`.
 ```
 
 <Global />
@@ -33,6 +36,10 @@ To use this command you have to have permissions to access the tenant admin site
 
 :::
 
+To enable CDN in your tenant use the [spo cdn set](../cdn/cdn-set.mdx) command.
+
+The document library on which you run the command must at least have read permissions for all users, except external users.
+
 ## Examples
 
 Promotes an existing library to become an organization assets library
@@ -47,6 +54,12 @@ Promotes an existing library to become an organization assets library with Thumb
 m365 spo orgassetslibrary --libraryUrl "https://contoso.sharepoint.com/SiteAssets" --thumbnailUrl "https://contoso.sharepoint.com/assets/logo.png"
 ```
 
+Promotes an existing library to become an organization assets Office template library
+
+```sh
+m365 spo orgassetslibrary add --libraryUrl "https://contoso.sharepoint.com/SiteAssets" --orgAssetType "OfficeTemplateLibrary"
+```
+
 ## Response
 
 The command won't return a response on success.

package/docs/docs/cmd/spo/site/site-ensure.mdx

@@ -103,7 +103,7 @@ If you set the type to `ClassicSite`, you should also set a value of the `webTem
 Ensure that a site exists at the specified URL. Create a modern team site if no site exists. If a site is found, don't check its type and update its title.
 
 ```sh
-m365 spo site ensure --url https://contoso.sharepoint.com/sites/team1 --alias team1 --title "Team 1"
+m365 spo site ensure --url https://contoso.sharepoint.com/teams/team1 --alias team1 --title "Team 1"
 ```
 
 Ensure that a communication site exists at the specified URL. Create a communication site if no site exists. If a site of different type is found, return an error.

package/docs/docs/cmd/spo/site/site-list.mdx

@@ -26,9 +26,6 @@ m365 spo site list [options]
 
 `--includeOneDriveSites`
 : use this switch to include OneDrive sites in the result when retrieving sites. Do not specify the `type` or `webTemplate` options when using this.
-
-`--deleted`
-: use this switch to only return deleted sites
 ```
 
 <Global />
@@ -39,12 +36,14 @@ Using the `--filter` option you can specify which sites you want to retrieve. Fo
 
 When using the text output type, the command lists only the values of the `Title`, and `Url` properties of the site. When setting the output type to JSON, all available properties are included in the command output.
 
+If you wish to list deleted sites in your tenant, you should use the command [spo tenant recyclebinitem list](../tenant/tenant-recyclebinitem-list.mdx)
+
 :::info
 
 To use this command you have to have permissions to access the tenant admin site.
 
 :::
-    
+
 ## Examples
 
 List all sites in the currently connected tenant
@@ -77,16 +76,8 @@ List all sites in the currently connected tenant including OneDrive sites
 m365 spo site list --includeOneDriveSites
 ```
 
-List all deleted sites in the tenant you're logged in to
-
-```sh
-m365 spo site list --deleted
-```
-
 ## Response
 
-### Standard response
-
 <Tabs>
   <TabItem value="JSON">
 
@@ -317,69 +308,3 @@ m365 spo site list --deleted
 
   </TabItem>
 </Tabs>
-
-### `deleted` response
-
-When we make use of the `--deleted` option, the response will differ. 
-
-<Tabs>
-  <TabItem value="JSON">
-
-  ```json
-  [
-    {
-      "_ObjectType_": "Microsoft.Online.SharePoint.TenantAdministration.DeletedSiteProperties",
-      "_ObjectIdentity_": "b805bfa0-805c-6000-b76d-bc01ecf6c67f|908bed80-a04a-4433-b4a0-883d9847d110:1e852b49-bf4b-4ba5-bcd4-a8c4706c8ed4\\\nDeletedSiteProperties\\\nhttps%3a%2f%2fcontoso.sharepoint.com%2fteams%2fteam1",
-      "DaysRemaining": 22,
-      "DeletionTime": "/Date(2023,3,12,8,9,55,260)/",
-      "SiteId": "/Guid(0031a568-a081-4157-a3ab-0946a9da7f6e)/",
-      "Status": "Recycled",
-      "StorageMaximumLevel": 1048576,
-      "Url": "https://contoso.sharepoint.com/teams/team1",
-      "UserCodeMaximumLevel": 300
-    }
-  ]
-  ```
-
-  </TabItem>
-  <TabItem value="Text">
-
-  ```text
-  Url
-  -------------------------------------------------
-  https://contoso.sharepoint.com/teams/team1
-  ```
-
-  </TabItem>
-  <TabItem value="CSV">
-
-  ```csv
-  ObjectType,ObjectIdentity,DaysRemaining,DeletionTime,SiteId,Status,StorageMaximumLevel,Url,UserCodeMaximumLevel
-  Microsoft.Online.SharePoint.TenantAdministration.DeletedSiteProperties,"fc05bfa0-80db-6000-a541-3d6844d4e148|908bed80-a04a-4433-b4a0-883d9847d110:1e852b49-bf4b-4ba5-bcd4-a8c4706c8ed4,DeletedSiteProperties,https%3a%2f%2fcontoso.sharepoint.com%2fteams%2fteam1",22,/Date(2023,3,12,8,9,55,260)/,/Guid(0031a568-a081-4157-a3ab-0946a9da7f6e)/,Recycled,1048576,https://contoso.sharepoint.com/teams/team1,300
-  ```
-
-  </TabItem>
-  <TabItem value="Markdown">
-
-  ```md
-  # spo site list --deleted "true"
-
-  Date: 2023-06-21
-
-  ## https://contoso.sharepoint.com/teams/team1
-
-  Property | Value
-  ---------|-------
-  \_ObjectType\_ | Microsoft.Online.SharePoint.TenantAdministration.DeletedSiteProperties
-  \_ObjectIdentity\_ | 3b06bfa0-40fd-6000-c2a5-1ef401300d74\|908bed80-a04a-4433-b4a0-883d9847d110:1e852b49-bf4b-4ba5-bcd4-a8c4706c8ed4<br>DeletedSiteProperties<br>https%3a%2f%2fcontoso.sharepoint.com%2fteams%2fteam1
-  DaysRemaining | 22
-  DeletionTime | /Date(2023,3,12,8,9,55,260)/
-  SiteId | /Guid(0031a568-a081-4157-a3ab-0946a9da7f6e)/
-  Status | Recycled
-  StorageMaximumLevel | 1048576
-  Url | https://contoso.sharepoint.com/teams/team1
-  UserCodeMaximumLevel | 300
-  ```
-
-  </TabItem>
-</Tabs>