You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/03/16 01:40:24 UTC
[2/2] mesos git commit: Improved grammar in `--help` output for
master and agent.
Improved grammar in `--help` output for master and agent.
Review: https://reviews.apache.org/r/44743/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5b2a34c5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5b2a34c5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5b2a34c5
Branch: refs/heads/master
Commit: 5b2a34c505212aeb48542b3bd29ab05acc678842
Parents: f6069ce
Author: Neil Conway <ne...@gmail.com>
Authored: Tue Mar 15 17:39:54 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Tue Mar 15 17:40:12 2016 -0700
----------------------------------------------------------------------
docs/configuration.md | 16 ++++++++--------
src/master/main.cpp | 12 ++++++------
src/slave/flags.cpp | 6 +++---
src/slave/main.cpp | 12 ++++++------
4 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5b2a34c5/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 739d4ff..d10fa2e 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -51,9 +51,9 @@ be found by running the binary with the flag `--help`, for example
--advertise_ip=VALUE
</td>
<td>
-IP address advertised to reach mesos master/slave.
-Mesos master/slave does not bind using this IP address.
-However, this IP address may be used to access Mesos master/slave.
+IP address advertised to reach this Mesos master/slave.
+The master/slave does not bind to this IP address.
+However, this IP address may be used to access this master/slave.
</td>
</tr>
<tr>
@@ -61,8 +61,8 @@ However, this IP address may be used to access Mesos master/slave.
--advertise_port=VALUE
</td>
<td>
-Port advertised to reach mesos master/slave (along with
-<code>advertise_ip</code>). Mesos master/slave does not bind using this port.
+Port advertised to reach this Mesos master/slave (along with
+<code>advertise_ip</code>). The master/slave does not bind using this port.
However, this port (along with <code>advertise_ip</code>) may be used to
access Mesos master/slave.
</td>
@@ -1086,7 +1086,7 @@ removing docker tasks launched by other slaves.
--docker_mesos_image=VALUE
</td>
<td>
-The docker image used to launch this mesos slave instance.
+The Docker image used to launch this Mesos slave instance.
If an image is specified, the docker containerizer assumes the slave
is running in a docker container, and launches executors with
docker containers in order to recover them when the slave restarts and
@@ -1293,8 +1293,8 @@ launcher if it's running as root on Linux.
--launcher_dir=VALUE
</td>
<td>
-Directory path of Mesos binaries. Mesos would find health-check,
-fetcher, containerizer and executor binary files under this
+Directory path of Mesos binaries. Mesos looks for the health-check,
+fetcher, containerizer, and executor binary files under this
directory. (default: /usr/local/libexec/mesos)
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/mesos/blob/5b2a34c5/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 7c1656b..61210d9 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -137,17 +137,17 @@ int main(int argc, char** argv)
Option<string> advertise_ip;
flags.add(&advertise_ip,
"advertise_ip",
- "IP address advertised to reach mesos master.\n"
- "Mesos master does not bind using this IP address.\n"
- "However, this IP address may be used to access Mesos master.");
+ "IP address advertised to reach this Mesos master.\n"
+ "The master does not bind using this IP address.\n"
+ "However, this IP address may be used to access this master.");
Option<string> advertise_port;
flags.add(&advertise_port,
"advertise_port",
- "Port advertised to reach mesos master (along with\n"
- "`advertise_ip`). Mesos master does not bind using this port.\n"
+ "Port advertised to reach Mesos master (along with\n"
+ "`advertise_ip`). The master does not bind to this port.\n"
"However, this port (along with `advertise_ip`) may be used to\n"
- "access Mesos master.");
+ "access this master.");
Option<string> zk;
flags.add(&zk,
http://git-wip-us.apache.org/repos/asf/mesos/blob/5b2a34c5/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 4d10818..b77afa9 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -177,8 +177,8 @@ mesos::internal::slave::Flags::Flags()
add(&Flags::launcher_dir, // TODO(benh): This needs a better name.
"launcher_dir",
- "Directory path of Mesos binaries. Mesos would find health-check,\n"
- "fetcher, containerizer and executor binary files under this\n"
+ "Directory path of Mesos binaries. Mesos looks for the health-check,\n"
+ "fetcher, containerizer, and executor binary files under this\n"
"directory.",
PKGLIBEXECDIR);
@@ -482,7 +482,7 @@ mesos::internal::slave::Flags::Flags()
add(&Flags::docker_mesos_image,
"docker_mesos_image",
- "The docker image used to launch this mesos slave instance.\n"
+ "The Docker image used to launch this Mesos slave instance.\n"
"If an image is specified, the docker containerizer assumes the slave\n"
"is running in a docker container, and launches executors with\n"
"docker containers in order to recover them when the slave restarts and\n"
http://git-wip-us.apache.org/repos/asf/mesos/blob/5b2a34c5/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index e3a4d13..33a1af8 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -112,17 +112,17 @@ int main(int argc, char** argv)
Option<string> advertise_ip;
flags.add(&advertise_ip,
"advertise_ip",
- "IP address advertised to reach mesos slave.\n"
- "Mesos slave does not bind using this IP address.\n"
- "However, this IP address may be used to access Mesos slave.");
+ "IP address advertised to reach this Mesos slave.\n"
+ "The slave does not bind to this IP address.\n"
+ "However, this IP address may be used to access this slave.");
Option<string> advertise_port;
flags.add(&advertise_port,
"advertise_port",
- "Port advertised to reach mesos slave (along with\n"
- "`advertise_ip`). Mesos slave does not bind using this port.\n"
+ "Port advertised to reach this Mesos slave (along with\n"
+ "`advertise_ip`). The slave does not bind to this port.\n"
"However, this port (along with `advertise_ip`) may be used to\n"
- "access Mesos slave.");
+ "access this slave.");
Option<string> master;
flags.add(&master,