aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2022-08-30 05:14:42 -0400
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-08-31 08:12:15 +0000
commit69f7fd0317e29cb67f0726379c7db6e5dbbab5d7 (patch)
treeba15ca002e5e6564319f12af2dce27fa264c2ab4
parent42e52e9e25911ea20e35f2599a14620b147db425 (diff)
downloadminijail-69f7fd0317e29cb67f0726379c7db6e5dbbab5d7.tar.gz
update product name to omit spaces
BUG=None TEST=CQ passes Change-Id: I0fc0957917b9f54ac6bab5876131d95f7ca4f121 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/3864708 Tested-by: Mike Frysinger <vapier@chromium.org> Commit-Queue: Mike Frysinger <vapier@chromium.org> Reviewed-by: Allen Webb <allenwebb@google.com>
-rw-r--r--HACKING.md6
-rw-r--r--README.md6
-rw-r--r--libminijail_unittest.cc2
-rw-r--r--minijail0.16
-rw-r--r--minijail0.56
-rw-r--r--rust/minijail-sys/Cargo.toml2
-rw-r--r--rust/minijail/Cargo.toml2
-rw-r--r--rust/minijail/src/lib.rs2
8 files changed, 16 insertions, 16 deletions
diff --git a/HACKING.md b/HACKING.md
index 612e505..415b65e 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -38,10 +38,10 @@ Building the tests will automatically execute them.
## Code Review
We use [Android Review] for Minijail code review. The easiest way to submit
-changes for review is using `repo upload` on a Chromium OS or Android checkout.
+changes for review is using `repo upload` on a ChromiumOS or Android checkout.
Go to [Android Review HTTP Credentials] to obtain credentials to push code. For
more detailed instructions see the [Android source documentation] or the
-[Chromium OS documentation].
+[ChromiumOS documentation].
## Source Style
@@ -81,6 +81,6 @@ Please keep it in sync with [minijail0_cli.c].
[Android Review]: https://android-review.googlesource.com/
[Android Review HTTP Credentials]: https://android-review.googlesource.com/settings/#HTTPCredentials
[Android source documentation]: https://source.android.com/setup/start
-[Chromium OS documentation]: https://chromium.googlesource.com/chromiumos/docs/+/HEAD/developer_guide.md
+[ChromiumOS documentation]: https://chromium.googlesource.com/chromiumos/docs/+/HEAD/developer_guide.md
[Google Markdown style guide]: https://github.com/google/styleguide/blob/gh-pages/docguide/style.md
[Google Test]: https://github.com/google/googletest
diff --git a/README.md b/README.md
index 8969d6a..fea1fe6 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ There might be other copies floating around, but this is the official one!
## What is it?
-Minijail is a sandboxing and containment tool used in Chrome OS and Android.
+Minijail is a sandboxing and containment tool used in ChromeOS and Android.
It provides an executable that can be used to launch and sandbox other programs,
and a library that can be used by code to sandbox itself.
@@ -67,7 +67,7 @@ The following talk serves as a good introduction to Minijail and how it can be u
## Example usage
-The Chromium OS project has a comprehensive
+The ChromiumOS project has a comprehensive
[sandboxing](https://chromium.googlesource.com/chromiumos/docs/+/master/sandboxing.md)
document that is largely based on Minijail.
@@ -100,7 +100,7 @@ Q. "Why is it called minijail0?"
A. It is minijail0 because it was a rewrite of an earlier program named
minijail, which was considerably less mini, and in particular had a dependency
-on libchrome (the Chrome OS packaged version of Chromium's //base). We needed a
+on libchrome (the ChromeOS packaged version of Chromium's //base). We needed a
new name to not collide with the deprecated one.
We didn't want to call it minijail2 or something that would make people
diff --git a/libminijail_unittest.cc b/libminijail_unittest.cc
index 98b5bfd..7cdc5e3 100644
--- a/libminijail_unittest.cc
+++ b/libminijail_unittest.cc
@@ -1078,7 +1078,7 @@ namespace {
// Tests that require userns access.
// Android unit tests don't currently support entering user namespaces as
-// unprivileged users due to having an older kernel. Chrome OS unit tests
+// unprivileged users due to having an older kernel. ChromeOS unit tests
// don't support it either due to being in a chroot environment (see man 2
// clone for more information about failure modes with the CLONE_NEWUSER flag).
class NamespaceTest : public ::testing::Test {
diff --git a/minijail0.1 b/minijail0.1
index a53ec6f..c323f2d 100644
--- a/minijail0.1
+++ b/minijail0.1
@@ -1,4 +1,4 @@
-.TH MINIJAIL0 "1" "March 2016" "Chromium OS" "User Commands"
+.TH MINIJAIL0 "1" "March 2016" "ChromiumOS" "User Commands"
.SH NAME
minijail0 \- sandbox a process
.SH SYNOPSIS
@@ -390,9 +390,9 @@ allows the operations to jail \fIprogram\fR.
.RE
.SH AUTHOR
-The Chromium OS Authors <chromiumos-dev@chromium.org>
+The ChromiumOS Authors <chromiumos-dev@chromium.org>
.SH COPYRIGHT
-Copyright \(co 2011 The Chromium OS Authors
+Copyright \(co 2011 The ChromiumOS Authors
License BSD-like.
.SH "SEE ALSO"
.BR libminijail.h ,
diff --git a/minijail0.5 b/minijail0.5
index ae9c58e..c0e18e8 100644
--- a/minijail0.5
+++ b/minijail0.5
@@ -1,4 +1,4 @@
-.TH MINIJAIL0 "5" "July 2011" "Chromium OS" "User Commands"
+.TH MINIJAIL0 "5" "July 2011" "ChromiumOS" "User Commands"
.SH NAME
minijail0 \- sandbox a process
.SH DESCRIPTION
@@ -184,9 +184,9 @@ will occupy a single line, without '=' and value. Otherwise, any string that
is given after the '=' is interpreted as the argument.
.SH AUTHOR
-The Chromium OS Authors <chromiumos-dev@chromium.org>
+The ChromiumOS Authors <chromiumos-dev@chromium.org>
.SH COPYRIGHT
-Copyright \(co 2011 The Chromium OS Authors
+Copyright \(co 2011 The ChromiumOS Authors
License BSD-like.
.SH "SEE ALSO"
.BR minijail0 (1)
diff --git a/rust/minijail-sys/Cargo.toml b/rust/minijail-sys/Cargo.toml
index 4c49c95..6745d14 100644
--- a/rust/minijail-sys/Cargo.toml
+++ b/rust/minijail-sys/Cargo.toml
@@ -2,7 +2,7 @@
name = "minijail-sys"
version = "0.0.13"
description = "Provides raw (unsafe) bindings to the libminijail C library."
-authors = ["The Chromium OS Authors"]
+authors = ["The ChromiumOS Authors"]
edition = "2018"
build = "build.rs"
diff --git a/rust/minijail/Cargo.toml b/rust/minijail/Cargo.toml
index e6c08b8..55bb025 100644
--- a/rust/minijail/Cargo.toml
+++ b/rust/minijail/Cargo.toml
@@ -2,7 +2,7 @@
name = "minijail"
version = "0.2.3"
description = "Provides a safe Rust friendly interface to libminijail."
-authors = ["The Chromium OS Authors"]
+authors = ["The ChromiumOS Authors"]
edition = "2018"
[dependencies]
diff --git a/rust/minijail/src/lib.rs b/rust/minijail/src/lib.rs
index a096a9f..ba7b099 100644
--- a/rust/minijail/src/lib.rs
+++ b/rust/minijail/src/lib.rs
@@ -1196,7 +1196,7 @@ fi
#[test]
fn runnable_fd_success() {
let bin_file = File::open("/bin/true").unwrap();
- // On Chrome OS targets /bin/true is actually a script, so drop CLOEXEC to prevent ENOENT.
+ // On ChromeOS targets /bin/true is actually a script, so drop CLOEXEC to prevent ENOENT.
clear_cloexec(&bin_file).unwrap();
let j = Minijail::new().unwrap();