summaryrefslogtreecommitdiffstats
path: root/src/man
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-06-12 07:27:21 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-06-12 07:27:21 -0400
commitd28f1d7157c87076771498f062f5af7e932bd20f (patch)
tree60761b47463e090cebc5391163506f52cdde34ec /src/man
parentMerge pull request #564 from probonopd/patch-1 (diff)
downloadfirejail-d28f1d7157c87076771498f062f5af7e932bd20f.tar.gz
firejail-d28f1d7157c87076771498f062f5af7e932bd20f.tar.zst
firejail-d28f1d7157c87076771498f062f5af7e932bd20f.zip
support to disable enforcing firejail.config
Diffstat (limited to 'src/man')
-rw-r--r--src/man/firecfg.txt2
-rw-r--r--src/man/firejail-config.txt17
2 files changed, 18 insertions, 1 deletions
diff --git a/src/man/firecfg.txt b/src/man/firecfg.txt
index e2e4229b0..c12bf7731 100644
--- a/src/man/firecfg.txt
+++ b/src/man/firecfg.txt
@@ -10,7 +10,7 @@ sandbox applications automatically, just by clicking on a regular desktop
10menus and icons. 10menus and icons.
11 11
12The symbolic links are placed in /usr/local/bin. For more information, see 12The symbolic links are placed in /usr/local/bin. For more information, see
13DESKTOP INTEGRATION section in man 1 firejail. 13\fBDESKTOP INTEGRATION\fR section in \fBman 1 firejail\fR.
14 14
15.SH OPTIONS 15.SH OPTIONS
16.TP 16.TP
diff --git a/src/man/firejail-config.txt b/src/man/firejail-config.txt
index 6a66c7f75..bc29dc977 100644
--- a/src/man/firejail-config.txt
+++ b/src/man/firejail-config.txt
@@ -74,6 +74,23 @@ xephyr-screen 1024x768
74.br 74.br
75xephyr-screen 1280x1024 75xephyr-screen 1280x1024
76 76
77.TP
78\fBxephyr-window-title
79Firejail window title in Xephry, default enabled.
80
81.TP
82\fBxephyr-extra-params
83Xephyr command extra parameters. None by default, and the declaration is commented out. Examples:
84.br
85
86.br
87xephyr-extra-params -keybd ephyr,,,xkbmodel=evdev
88.br
89xephyr-extra-params -grayscale
90
91.SH COMPILE TIME CONFIGURATION
92Most of the features described in this file can also be configured at compile time, please run \fB./configure --help\fR for more details.
93
77.SH FILES 94.SH FILES
78/etc/firejail/firejail.config 95/etc/firejail/firejail.config
79 96