You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/03/17 21:26:16 UTC
mesos git commit: Fixed typos and cleaned up some text in the docs.
Repository: mesos
Updated Branches:
refs/heads/master 5381b36e0 -> d0cd96b8f
Fixed typos and cleaned up some text in the docs.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d0cd96b8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d0cd96b8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d0cd96b8
Branch: refs/heads/master
Commit: d0cd96b8f920b28ec27c0f6ae9cb8f2101dc1d50
Parents: 5381b36
Author: Neil Conway <ne...@gmail.com>
Authored: Thu Jan 26 11:47:29 2017 -0800
Committer: Neil Conway <ne...@gmail.com>
Committed: Fri Mar 17 14:26:12 2017 -0700
----------------------------------------------------------------------
docs/app-framework-development-guide.md | 2 +-
docs/authorization.md | 8 ++++----
docs/effective-code-reviewing.md | 2 +-
docs/home.md | 2 +-
docs/multiple-disk.md | 2 +-
docs/nested-container-and-task-group.md | 2 +-
docs/operator-http-api.md | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d0cd96b8/docs/app-framework-development-guide.md
----------------------------------------------------------------------
diff --git a/docs/app-framework-development-guide.md b/docs/app-framework-development-guide.md
index bf1c713..6e73e4e 100644
--- a/docs/app-framework-development-guide.md
+++ b/docs/app-framework-development-guide.md
@@ -575,7 +575,7 @@ without `DiscoveryInfo`. For instance, tasks may be made non discoverable to
other frameworks (equivalent to `visibility=FRAMEWORK`) or discoverable to all
frameworks (equivalent to `visibility=CLUSTER`).
-The `name` field is a string that that provides the service discovery system
+The `name` field is a string that provides the service discovery system
with the name under which the task is discoverable. The typical use of the name
field will be to provide a valid hostname. If name is not provided, it is up to
the service discovery system to create a name for the task based on the name
http://git-wip-us.apache.org/repos/asf/mesos/blob/d0cd96b8/docs/authorization.md
----------------------------------------------------------------------
diff --git a/docs/authorization.md b/docs/authorization.md
index 0abb05c..5a5d23b 100644
--- a/docs/authorization.md
+++ b/docs/authorization.md
@@ -108,7 +108,7 @@ There are two ways to disallow unauthorized uses on specific operations:
actions to all objects except the ones explicitly allowed.
Consider the [example below](#disallowExample) for details.
-2. Set `permissive` to `false` but allow for `ANY` principle to perform the
+2. Set `permissive` to `false` but allow `ANY` principal to perform the
action on `ANY` object. This needs to be done for all actions which should
work without being checked against ACLs. A template doing this for all
actions can be found in [acls_template.json](../examples/acls_template.json).
@@ -117,8 +117,8 @@ More information about the structure of the ACLs can be found in
[their definition](https://github.com/apache/mesos/blob/master/include/mesos/authorizer/acls.proto)
inside the Mesos source code.
-Note that ACLs are compared in the order that they are specified. In other
-words, if an ACL allows some action and a later ACL forbids it, the action is
+ACLs are compared in the order that they are specified. In other words,
+if an ACL allows some action and a later ACL forbids it, the action is
allowed; likewise, if the ACL forbidding the action appears earlier than the
one allowing the action, the action is forbidden. If no ACLs match a request,
the request is authorized if the ACLs are permissive (which is the default
@@ -127,7 +127,7 @@ are declined.
### Authorizable Actions
-Currently the local authorizer configuration format supports the following
+Currently, the local authorizer configuration format supports the following
entries, each representing an authorizable action:
<table class="table table-striped">
http://git-wip-us.apache.org/repos/asf/mesos/blob/d0cd96b8/docs/effective-code-reviewing.md
----------------------------------------------------------------------
diff --git a/docs/effective-code-reviewing.md b/docs/effective-code-reviewing.md
index 6284059..c7b255f 100644
--- a/docs/effective-code-reviewing.md
+++ b/docs/effective-code-reviewing.md
@@ -15,7 +15,7 @@ to consider before sending review requests:
wasted effort if the overall design needs changing. Try to get a reviewer
on the same page before sending them a review request.
2. **Think about how to break up your patch**: Did you make any changes
- that could could be reviewed in independent patches? We use
+ that could be reviewed in independent patches? We use
`support/post-reviews.py`, which makes it easy to create "chains" of
reviews based on commits. Become familiar with interactive rebasing
(`git rebase -i`) to split up commits.
http://git-wip-us.apache.org/repos/asf/mesos/blob/d0cd96b8/docs/home.md
----------------------------------------------------------------------
diff --git a/docs/home.md b/docs/home.md
index 8296f84..20d136e 100644
--- a/docs/home.md
+++ b/docs/home.md
@@ -46,7 +46,7 @@ layout: documentation
* [Attributes and Resources](attributes-resources.md) for how to describe the agents that comprise a cluster.
* [Fetcher Cache](fetcher.md) for how to configure the Mesos fetcher cache.
-* [Multiple Disks](multiple-disk.md) for how to to allow tasks to use multiple isolated disk resources.
+* [Multiple Disks](multiple-disk.md) for how to allow tasks to use multiple isolated disk resources.
* [Networking](networking.md)
* [Container Network Interface (CNI)](cni.md)
* [Port Mapping Isolator](port-mapping-isolator.md)
http://git-wip-us.apache.org/repos/asf/mesos/blob/d0cd96b8/docs/multiple-disk.md
----------------------------------------------------------------------
diff --git a/docs/multiple-disk.md b/docs/multiple-disk.md
index 9bc9f95..748d423 100644
--- a/docs/multiple-disk.md
+++ b/docs/multiple-disk.md
@@ -55,7 +55,7 @@ operator could optionally specify a `role` for the disk, which would result in
### `Path` disks
-A `Path` disk is an auxiliary disk resource provided by the operator. This can
+A `Path` disk is an auxiliary disk resource provided by the operator. This
can be carved up into smaller chunks by creating persistent volumes that use
less than the total available space on the disk. Common uses for this kind of
disk are extra logging space, file archives or caches, or other non
http://git-wip-us.apache.org/repos/asf/mesos/blob/d0cd96b8/docs/nested-container-and-task-group.md
----------------------------------------------------------------------
diff --git a/docs/nested-container-and-task-group.md b/docs/nested-container-and-task-group.md
index debf9f8..f61d59e 100644
--- a/docs/nested-container-and-task-group.md
+++ b/docs/nested-container-and-task-group.md
@@ -14,7 +14,7 @@ some resources (e.g., network namespace, volumes) but not others
(e.g., container image, resource limits). Here are the use cases for
pod:
-* Run a side-car container (e.g., logger, backup) next the the main
+* Run a side-car container (e.g., logger, backup) next the main
application controller.
* Run an adapter container (e.g., metrics endpoint, queue consumer)
next to the main container.
http://git-wip-us.apache.org/repos/asf/mesos/blob/d0cd96b8/docs/operator-http-api.md
----------------------------------------------------------------------
diff --git a/docs/operator-http-api.md b/docs/operator-http-api.md
index 3326f6a..2f98841 100644
--- a/docs/operator-http-api.md
+++ b/docs/operator-http-api.md
@@ -3449,7 +3449,7 @@ of type CONTAINER_ID and contain the ContainerID of the container
being attached to. Subsequent messages must be of type PROCESS_IO, but
they may contain subtypes of either DATA or CONTROL. DATA messages
must be of type STDIN and contain the actual data to stream to the
-STDIN of the container beinga attached to. Currently, the only valid
+STDIN of the container being attached to. Currently, the only valid
CONTROL message sends a heartbeat to keep the connection alive. We may
add more CONTROL messages in the future.