summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Wilk <jwilk@jwilk.net>2019-02-26 17:59:23 +0100
committerAtomic Bot <atomic-devel@projectatomic.io>2019-02-26 17:14:25 +0000
commitcc44544f8c3d1dff0868ee4658834e5ffcd59f1a (patch)
tree1c73b9d1663c8c7ca4ef0d594e6e89d7b0dc44d0
parent94147e233fe200d1fe43a9a18c52475188b22798 (diff)
downloadbubblewrap-cc44544f8c3d1dff0868ee4658834e5ffcd59f1a.tar.gz
Fix typos
Closes: #302 Approved by: smcv
-rw-r--r--README.md4
-rw-r--r--bubblewrap.c10
-rw-r--r--bwrap.xml6
3 files changed, 10 insertions, 10 deletions
diff --git a/README.md b/README.md
index 2647056..cc264cb 100644
--- a/README.md
+++ b/README.md
@@ -139,7 +139,7 @@ such.
Related project comparison: Sandstorm.io
----------------------------------------
-[Sandstorm.io](https://sandstorm.io/) requries unprivileged user
+[Sandstorm.io](https://sandstorm.io/) requires unprivileged user
namespaces to set up its sandbox, though it could easily be adapted
to operate in a setuid mode as well. @cgwalters believes their code is
fairly good, but it could still make sense to unify on bubblewrap.
@@ -168,7 +168,7 @@ complete OCI runtime).
[binctr](https://github.com/jfrazelle/binctr) is just a wrapper for
runC, so inherits all of its design tradeoffs.
-Whats with the name ?!
+What's with the name?!
----------------------
The name bubblewrap was chosen to convey that this
diff --git a/bubblewrap.c b/bubblewrap.c
index 1563aeb..a3fd61f 100644
--- a/bubblewrap.c
+++ b/bubblewrap.c
@@ -209,11 +209,11 @@ usage (int ecode, FILE *out)
" --lock-file DEST Take a lock on DEST while sandbox is running\n"
" --sync-fd FD Keep this fd open while sandbox is running\n"
" --bind SRC DEST Bind mount the host path SRC on DEST\n"
- " --bind-try SRC DEST Equal to --bind but ignores non-existant SRC\n"
+ " --bind-try SRC DEST Equal to --bind but ignores non-existent SRC\n"
" --dev-bind SRC DEST Bind mount the host path SRC on DEST, allowing device access\n"
- " --dev-bind-try SRC DEST Equal to --dev-bind but ignores non-existant SRC\n"
+ " --dev-bind-try SRC DEST Equal to --dev-bind but ignores non-existent SRC\n"
" --ro-bind SRC DEST Bind mount the host path SRC readonly on DEST\n"
- " --ro-bind-try SRC DEST Equal to --ro-bind but ignores non-existant SRC\n"
+ " --ro-bind-try SRC DEST Equal to --ro-bind but ignores non-existent SRC\n"
" --remount-ro DEST Remount DEST as readonly; does not recursively remount\n"
" --exec-label LABEL Exec label for the sandbox\n"
" --file-label LABEL File label for temporary sandbox content\n"
@@ -425,7 +425,7 @@ monitor_child (int event_fd, pid_t child_pid, int setup_finished_fd)
/* We need to read the signal_fd, or it will keep polling as read,
* however we ignore the details as we get them from waitpid
- * below anway */
+ * below anyway */
s = read (signal_fd, &fdsi, sizeof (struct signalfd_siginfo));
if (s == -1 && errno != EINTR && errno != EAGAIN)
die_with_error ("read signalfd");
@@ -690,7 +690,7 @@ set_ambient_capabilities (void)
* "is_privileged = FALSE".
*
* If bwrap is setuid, then we do things in phases.
- * The first part is run as euid 0, but with with fsuid as the real user.
+ * The first part is run as euid 0, but with fsuid as the real user.
* The second part, inside the child, is run as the real user but with
* capabilities.
* And finally we drop all capabilities.
diff --git a/bwrap.xml b/bwrap.xml
index 72c8bbd..73ca161 100644
--- a/bwrap.xml
+++ b/bwrap.xml
@@ -185,7 +185,7 @@
</varlistentry>
<varlistentry>
<term><option>--bind-try <arg choice="plain">SRC</arg> <arg choice="plain">DEST</arg></option></term>
- <listitem><para>Equal to <option>--bind</option> but ignores non-existant <arg choice="plain">SRC</arg></para></listitem>
+ <listitem><para>Equal to <option>--bind</option> but ignores non-existent <arg choice="plain">SRC</arg></para></listitem>
</varlistentry>
<varlistentry>
<term><option>--dev-bind <arg choice="plain">SRC</arg> <arg choice="plain">DEST</arg></option></term>
@@ -193,7 +193,7 @@
</varlistentry>
<varlistentry>
<term><option>--dev-bind-try <arg choice="plain">SRC</arg> <arg choice="plain">DEST</arg></option></term>
- <listitem><para>Equal to <option>--dev-bind</option> but ignores non-existant <arg choice="plain">SRC</arg></para></listitem>
+ <listitem><para>Equal to <option>--dev-bind</option> but ignores non-existent <arg choice="plain">SRC</arg></para></listitem>
</varlistentry>
<varlistentry>
<term><option>--ro-bind <arg choice="plain">SRC</arg> <arg choice="plain">DEST</arg></option></term>
@@ -201,7 +201,7 @@
</varlistentry>
<varlistentry>
<term><option>--ro-bind-try <arg choice="plain">SRC</arg> <arg choice="plain">DEST</arg></option></term>
- <listitem><para>Equal to <option>--ro-bind</option> but ignores non-existant <arg choice="plain">SRC</arg></para></listitem>
+ <listitem><para>Equal to <option>--ro-bind</option> but ignores non-existent <arg choice="plain">SRC</arg></para></listitem>
</varlistentry>
<varlistentry>
<term><option>--remount-ro <arg choice="plain">DEST</arg></option></term>