fix #3884: Add section for kernel samepage merging

[pve-docs.git] / pve-storage-dir.adoc

diff --git a/pve-storage-dir.adoc b/pve-storage-dir.adoc
index 569e463f6e74ea0c12e035dfb6d185e9e15c1a7b..4116fe51de7605730e0946a5f8d8079d0a745dc7 100644 (file)
--- a/pve-storage-dir.adoc
+++ b/pve-storage-dir.adoc
@@ -1,6 +1,10 @@
+[[storage_directory]]
 Directory Backend
 -----------------
-include::attributes.txt[]
+ifdef::wiki[]
+:pve-toplevel:
+:title: Storage: Directory
+endif::wiki[]
 
 Storage pool type: `dir`
 
@@ -35,8 +39,10 @@ storage backends.
 |ISO images          |`template/iso/`
 |Container templates |`template/cache/`
 |Backup files        |`dump/`
+|Snippets            |`snippets/`
 |===========================================================
 
+
 Configuration
 ~~~~~~~~~~~~~
 
@@ -49,12 +55,13 @@ needs to be an absolute file system path.
 dir: backup
         path /mnt/backup
         content backup
-        maxfiles 7
+        prune-backups keep-last=7
+        max-protected-backups 3
 ----
 
-Above configuration defines a storage pool called `backup`. That pool
-can be used to store up to 7 backups (`maxfiles 7`) per VM. The real
-path for the backup files is `/mnt/backup/dump/...`.
+The above configuration defines a storage pool called `backup`. That pool can be
+used to store up to 7 regular backups (`keep-last=7`) and 3 protected backups
+per VM. The real path for the backup files is `/mnt/backup/dump/...`.
 
 
 File naming conventions
@@ -79,7 +86,7 @@ integer to make the name unique.
 Specifies the image format (`raw|qcow2|vmdk`).
 
 When you create a VM template, all VM images are renamed to indicate
-that they are now read-only, and can be uses as a base image for clones:
+that they are now read-only, and can be used as a base image for clones:
 
  base-<VMID>-<NAME>.<FORMAT>
 
@@ -88,6 +95,7 @@ important that those files are read-only, and never get modified. The
 backend changes the access mode to `0444`, and sets the immutable flag
 (`chattr +i`) if the storage supports that.
 
+
 Storage Features
 ~~~~~~~~~~~~~~~~
 
@@ -101,8 +109,8 @@ feature to create clones.
 .Storage features for backend `dir`
 [width="100%",cols="m,m,3*d",options="header"]
 |==============================================================================
-|Content types                     |Image formats         |Shared |Snapshots |Clones
-|images rootdir vztempl iso backup |raw qcow2 vmdk subvol |no     |qcow2     |qcow2
+|Content types                              |Image formats         |Shared |Snapshots |Clones
+|images rootdir vztmpl iso backup snippets  |raw qcow2 vmdk subvol |no     |qcow2     |qcow2
 |==============================================================================