This is an automated email from the ASF dual-hosted git repository. rdale pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 50b64e07e791f0f8d802a80fd12ccc0d12147280 Author: Robert Dale <robd...@gmail.com> AuthorDate: Fri Jul 12 09:56:06 2019 -0400 asciidoc fixes - CTR --- docs/src/dev/future/index.asciidoc | 2 +- docs/src/recipes/collections.asciidoc | 2 +- docs/src/reference/gremlin-variants.asciidoc | 14 +++++++------- .../src/tutorials/gremlin-language-variants/index.asciidoc | 2 +- docs/src/tutorials/gremlins-anatomy/index.asciidoc | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/src/dev/future/index.asciidoc b/docs/src/dev/future/index.asciidoc index 3c6ef48..cbe3a1b 100644 --- a/docs/src/dev/future/index.asciidoc +++ b/docs/src/dev/future/index.asciidoc @@ -230,7 +230,7 @@ framework modules that will potentially be needed. In 3.x, we found situation wh == Elements and IDs -In link:https://issues.apache.org/jira/browse/TINKERPOP-2051[TINKERPOP-2051] we tried to make vertex property ids local to their vertex. Several approaches were leading nowhere, in most cases we just broke the Gryo compatibility test suite. The basic idea was to remember the parent element (at least its id) and use it in property equality comparisons. This way, the property `[name->marko]` would only match another `[name->marko]` property if the parent elements were the same. In the end [...] +In link:https://issues.apache.org/jira/browse/TINKERPOP-2051[TINKERPOP-2051] we tried to make vertex property ids local to their vertex. Several approaches were leading nowhere, in most cases we just broke the Gryo compatibility test suite. The basic idea was to remember the parent element (at least its id) and use it in property equality comparisons. This way, the property `[name->marko]` would only match another `[name->marko]` property if the parent elements were the same. In the end [...] === Comments [dk] diff --git a/docs/src/recipes/collections.asciidoc b/docs/src/recipes/collections.asciidoc index ff76925..923770a 100644 --- a/docs/src/recipes/collections.asciidoc +++ b/docs/src/recipes/collections.asciidoc @@ -244,7 +244,7 @@ g.V(). ---- <1> For each vertex, create a "pair" (i.e. a `List` of two objects) of the vertex itself and its edge count. -<2> For each vertex, create a "triple" (i.e. a `List`of three objects) of the index of the vertex (starting at zero), +<2> For each vertex, create a "triple" (i.e. a `List` of three objects) of the index of the vertex (starting at zero), the vertex itself and its edge count. The pattern here is to use `union()` in conjunction with `fold()`. As explained earlier, the `fold()` operation reduces diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc index a0fe625..67e89e3 100644 --- a/docs/src/reference/gremlin-variants.asciidoc +++ b/docs/src/reference/gremlin-variants.asciidoc @@ -675,8 +675,8 @@ With statics loaded its possible to represent the above traversal as below. g.V().hasLabel('person').has('age',gt(30)).order().by('age',desc).toList() ---- -Finally, statics includes all the ``+__+``-methods and thus, anonymous traversals like `+__.out()+` can be expressed as below. -That is, without the ``__.``-prefix. +Finally, statics includes all the `+__+`-methods and thus, anonymous traversals like `+__.out()+` can be expressed as below. +That is, without the `+__+`-prefix. [gremlin-python,modern] ---- @@ -925,8 +925,8 @@ class SocialTraversalSource(GraphTraversalSource): return traversal ---- -NOTE: The `AnonymousTraversal` class above is just an alias for `__` as in -`from gremlin_python.process.graph_traversal import __ as AnonymousTraversal` +NOTE: The `AnonymousTraversal` class above is just an alias for `+__+` as in +`+from gremlin_python.process.graph_traversal import __ as AnonymousTraversal+` Using the DSL is straightforward and just requires that the graph instance know the `SocialTraversalSource` should be used: @@ -1097,11 +1097,11 @@ Developing a <<dsl,Domain Specific Language>> (DSL) for .Net is most easily impl link:https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/classes-and-structs/extension-methods[Extension Methods] as they don't require direct extension of classes in the TinkerPop hierarchy. Extension Method classes simply need to be constructed for the `GraphTraversal` and the `GraphTraversalSource`. Unfortunately, anonymous traversals (spawned -from `__`) can't use the Extension Method approach as they do not work for static classes and static classes can't be -extended. The only option is to re-implement the methods of `__` as a wrapper in the anonymous traversal for the DSL +from `+__+`) can't use the Extension Method approach as they do not work for static classes and static classes can't be +extended. The only option is to re-implement the methods of `+__+` as a wrapper in the anonymous traversal for the DSL or to simply create a static class for the DSL and use the two anonymous traversals creators independently. The following example uses the latter approach as it saves a lot of boilerplate code with the minor annoyance of having a -second static class to deal with when writing traversals rather than just calling `__` for everything. +second static class to deal with when writing traversals rather than just calling `+__+` for everything. [source,csharp] ---- diff --git a/docs/src/tutorials/gremlin-language-variants/index.asciidoc b/docs/src/tutorials/gremlin-language-variants/index.asciidoc index be113f6..91d755a 100644 --- a/docs/src/tutorials/gremlin-language-variants/index.asciidoc +++ b/docs/src/tutorials/gremlin-language-variants/index.asciidoc @@ -179,7 +179,7 @@ parent step. For example, in `+repeat(__.out())+`, `+__.out()+` is an anonymous language agnostic representation called Gremlin bytecode. This representation is a nested list of the form `[step,[args*]]*`. -Both `GraphTraversal` and `__` define the structure of the Gremlin language. Gremlin is a _two-dimensional language_ +Both `GraphTraversal` and `+__+` define the structure of the Gremlin language. Gremlin is a _two-dimensional language_ supporting linear, nested step sequences. Historically, many Gremlin language variants have failed to make the distinctions above clear and in doing so, either complicate their implementations or yield variants that are not in 1-to-1 correspondence with Gremlin-Java. By keeping these concepts clear when designing a language variant, the diff --git a/docs/src/tutorials/gremlins-anatomy/index.asciidoc b/docs/src/tutorials/gremlins-anatomy/index.asciidoc index c9737e9..6c728c0 100644 --- a/docs/src/tutorials/gremlins-anatomy/index.asciidoc +++ b/docs/src/tutorials/gremlins-anatomy/index.asciidoc @@ -140,7 +140,7 @@ and "josh" edges to be grouped by? In this case, the answer to that question is provided by the anonymous traversal `label()` as the argument to the step modulator `by()`. An anonymous traversal is a traversal that is not bound to a `GraphTraversalSource`. It is -constructed from the double underscore class (i.e. `__`), which exposes static functions to spawn the anonymous +constructed from the double underscore class (i.e. `+__+`), which exposes static functions to spawn the anonymous traversals. Typically, the double underscore is not visible in examples and code as by convention, TinkerPop typically recommends that the functions of that class be exposed in a standalone fashion. In Java, that would mean link:https://docs.oracle.com/javase/7/docs/technotes/guides/language/static-import.html[statically importing] the