Merge pull request #146 from buley/master

Misspellings in Gremlin and Config docs
This commit is contained in:
Barak Michener 2015-02-05 20:41:45 -05:00
commit 3c64b52e39
2 changed files with 4 additions and 4 deletions

View file

@ -79,7 +79,7 @@ All command line flags take precedence over the configuration file.
* Type: Integer or String
* Default: 30
The maximum length of time the Javascript runtime should run until cancelling the query and returning a 408 Timeout. When timeout is an integer is is interpretted as seconds, when it is a string it is [parsed](http://golang.org/pkg/time/#ParseDuration) as a Go time.Duration. A negative duration means no limit.
The maximum length of time the Javascript runtime should run until cancelling the query and returning a 408 Timeout. When timeout is an integer is is interpreted as seconds, when it is a string it is [parsed](http://golang.org/pkg/time/#ParseDuration) as a Go time.Duration. A negative duration means no limit.
## Per-Database Options

View file

@ -40,7 +40,7 @@ Arguments:
* `data`: A Javascript object that can be serialized to JSON
Adds data programatically to the JSON result list. Can be any JSON type.
Adds data programmatically to the JSON result list. Can be any JSON type.
## Path objects
@ -255,7 +255,7 @@ Alias: `path.And`
Arguments:
* `query`: Antother query path, the result sets of which will be intersected
* `query`: Another query path, the result sets of which will be intersected
Filters all paths by the result of another query path (efficiently computed).
@ -275,7 +275,7 @@ Alias: `path.Or`
Arguments:
* `query`: Antother query path, the result sets of which will form a union
* `query`: Another query path, the result sets of which will form a union
Given two queries, returns the combined paths of the two queries.
Notice that it's per-path, not per-node. Once again, if multiple paths reach the