diff options
author | Tad <tad@spotco.us> | 2018-07-04 15:48:02 -0400 |
---|---|---|
committer | Tad <tad@spotco.us> | 2018-07-04 15:48:02 -0400 |
commit | e91e7b2b8165450e695c7f45492cca2ae6927678 (patch) | |
tree | a9379cc4330adfa679cdae89f64741c6f23df679 /src | |
parent | Merge pull request #2025 from Bundy01/master (diff) | |
download | firejail-e91e7b2b8165450e695c7f45492cca2ae6927678.tar.gz firejail-e91e7b2b8165450e695c7f45492cca2ae6927678.tar.zst firejail-e91e7b2b8165450e695c7f45492cca2ae6927678.zip |
Merges + misc fixes
- Change some links in README to HTTPS
- Fixup some typos in firejail-profile manpage
- Cleanup dash from private-etc
- Fixup gradio
- Synchronize server profile with default profile
Diffstat (limited to 'src')
-rw-r--r-- | src/firecfg/firecfg.config | 1 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index 718c2f973..5e5a5a967 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -188,6 +188,7 @@ google-play-music-desktop-player | |||
188 | gpa | 188 | gpa |
189 | gpicview | 189 | gpicview |
190 | gpredict | 190 | gpredict |
191 | gradio | ||
191 | gthumb | 192 | gthumb |
192 | guayadeque | 193 | guayadeque |
193 | gucharmap | 194 | gucharmap |
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index 851eb1026..59f15f75c 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -391,10 +391,10 @@ Examples: | |||
391 | 391 | ||
392 | .TP | 392 | .TP |
393 | \fBrlimit-as 123456789012 | 393 | \fBrlimit-as 123456789012 |
394 | Set he maximum size of the process's virtual memory to 123456789012 bytes. | 394 | Set the maximum size of the process's virtual memory to 123456789012 bytes. |
395 | .TP | 395 | .TP |
396 | \fBrlimit-cpu 123 | 396 | \fBrlimit-cpu 123 |
397 | Set he maximum CPU time in seconds. | 397 | Set the maximum CPU time in seconds. |
398 | .TP | 398 | .TP |
399 | \fBrlimit-fsize 1024 | 399 | \fBrlimit-fsize 1024 |
400 | Set the maximum file size that can be created by a process to 1024 bytes. | 400 | Set the maximum file size that can be created by a process to 1024 bytes. |