1 files changed, 5 insertions, 2 deletions

diff --git a/Documentation/filesystems/nilfs2.txt b/Documentation/filesystems/nilfs2.txt
index 839efd8a8a8c..d3e7673995eb 100644
--- a/Documentation/filesystems/nilfs2.txt
+++ b/Documentation/filesystems/nilfs2.txt
@@ -50,8 +50,8 @@ NILFS2 supports the following mount options:
 (*) == default
 
 nobarrier               Disables barriers.
-errors=continue(*)      Keep going on a filesystem error.
-errors=remount-ro       Remount the filesystem read-only on an error.
+errors=continue         Keep going on a filesystem error.
+errors=remount-ro(*)    Remount the filesystem read-only on an error.
 errors=panic            Panic and halt the machine if an error occurs.
 cp=n                    Specify the checkpoint-number of the snapshot to be
                         mounted.  Checkpoints and snapshots are listed by lscp
@@ -74,6 +74,9 @@ norecovery		Disable recovery of the filesystem on mount.
                         This disables every write access on the device for
                         read-only mounts or snapshots.  This option will fail
                         for r/w mounts on an unclean volume.
+discard                 Issue discard/TRIM commands to the underlying block
+                        device when blocks are freed.  This is useful for SSD
+                        devices and sparse/thinly-provisioned LUNs.
 
 NILFS2 usage
 ============