4 files changed, 23 insertions, 4 deletions

diff --git a/README.md b/README.md
index a876f1825..eb3ef6aae 100644
--- a/README.md
+++ b/README.md
@@ -123,6 +123,17 @@ Check the status of the latest build here: https://travis-ci.org/netblue30/firej
        --output-stderr=logfile
               Similar to --output, but stderr is also stored.
 
+      --notv Disable DVB (Digital Video Broadcasting) TV devices.
+
+              Example:
+              $ firejail --notv vlc
+
+       --nodvd
+              Disable DVD and audio CD devices.
+
+              Example:
+              $ firejail --nodvd
+
 `````
 
 ## /etc/firejail/firejail.config
diff --git a/RELNOTES b/RELNOTES
index 25cacb281..a46870b2f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -9,6 +9,8 @@ firejail (0.9.49) baseline; urgency=low
   * enhancement: support for newer Xpra versions (2.1+) -
      set "xpra-attach yes" in /etc/firejail/firejail.config
   * enhancement: all profiles use a standard layout style
+  * enhancement: disable CDROM/DVD drive (--nodvd)
+  * enhancement: disable DVD devices (--notv)
   * new profiles: curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite,
   * new profiles: Geary, Liferea, peek, silentarmy, IntelliJ IDEA,
   * new profiles: Android Studio, electron, riot-web, Extreme Tux Racer,
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index b9ab00eae..4de33c83d 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -148,8 +148,8 @@ void usage(void) {
         printf("\tthe new home.\n");
         printf("    --private-bin=file,file - build a new /bin in a temporary filesystem,\n");
         printf("\tand copy the programs in the list.\n");
-        printf("    --private-dev - create a new /dev directory. Only dri, null, full, zero,\n");
-        printf("\ttty, pst, ptms, random, snd, urandom, log and shm devices are available.\n");
+        printf("    --private-dev - create a new /dev directory with a small number of\n");
+        printf("\tcommon device files.\n");
         printf("    --private-etc=file,directory - build a new /etc in a temporary\n");
         printf("\tfilesystem, and copy the files and directories in the list.\n");
         printf("    --private-tmp - mount a tmpfs on top of /tmp directory.\n");
@@ -158,10 +158,11 @@ void usage(void) {
         printf("    --profile-path=directory - use this directory to look for profile files.\n");
         printf("    --protocol=protocol,protocol,protocol - enable protocol filter.\n");
         printf("    --protocol.print=name|pid - print the protocol filter.\n");
-        printf("    --put=name|pid src-filename dest-filename - put a file in sandbox container.\n");
+        printf("    --put=name|pid src-filename dest-filename - put a file in sandbox\n");
+        printf("\tcontainer.\n");
         printf("    --quiet - turn off Firejail's output.\n");
         printf("    --read-only=filename - set directory or file read-only..\n");
-        printf("    --read-write=filename - set directory or file read-write..\n");
+        printf("    --read-write=filename - set directory or file read-write.\n");
         printf("    --rlimit-fsize=number - set the maximum file size that can be created\n");
         printf("\tby a process.\n");
         printf("    --rlimit-nofile=number - set the maximum number of files that can be\n");
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index be73429bc..0be8a1d81 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1004,6 +1004,11 @@ sandbox. For root user supplementary groups are always disabled.
 .br
 
 .br
+Note: By default all regular user groups are removed with the exception of the current user. This can be changed
+using \-\-allusers command option.
+.br
+
+.br
 Example:
 .br
 $ id