You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/08/03 12:13:07 UTC

[1/2] tinkerpop git commit: tweaks in gremlin language variants doc

Repository: tinkerpop
Updated Branches:
  refs/heads/master 5d64d927c -> 03da6f6df


tweaks in gremlin language variants doc


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a3f5dab1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a3f5dab1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a3f5dab1

Branch: refs/heads/master
Commit: a3f5dab17c9bcfbb464f034608b5a89fa57eed55
Parents: 0f5f2d8
Author: Adam Holmberg <Ad...@datastax.com>
Authored: Wed Jul 27 12:57:22 2016 -0500
Committer: Adam Holmberg <Ad...@datastax.com>
Committed: Wed Jul 27 12:57:22 2016 -0500

----------------------------------------------------------------------
 docs/src/tutorials/gremlin-language-variants/index.asciidoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a3f5dab1/docs/src/tutorials/gremlin-language-variants/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/tutorials/gremlin-language-variants/index.asciidoc b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
index 6101fae..1dce00d 100644
--- a/docs/src/tutorials/gremlin-language-variants/index.asciidoc
+++ b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
@@ -63,7 +63,7 @@ public class MyApplication {
 ----
 
 In query languages like link:https://en.wikipedia.org/wiki/SQL[SQL], the user must construct a string representation of
-their query and submit it to the database for evaluation. This is because SQL can be expressed in Java as they use fundamentally
+their query and submit it to the database for evaluation. This is because SQL cannot be expressed in Java as they use fundamentally
 different constructs in their expression. The same example above is presented below using SQL and the
 link:https://en.wikipedia.org/wiki/Java_Database_Connectivity[JDBC] interface. The take home point is that Gremlin does
 not exist outside the programming language in which it will be used. Gremlin was designed to be able to easily be
@@ -133,7 +133,7 @@ Language Drivers
 
 image:language-drivers.png[width=375,float=right] A Gremlin language driver is a software library that is able to
 communicate with a TinkerPop-enabled graph system whether directly via the JVM or indirectly via
-link:http://tinkerpop.apache.org/docs/x.y.z/reference/#gremlin-server[Gremlin Server]. By in large, if a
+link:http://tinkerpop.apache.org/docs/x.y.z/reference/#gremlin-server[Gremlin Server]. By and large, if a
 language driver is being developed, it is typically being developed to interact with GremlinServer or a
 link:http://tinkerpop.apache.org/docs/x.y.z/reference/#connecting-via-remotegraph[RemoteConnection].
 Language drivers are responsible for submitting Gremlin traversals to a TinkerPop-enabled graph system and
@@ -248,7 +248,7 @@ link:https://github.com/mpollmeier/gremlin-scala[Gremlin-Scala] were developed.
 available in Java. To leverage these niceties, Gremlin-Scala "wraps" `GraphTraversal` in order to provide Scala-idiomatic extensions.
 Another example is Apache TinkerPop's Gremlin-Groovy which does the same via the
 link:http://tinkerpop.apache.org/docs/x.y.z/reference/#sugar-plugin[Sugar plugin], but uses
-link:http://groovy-lang.org/metaprogramming.html[meta-programming] instead of object wrapping, where "behing the scenes,"
+link:http://groovy-lang.org/metaprogramming.html[meta-programming] instead of object wrapping, where "behind the scenes,"
 Groovy meta-programming is doing object wrapping.
 
 The Jython classes below wrap `GraphTraversalSource` and `GraphTraversal`. In doing so, they add methods
@@ -779,4 +779,4 @@ language. Two ways of doing this for the Python language were presented in this
 the reflection-based source code generation technique presented. This method ensures that the language
 variant is always in sync with the corresponding Apache TinkerPop Gremlin-Java release version. Moreover, it reduces
 the chance of missing methods or creating poorly implemented methods. While Gremlin is simple, there are nearly 200
-steps in `GraphTraversal`. As such, computational means of host language embedding are strongly advised.
\ No newline at end of file
+steps in `GraphTraversal`. As such, computational means of host language embedding are strongly advised.


[2/2] tinkerpop git commit: Merge branch 'pr-364'

Posted by sp...@apache.org.
Merge branch 'pr-364'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/03da6f6d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/03da6f6d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/03da6f6d

Branch: refs/heads/master
Commit: 03da6f6dfd80fc1381779fe5d7eb4b9c06bad7a7
Parents: 5d64d92 a3f5dab
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 08:12:56 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 08:12:56 2016 -0400

----------------------------------------------------------------------
 docs/src/tutorials/gremlin-language-variants/index.asciidoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------