aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-06-22 19:54:35 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-06-22 19:54:35 -0400
commit681cb0a2b2cc364bea40ed675fbd05d9bfd4c0c5 (patch)
treec54ba25fc3dfbc128e96a98256b4edef40d580ee
parentMerge pull request #1345 from hawkeye116477/master (diff)
downloadfirejail-681cb0a2b2cc364bea40ed675fbd05d9bfd4c0c5.tar.gz
firejail-681cb0a2b2cc364bea40ed675fbd05d9bfd4c0c5.tar.zst
firejail-681cb0a2b2cc364bea40ed675fbd05d9bfd4c0c5.zip
merges
-rw-r--r--README3
-rw-r--r--src/man/firejail-profile.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/README b/README
index 2c3fbf67b..2c7ad88b9 100644
--- a/README
+++ b/README
@@ -206,6 +206,9 @@ GSI (https://github.com/GSI)
206 - added Uzbl browser profile 206 - added Uzbl browser profile
207hamzadis (https://github.com/hamzadis) 207hamzadis (https://github.com/hamzadis)
208 - added --overlay-named=name and --overlay-path=path 208 - added --overlay-named=name and --overlay-path=path
209hawkey116477 (https://github.com/hawkeye116477)
210 - added Waterfox profile
211 - updated Cyberfox profile
209Holger Heinz (https://github.com/hheinz) 212Holger Heinz (https://github.com/hheinz)
210 - manpage work 213 - manpage work
211Icaro Perseo (https://github.com/icaroperseo) 214Icaro Perseo (https://github.com/icaroperseo)
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index e4ef90944..9b3aef95f 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -360,7 +360,7 @@ Set the maximum number of files that can be opened by a process to 500.
360\fBrlimit-sigpending 200 360\fBrlimit-sigpending 200
361Set the maximum number of processes that can be created for the real user ID of the calling process to 200. 361Set the maximum number of processes that can be created for the real user ID of the calling process to 200.
362.TP 362.TP
363\fBcpu 1,2,3 363\fBcpu 0,1,2
364Use only CPU cores 0, 1 and 2. 364Use only CPU cores 0, 1 and 2.
365.TP 365.TP
366\fBnice -5 366\fBnice -5