fix #3884: Add section for kernel samepage merging

[pve-docs.git] / local-zfs.adoc

diff --git a/local-zfs.adoc b/local-zfs.adoc
index f024889d25dc44a573deb25f43b2e7044e01d414..e77595fc2f858c1d4c75aee004066917f6105677 100644 (file)
--- a/local-zfs.adoc
+++ b/local-zfs.adoc
@@ -249,7 +249,7 @@ Bootloader
 
 {pve} uses xref:sysboot_proxmox_boot_tool[`proxmox-boot-tool`] to manage the
 bootloader configuration.
 
 {pve} uses xref:sysboot_proxmox_boot_tool[`proxmox-boot-tool`] to manage the
 bootloader configuration.

-See the chapter on xref:sysboot[{pve} host bootladers] for details.
+See the chapter on xref:sysboot[{pve} host bootloaders] for details.

 
 
 ZFS Administration
 
 
 ZFS Administration


@@ -426,20 +426,17 @@ xref:sysboot_proxmox_boot_setup[Setting up a new partition for use as synced ESP
 # grub-install <new disk>
 ----
 
 # grub-install <new disk>
 ----
 

-Activate E-Mail Notification
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Configure E-Mail Notification
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 
 

-ZFS comes with an event daemon, which monitors events generated by the
-ZFS kernel module. The daemon can also send emails on ZFS events like
-pool errors. Newer ZFS packages ship the daemon in a separate package,
-and you can install it using `apt-get`:
+ZFS comes with an event daemon `ZED`, which monitors events generated by the ZFS
+kernel module. The daemon can also send emails on ZFS events like pool errors.
+Newer ZFS packages ship the daemon in a separate `zfs-zed` package, which should
+already be installed by default in {pve}.

 
 

-----
-# apt-get install zfs-zed
-----
-
-To activate the daemon it is necessary to edit `/etc/zfs/zed.d/zed.rc` with your
-favourite editor, and uncomment the `ZED_EMAIL_ADDR` setting:
+You can configure the daemon via the file `/etc/zfs/zed.d/zed.rc` with your
+favorite editor. The required setting for email notification is
+`ZED_EMAIL_ADDR`, which is set to `root` by default.

 
 --------
 ZED_EMAIL_ADDR="root"
 
 --------
 ZED_EMAIL_ADDR="root"


@@ -448,9 +445,6 @@ ZED_EMAIL_ADDR="root"
 Please note {pve} forwards mails to `root` to the email address
 configured for the root user.
 
 Please note {pve} forwards mails to `root` to the email address
 configured for the root user.
 

-IMPORTANT: The only setting that is required is `ZED_EMAIL_ADDR`. All
-other settings are optional.
-

 
 [[sysadmin_zfs_limit_memory_usage]]
 Limit ZFS Memory Usage
 
 [[sysadmin_zfs_limit_memory_usage]]
 Limit ZFS Memory Usage


@@ -515,7 +509,7 @@ to an external Storage.
 
 We strongly recommend to use enough memory, so that you normally do not
 run into low memory situations. Should you need or want to add swap, it is
 
 We strongly recommend to use enough memory, so that you normally do not
 run into low memory situations. Should you need or want to add swap, it is

-preferred to create a partition on a physical disk and use it as swapdevice.
+preferred to create a partition on a physical disk and use it as a swap device.

 You can leave some space free for this purpose in the advanced options of the
 installer. Additionally, you can lower the
 ``swappiness'' value. A good value for servers is 10:
 You can leave some space free for this purpose in the advanced options of the
 installer. Additionally, you can lower the
 ``swappiness'' value. A good value for servers is 10: