diff options
author | 2016-06-26 21:08:54 -0400 | |
---|---|---|
committer | 2016-06-26 21:08:54 -0400 | |
commit | cb9a31b04366c55a43f9f79c9a8b1fe0057fb5ca (patch) | |
tree | 906b931b2b22936c329b369f0ec58b08b4fa5ca2 | |
parent | Merge pull request #602 from avoidr/disable-devel.inc (diff) | |
parent | s/Xephry/Xephyr/ (diff) | |
download | firejail-cb9a31b04366c55a43f9f79c9a8b1fe0057fb5ca.tar.gz firejail-cb9a31b04366c55a43f9f79c9a8b1fe0057fb5ca.tar.zst firejail-cb9a31b04366c55a43f9f79c9a8b1fe0057fb5ca.zip |
Merge pull request #603 from avoidr/typo
fix some typos
-rw-r--r-- | etc/firejail.config | 2 | ||||
-rw-r--r-- | src/firejail/usage.c | 2 | ||||
-rw-r--r-- | src/man/firejail-config.txt | 2 | ||||
-rw-r--r-- | src/man/firejail-login.txt | 2 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 2 | ||||
-rw-r--r-- | src/man/firejail.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/etc/firejail.config b/etc/firejail.config index eaff4de8f..59bbd77a5 100644 --- a/etc/firejail.config +++ b/etc/firejail.config | |||
@@ -46,7 +46,7 @@ | |||
46 | # xephyr-screen 1024x768 | 46 | # xephyr-screen 1024x768 |
47 | # xephyr-screen 1280x1024 | 47 | # xephyr-screen 1280x1024 |
48 | 48 | ||
49 | # Firejail window title in Xephry, default enabled. | 49 | # Firejail window title in Xephyr, default enabled. |
50 | # xephyr-window-title yes | 50 | # xephyr-window-title yes |
51 | 51 | ||
52 | # Xephyr command extra parameters. None by default, and the declaration is commented out. | 52 | # Xephyr command extra parameters. None by default, and the declaration is commented out. |
diff --git a/src/firejail/usage.c b/src/firejail/usage.c index af1a30ac3..82b1affcc 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c | |||
@@ -336,7 +336,7 @@ void usage(void) { | |||
336 | printf("\n"); | 336 | printf("\n"); |
337 | printf("Restricted shell\n\n"); | 337 | printf("Restricted shell\n\n"); |
338 | printf("To configure a restricted shell, replace /bin/bash with /usr/bin/firejail in\n"); | 338 | printf("To configure a restricted shell, replace /bin/bash with /usr/bin/firejail in\n"); |
339 | printf("/etc/password file for each user that needs to be restricted.\n"); | 339 | printf("/etc/passwd file for each user that needs to be restricted.\n"); |
340 | printf("Alternatively, you can specify /usr/bin/firejail in adduser command:\n\n"); | 340 | printf("Alternatively, you can specify /usr/bin/firejail in adduser command:\n\n"); |
341 | printf(" adduser --shell /usr/bin/firejail username\n\n"); | 341 | printf(" adduser --shell /usr/bin/firejail username\n\n"); |
342 | printf("Arguments to be passed to firejail executable upon login are declared in\n"); | 342 | printf("Arguments to be passed to firejail executable upon login are declared in\n"); |
diff --git a/src/man/firejail-config.txt b/src/man/firejail-config.txt index bc29dc977..386eda976 100644 --- a/src/man/firejail-config.txt +++ b/src/man/firejail-config.txt | |||
@@ -76,7 +76,7 @@ xephyr-screen 1280x1024 | |||
76 | 76 | ||
77 | .TP | 77 | .TP |
78 | \fBxephyr-window-title | 78 | \fBxephyr-window-title |
79 | Firejail window title in Xephry, default enabled. | 79 | Firejail window title in Xephyr, default enabled. |
80 | 80 | ||
81 | .TP | 81 | .TP |
82 | \fBxephyr-extra-params | 82 | \fBxephyr-extra-params |
diff --git a/src/man/firejail-login.txt b/src/man/firejail-login.txt index 6cd9ce3cb..464551202 100644 --- a/src/man/firejail-login.txt +++ b/src/man/firejail-login.txt | |||
@@ -15,7 +15,7 @@ Example: | |||
15 | 15 | ||
16 | .SH RESTRICTED SHELL | 16 | .SH RESTRICTED SHELL |
17 | To configure a restricted shell, replace /bin/bash with /usr/bin/firejail in | 17 | To configure a restricted shell, replace /bin/bash with /usr/bin/firejail in |
18 | /etc/password file for each user that needs to be restricted. Alternatively, | 18 | /etc/passwd file for each user that needs to be restricted. Alternatively, |
19 | you can specify /usr/bin/firejail using adduser or usermod commands: | 19 | you can specify /usr/bin/firejail using adduser or usermod commands: |
20 | 20 | ||
21 | adduser \-\-shell /usr/bin/firejail username | 21 | adduser \-\-shell /usr/bin/firejail username |
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index 1f7c8beac..c2d5e7955 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -243,7 +243,7 @@ Enable seccomp filter and whitelist the system calls in the list. | |||
243 | Sets the NO_NEW_PRIVS prctl. This ensures that child processes | 243 | Sets the NO_NEW_PRIVS prctl. This ensures that child processes |
244 | cannot acquire new privileges using execve(2); in particular, | 244 | cannot acquire new privileges using execve(2); in particular, |
245 | this means that calling a suid binary (or one with file capabilities) | 245 | this means that calling a suid binary (or one with file capabilities) |
246 | does not results in an increase of privilege. | 246 | does not result in an increase of privilege. |
247 | .TP | 247 | .TP |
248 | \fBnoroot | 248 | \fBnoroot |
249 | Use this command to enable an user namespace. The namespace has only one user, the current user. | 249 | Use this command to enable an user namespace. The namespace has only one user, the current user. |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index d72deab2f..bb8c64dc9 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -926,7 +926,7 @@ $ | |||
926 | Sets the NO_NEW_PRIVS prctl. This ensures that child processes | 926 | Sets the NO_NEW_PRIVS prctl. This ensures that child processes |
927 | cannot acquire new privileges using execve(2); in particular, | 927 | cannot acquire new privileges using execve(2); in particular, |
928 | this means that calling a suid binary (or one with file capabilities) | 928 | this means that calling a suid binary (or one with file capabilities) |
929 | does not results in an increase of privilege. | 929 | does not result in an increase of privilege. |
930 | 930 | ||
931 | .TP | 931 | .TP |
932 | \fB\-\-nosound | 932 | \fB\-\-nosound |