1 files changed, 72 insertions, 84 deletions

diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 498ff9aa9..2883ab257 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -45,7 +45,7 @@ firejail {\-? | \-\-debug-caps | \-\-debug-errnos | \-\-debug-syscalls | \-\-deb
 #ifdef HAVE_LTS
 This is Firejail long-term support (LTS), an enterprise focused version of the software,
 LTS is usually supported for two or three years.
-During this time  only bugs and the occasional documentation problems are fixed.
+During this time only bugs and the occasional documentation problems are fixed.
 The attack surface of the SUID executable was greatly reduced by removing some of the features.
 .br
 
@@ -99,40 +99,6 @@ $ firejail [OPTIONS] firefox        # starting Mozilla Firefox
 \fB\-\-
 Signal the end of options and disables further option processing.
 .TP
-\fB\-\-allow=dirname_or_filename
-Allow access to a directory or file. A temporary file system is mounted on the top directory, and the
-allowed files are mount-binded inside. Modifications to allowed files are persistent,
-everything else is discarded when the sandbox is closed. The top directory can be
-all directories in / (except /proc and /sys), /sys/module, /run/user/$UID, $HOME and
-all directories in /usr.
-.br
-
-.br
-Symbolic link handling: with the exception of user home, both the link and the real file should be in
-the same top directory. For user home, both the link and the real file should be owned by the user.
-.br
-
-.br
-File globbing is supported, see \fBFILE GLOBBING\fR section for more details.
-.br
-
-.br
-Example:
-.br
-$ firejail \-\-noprofile \-\-allow=~/.mozilla
-.br
-$ firejail \-\-allow=/tmp/.X11-unix --allow=/dev/null
-.br
-$ firejail "\-\-allow=/home/username/My Virtual Machines"
-.br
-$ firejail \-\-allow=~/work* \-\-allow=/var/backups*
-
-
-
-
-
-
-.TP
 \fB\-\-allow-debuggers
 Allow tools such as strace and gdb inside the sandbox by whitelisting
 system calls ptrace and process_vm_readv. This option is only
@@ -143,7 +109,7 @@ ptrace system call allows a full bypass of the seccomp filter.
 .br
 Example:
 .br
-$ firejail  --allow-debuggers --profile=/etc/firejail/firefox.profile strace -f firefox
+$ firejail --allow-debuggers --profile=/etc/firejail/firefox.profile strace -f firefox
 .TP
 \fB\-\-allusers
 All directories under /home are visible inside the sandbox. By default, only current user home directory is visible.
@@ -203,6 +169,21 @@ Example:
 .br
 # firejail \-\-bind=/config/etc/passwd,/etc/passwd
 .TP
+\fB\-\-blacklist=dirname_or_filename
+Blacklist directory or file. File globbing is supported, see \fBFILE GLOBBING\fR section for more details.
+.br
+
+.br
+Example:
+.br
+$ firejail \-\-blacklist=/sbin \-\-blacklist=/usr/sbin
+.br
+$ firejail \-\-blacklist=~/.mozilla
+.br
+$ firejail "\-\-blacklist=/home/username/My Virtual Machines"
+.br
+$ firejail \-\-blacklist=/home/username/My\\ Virtual\\ Machines
+.TP
 \fB\-\-build
 The command builds a whitelisted profile. The profile is printed on the screen. If /usr/bin/strace is installed on the system, it also
 builds a whitelisted seccomp profile. The program is run in a very relaxed sandbox,
@@ -262,7 +243,7 @@ $ firejail \-\-caps.drop=all warzone2100
 
 .TP
 \fB\-\-caps.drop=capability,capability,capability
-Define a custom Linux capabilities filter.
+Define a custom blacklist Linux capabilities filter.
 .br
 
 .br
@@ -643,14 +624,14 @@ Example:
 $ firejail \-\-debug firefox
 
 .TP
-\fB\-\-debug-allow\fR
-Debug file system access.
+\fB\-\-debug-blacklists\fR
+Debug blacklisting.
 .br
 
 .br
 Example:
 .br
-$ firejail \-\-debug-allow firefox
+$ firejail \-\-debug-blacklists firefox
 
 .TP
 \fB\-\-debug-caps
@@ -663,16 +644,6 @@ Example:
 $ firejail \-\-debug-caps
 
 .TP
-\fB\-\-debug-deny\fR
-Debug file access.
-.br
-
-.br
-Example:
-.br
-$ firejail \-\-debug-deny firefox
-
-.TP
 \fB\-\-debug-errnos
 Print all recognized error numbers in the current Firejail software build and exit.
 .br
@@ -706,44 +677,33 @@ $ firejail \-\-debug-syscalls
 \fB\-\-debug-syscalls32
 Print all recognized 32 bit system calls in the current Firejail software build and exit.
 .br
-
-#ifdef HAVE_NETWORK
 .TP
-\fB\-\-defaultgw=address
-Use this address as default gateway in the new network namespace.
+\fB\-\-debug-whitelists\fR
+Debug whitelisting.
 .br
 
 .br
 Example:
 .br
-$ firejail \-\-net=eth0 \-\-defaultgw=10.10.20.1 firefox
-#endif
-
+$ firejail \-\-debug-whitelists firefox
+#ifdef HAVE_NETWORK
 .TP
-\fB\-\-deny=dirname_or_filename
-Deny access to directory or file. File globbing is supported, see \fBFILE GLOBBING\fR section for more details.
+\fB\-\-defaultgw=address
+Use this address as default gateway in the new network namespace.
 .br
 
 .br
 Example:
 .br
-$ firejail \-\-deny=/sbin \-\-deny=/usr/sbin
-.br
-$ firejail \-\-deny=~/.mozilla
-.br
-$ firejail "\-\-deny=/home/username/My Virtual Machines"
-.br
-$ firejail \-\-deny=/home/username/My\\ Virtual\\ Machines
-
-
-
+$ firejail \-\-net=eth0 \-\-defaultgw=10.10.20.1 firefox
+#endif
 .TP
 \fB\-\-deterministic-exit-code
 Always exit firejail with the first child's exit status. The default behavior is to use the exit status of the final child to exit, which can be nondeterministic.
 .br
 .TP
 \fB\-\-disable-mnt
-Deny access to /mnt, /media, /run/mount and /run/media.
+Blacklist /mnt, /media, /run/mount and /run/media access.
 .br
 
 .br
@@ -987,7 +947,7 @@ $ firejail \-\-net=eth0 \-\-\iprange=192.168.1.100,192.168.1.150
 
 .TP
 \fB\-\-ipc-namespace
-Enable  a new IPC namespace if the sandbox was started as a regular user. IPC namespace is enabled by default
+Enable a new IPC namespace if the sandbox was started as a regular user. IPC namespace is enabled by default
 for sandboxes started as root.
 .br
 
@@ -1054,7 +1014,7 @@ $ sudo firejail --join-network=browser /sbin/iptables -vL
 .br
 
 .br
-# verify  IP addresses
+# verify IP addresses
 .br
 $ sudo firejail --join-network=browser ip addr
 .br
@@ -1511,16 +1471,12 @@ Example:
 $ firejail --no3d firefox
 
 .TP
-\fB\-\-noallow=dirname_or_filename
-Disable \-\-allow for this directory or file.
-
-.TP
 \fB\-\-noautopulse \fR(deprecated)
 See --keep-config-pulse.
 
 .TP
-\fB\-\-nodeny=dirname_or_filename
-Disable \-\-deny for this directory or file.
+\fB\-\-noblacklist=dirname_or_filename
+Disable blacklist for this directory or file.
 .br
 
 .br
@@ -1536,7 +1492,7 @@ $ exit
 .br
 
 .br
-$ firejail --nodeny=/bin/nc
+$ firejail --noblacklist=/bin/nc
 .br
 $ nc dict.org 2628
 .br
@@ -1710,6 +1666,10 @@ $ firejail \-\-nou2f
 Disable video devices.
 .br
 
+.TP
+\fB\-\-nowhitelist=dirname_or_filename
+Disable whitelist for this directory or file.
+
 #ifdef HAVE_OUTPUT
 .TP
 \fB\-\-output=logfile
@@ -2174,7 +2134,7 @@ Use k(ilobyte), m(egabyte) or g(igabyte) for size suffix (base 1024).
 .TP
 \fB\-\-rlimit-cpu=number
 Set the maximum limit, in seconds, for the amount of CPU time each
-sandboxed process  can consume. When the limit is reached, the processes are killed.
+sandboxed process can consume. When the limit is reached, the processes are killed.
 
 The CPU limit is a limit on CPU seconds rather than elapsed time. CPU seconds is basically how many seconds
 the CPU has been in use and does not necessarily directly relate to the elapsed time. Linux kernel keeps
@@ -2218,7 +2178,7 @@ $ firejail \-\-net=eth0 \-\-scan
 .TP
 \fB\-\-seccomp
 Enable seccomp filter and blacklist the syscalls in the default list,
-which is  @default-nodebuggers unless \-\-allow-debuggers is specified,
+which is @default-nodebuggers unless \-\-allow-debuggers is specified,
 then it is @default.
 
 .br
@@ -2773,6 +2733,34 @@ Example:
 .br
 $ firejail \-\-net=br0 --veth-name=if0
 #endif
+.TP
+\fB\-\-whitelist=dirname_or_filename
+Whitelist directory or file. A temporary file system is mounted on the top directory, and the
+whitelisted files are mount-binded inside. Modifications to whitelisted files are persistent,
+everything else is discarded when the sandbox is closed. The top directory can be
+all directories in / (except /proc and /sys), /sys/module, /run/user/$UID, $HOME and
+all directories in /usr.
+.br
+
+.br
+Symbolic link handling: with the exception of user home, both the link and the real file should be in
+the same top directory. For user home, both the link and the real file should be owned by the user.
+.br
+
+.br
+File globbing is supported, see \fBFILE GLOBBING\fR section for more details.
+.br
+
+.br
+Example:
+.br
+$ firejail \-\-noprofile \-\-whitelist=~/.mozilla
+.br
+$ firejail \-\-whitelist=/tmp/.X11-unix --whitelist=/dev/null
+.br
+$ firejail "\-\-whitelist=/home/username/My Virtual Machines"
+.br
+$ firejail \-\-whitelist=~/work* \-\-whitelist=/var/backups*
 
 .TP
 \fB\-\-writable-etc
@@ -2877,7 +2865,7 @@ and it is installed by default on most Linux distributions. It provides support
 connection model. Untrusted clients are restricted in certain ways to prevent them from reading window
 contents of other clients, stealing input events, etc.
 
-The untrusted mode has several limitations. A lot of regular programs  assume they are a trusted X11 clients
+The untrusted mode has several limitations. A lot of regular programs assume they are a trusted X11 clients
 and will crash or lock up when run in untrusted mode. Chromium browser and xterm are two examples.
 Firefox and transmission-gtk seem to be working fine.
 A network namespace is not required for this option.
@@ -3268,7 +3256,7 @@ The owner of the sandbox.
 .SH RESTRICTED SHELL
 To configure a restricted shell, replace /bin/bash with /usr/bin/firejail in
 /etc/passwd file for each user that needs to be restricted. Alternatively,
-you can specify /usr/bin/firejail  in adduser command:
+you can specify /usr/bin/firejail in adduser command:
 
 adduser \-\-shell /usr/bin/firejail username
 
@@ -3278,7 +3266,7 @@ Additional arguments passed to firejail executable upon login are declared in /e
 Several command line options can be passed to the program using
 profile files. Firejail chooses the profile file as follows:
 
-1. If a profile file is provided by the user with --profile=FILE option, the profile FILE is loaded. If a profile name is given, it is searched for first in the ~/.config/firejail directory and if not found then in  /etc/firejail directory. Profile names do not include the .profile suffix. If there is a file with the same name as the given profile name, it will be used instead of doing the profile search. To force a profile search, prefix the profile name with a colon (:), eg. --profile=:PROFILE_NAME.
+1. If a profile file is provided by the user with --profile=FILE option, the profile FILE is loaded. If a profile name is given, it is searched for first in the ~/.config/firejail directory and if not found then in /etc/firejail directory. Profile names do not include the .profile suffix. If there is a file with the same name as the given profile name, it will be used instead of doing the profile search. To force a profile search, prefix the profile name with a colon (:), eg. --profile=:PROFILE_NAME.
 Example:
 .PP
 .RS