diff --git a/README.md b/README.md index 1b365ed6..18d0becf 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ on the host. User namespaces --------------- -There is an feature in the Linux kernel called +There is a feature in the Linux kernel called [user namespaces](https://www.google.com/search?q=user+namespaces+site%3Ahttps%3A%2F%2Flwn.net) which allows unprivileged users to use container features. Bubblewrap uses these to build the sandbox, allowing any user to use the tool. diff --git a/bubblewrap.c b/bubblewrap.c index e05f6971..2fb926c4 100644 --- a/bubblewrap.c +++ b/bubblewrap.c @@ -2635,16 +2635,16 @@ main (int argc, die ("--userns-block-fd requires --info-fd"); if (opt_userns_fd != -1 && opt_unshare_user) - die ("--userns not compatible --unshare-user"); + die ("--userns is not compatible with --unshare-user"); if (opt_userns_fd != -1 && opt_unshare_user_try) - die ("--userns not compatible --unshare-user-try"); + die ("--userns is not compatible with --unshare-user-try"); if (opt_disable_userns && !opt_unshare_user) die ("--disable-userns requires --unshare-user"); if (opt_disable_userns && opt_userns_block_fd != -1) - die ("--disable-userns is not compatible with --userns-block-fd"); + die ("--disable-userns is not compatible with --userns-block-fd"); /* We have to do this if we we're not root, so let's just DWIM */ if (getuid () != 0 && opt_userns_fd == -1) @@ -2674,8 +2674,8 @@ main (int argc, } /* Debian lets you disable *unprivileged* user namespaces. However this is not - a problem if we're privileged, and if we're not opt_unshare_user is true - already, and there is not much we can do, its just a non-working setup. */ + a problem if we're privileged, and if we're not then opt_unshare_user is true + already, and there is not much we can do, it's just a non-working setup. */ if (!disabled) opt_unshare_user = true; diff --git a/bwrap.xml b/bwrap.xml index a9912e32..61fb0445 100644 --- a/bwrap.xml +++ b/bwrap.xml @@ -42,7 +42,7 @@ Description - bwrap is a unprivileged low-level sandboxing tool. You + bwrap is an unprivileged low-level sandboxing tool. You are unlikely to use it directly from the commandline, although that is possible. diff --git a/utils.c b/utils.c index 7b7349ab..55a7f5b1 100644 --- a/utils.c +++ b/utils.c @@ -137,7 +137,7 @@ fork_intermediate_child (void) if (pid == -1) die_with_error ("Can't fork for --pidns"); - /* Parent is an process not needed */ + /* The parent process is not needed */ if (pid != 0) exit (0); }