[ARVADOS] updated: ced8b355e88199516443aeb7504ebaf57f2df82c
Git user
git at public.curoverse.com
Wed Feb 22 11:24:52 EST 2017
Summary of changes:
doc/api/methods.html.textile.liquid | 4 ++--
doc/api/methods/authorized_keys.html.textile.liquid | 2 +-
doc/install/install-keep-balance.html.textile.liquid | 2 +-
doc/install/install-keepproxy.html.textile.liquid | 10 +++-------
doc/user/topics/arv-docker.html.textile.liquid | 2 +-
doc/user/topics/arv-run.html.textile.liquid | 2 +-
6 files changed, 9 insertions(+), 13 deletions(-)
via ced8b355e88199516443aeb7504ebaf57f2df82c (commit)
from d2c9ca9783955cef851d33639cae36044941abb3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit ced8b355e88199516443aeb7504ebaf57f2df82c
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Feb 22 11:24:13 2017 -0500
7995: Fix up inconsistent "e.g." vs. "e.g.,".
diff --git a/doc/api/methods.html.textile.liquid b/doc/api/methods.html.textile.liquid
index 6f085ef..cbd80e2 100644
--- a/doc/api/methods.html.textile.liquid
+++ b/doc/api/methods.html.textile.liquid
@@ -8,7 +8,7 @@ title: Common resource methods
The following methods are available for most resources. Some resources may limit who can perform certain operations. Consult documentation for individual resource types for details.
-The methods are relative to the base URI, e.g. @/arvados/v1/resource_type at . For arguments specifying a *Location* of @path@, the value of the argument is incorporated into the path portion of the URI. For example, a @uuid@ of @aaaaa-bbbbb-ccccccccccccccc@ in a path position yields a URI of @/arvados/v1/resource_type/aaaaa-bbbbb-ccccccccccccccc at .
+The methods are relative to the base URI, e.g., @/arvados/v1/resource_type at . For arguments specifying a *Location* of @path@, the value of the argument is incorporated into the path portion of the URI. For example, a @uuid@ of @aaaaa-bbbbb-ccccccccccccccc@ in a path position yields a URI of @/arvados/v1/resource_type/aaaaa-bbbbb-ccccccccccccccc at .
Arguments specifying a *Location* of @query@ are incorporated into the query portion of the URI or request body. For example, @/arvados/v1/resource_type?resource_type={}@.
@@ -26,7 +26,7 @@ Arguments:
table(table table-bordered table-condensed).
|_. Argument |_. Type |_. Description |_. Location |
-|{resource_type}|object|Name is the singular form of the resource type, e.g. for the "collections" resource, this argument is "collection"|query||
+|{resource_type}|object|Name is the singular form of the resource type, e.g., for the "collections" resource, this argument is "collection"|query||
h2. delete
diff --git a/doc/api/methods/authorized_keys.html.textile.liquid b/doc/api/methods/authorized_keys.html.textile.liquid
index 2912ba8..3ae9a6e 100644
--- a/doc/api/methods/authorized_keys.html.textile.liquid
+++ b/doc/api/methods/authorized_keys.html.textile.liquid
@@ -23,7 +23,7 @@ table(table table-bordered table-condensed).
|name|string|A name to help the user manage their keys.||
|key_type|string|Public key type, currently only supports "SSH"||
|authorized_user_uuid|string|The user to which this key belongs. Authentication using this key authenticates as this user.||
-|public_key|text|The actual public key material, e.g. from @~/.ssh/id_rsa.pub@||
+|public_key|text|The actual public key material, e.g., from @~/.ssh/id_rsa.pub@||
|expires_at|datetime|Expiration date after which the key is no longer valid.||
h2. Methods
diff --git a/doc/install/install-keep-balance.html.textile.liquid b/doc/install/install-keep-balance.html.textile.liquid
index a1bc3a2..19249b9 100644
--- a/doc/install/install-keep-balance.html.textile.liquid
+++ b/doc/install/install-keep-balance.html.textile.liquid
@@ -4,7 +4,7 @@ navsection: installguide
title: Install Keep-balance
...
-Keep-balance deletes unreferenced and overreplicated blocks from Keep servers, makes additional copies of underreplicated blocks, and moves blocks into optimal locations as needed (e.g. after adding new servers).
+Keep-balance deletes unreferenced and overreplicated blocks from Keep servers, makes additional copies of underreplicated blocks, and moves blocks into optimal locations as needed (e.g., after adding new servers).
{% include 'notebox_begin' %}
diff --git a/doc/install/install-keepproxy.html.textile.liquid b/doc/install/install-keepproxy.html.textile.liquid
index f1a2688..b110a8b 100644
--- a/doc/install/install-keepproxy.html.textile.liquid
+++ b/doc/install/install-keepproxy.html.textile.liquid
@@ -39,13 +39,9 @@ Verify that Keepproxy is functional:
<notextile>
<pre><code>~$ <span class="userinput">keepproxy -h</span>
-Usage of keepproxy:
- -default-replicas=2: Default number of replicas to write if not specified by the client.
- -listen=":25107": Interface on which to listen for requests, in the format ipaddr:port. e.g. -listen=10.0.1.24:8000. Use -listen=:port to listen on all network interfaces.
- -no-get=false: If set, disable GET operations
- -no-put=false: If set, disable PUT operations
- -pid="": Path to write pid file
- -timeout=15: Timeout on requests to internal Keep services (default 15 seconds)
+...
+Usage: keepproxy [-config path/to/keepproxy.yml]
+...
</code></pre>
</notextile>
diff --git a/doc/user/topics/arv-docker.html.textile.liquid b/doc/user/topics/arv-docker.html.textile.liquid
index bbae7ec..a718d1f 100644
--- a/doc/user/topics/arv-docker.html.textile.liquid
+++ b/doc/user/topics/arv-docker.html.textile.liquid
@@ -4,7 +4,7 @@ navsection: userguide
title: "Customizing Crunch environment using Docker"
...
-This page describes how to customize the runtime environment (e.g. the programs, libraries, and other dependencies needed to run a job) that a crunch script will be run in using "Docker.":https://www.docker.com/ Docker is a tool for building and running containers that isolate applications from other applications running on the same node. For detailed information about Docker, see the "Docker User Guide.":https://docs.docker.com/userguide/
+This page describes how to customize the runtime environment (e.g., the programs, libraries, and other dependencies needed to run a job) that a crunch script will be run in using "Docker.":https://www.docker.com/ Docker is a tool for building and running containers that isolate applications from other applications running on the same node. For detailed information about Docker, see the "Docker User Guide.":https://docs.docker.com/userguide/
This page will demonstrate how to:
diff --git a/doc/user/topics/arv-run.html.textile.liquid b/doc/user/topics/arv-run.html.textile.liquid
index 93fc2c0..8f4ba42 100644
--- a/doc/user/topics/arv-run.html.textile.liquid
+++ b/doc/user/topics/arv-run.html.textile.liquid
@@ -141,7 +141,7 @@ h2. Additional options
* @--docker-image IMG@ : By default, commands run based in a container created from the @default_docker_image_for_jobs@ setting on the API server. Use this option to specify a different image to use. Note: the Docker image must be uploaded to Arvados using @arv keep docker at .
* @--dry-run@ : Print out the final Arvados pipeline generated by @arv-run@ without submitting it.
* @--local@ : By default, the pipeline will be submitted to your configured Arvados instance. Use this option to run the command locally using @arv-run-pipeline-instance --run-jobs-here at .
-* @--ignore-rcode@ : Some commands use non-zero exit codes to indicate nonfatal conditions (e.g. @grep@ returns 1 when no match is found). Set this to indicate that commands that return non-zero return codes should not be considered failed.
+* @--ignore-rcode@ : Some commands use non-zero exit codes to indicate nonfatal conditions (e.g., @grep@ returns 1 when no match is found). Set this to indicate that commands that return non-zero return codes should not be considered failed.
* @--no-wait@ : Do not wait and display logs after submitting command, just exit.
h2. Putting it all together: bwa mem
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list