aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar startx2017 <vradu.startx@yandex.com>2019-06-02 13:46:11 -0400
committerLibravatar startx2017 <vradu.startx@yandex.com>2019-06-02 13:46:11 -0400
commitdabfbeb286e0d9c0dd64dfd17141666977f34b9a (patch)
treef694f58f5566834f089c464c9ff0bd53b59d08cb
parentstatus update (diff)
downloadfirejail-dabfbeb286e0d9c0dd64dfd17141666977f34b9a.tar.gz
firejail-dabfbeb286e0d9c0dd64dfd17141666977f34b9a.tar.zst
firejail-dabfbeb286e0d9c0dd64dfd17141666977f34b9a.zip
merge: typo (Apr 21, rusty-snake)
-rw-r--r--src/firejail/usage.c2
-rw-r--r--status3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 5a48638a7..c98867ca7 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -141,7 +141,7 @@ static char *usage_str =
141 " --protocol=protocol,protocol,protocol - enable protocol filter.\n" 141 " --protocol=protocol,protocol,protocol - enable protocol filter.\n"
142 " --protocol.print=name|pid - print the protocol filter.\n" 142 " --protocol.print=name|pid - print the protocol filter.\n"
143 " --quiet - turn off Firejail's output.\n" 143 " --quiet - turn off Firejail's output.\n"
144 " --read-only=filename - set directory or file read-only..\n" 144 " --read-only=filename - set directory or file read-only.\n"
145 " --read-write=filename - set directory or file read-write.\n" 145 " --read-write=filename - set directory or file read-write.\n"
146 " --rlimit-as=number - set the maximum size of the process's virtual memory\n" 146 " --rlimit-as=number - set the maximum size of the process's virtual memory\n"
147 "\t(address space) in bytes.\n" 147 "\t(address space) in bytes.\n"
diff --git a/status b/status
index 5c3e75305..18ea9e68f 100644
--- a/status
+++ b/status
@@ -10,8 +10,7 @@ May 18: man pages: add FIREJAIL_QUIET
10todo May 17: Merge pull request #2688 from laomaiweng/nodbus-enhancements 10todo May 17: Merge pull request #2688 from laomaiweng/nodbus-enhancements
11May 17: Merge pull request #2701 from smitsohu/opath - bring back support for Centos6 11May 17: Merge pull request #2701 from smitsohu/opath - bring back support for Centos6
12May 4: update man pages (private-dev, noexec) 12May 4: update man pages (private-dev, noexec)
13todo April 21: typo 13April 21: typo
14todo April 20: typo and merges
15todo Mar 23: mount runtime seccomp files read-only 14todo Mar 23: mount runtime seccomp files read-only
16 15
17Jan 13: fix parent death signal 16Jan 13: fix parent death signal