[tinkerpop] 02/02: Merge branch '3.4-dev'

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 14977047915c0f706daa856b7ba911ab62d9c723
Merge: 3f55514 fbb5a34
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Dec 15 06:52:09 2020 -0500

    Merge branch '3.4-dev'

 docs/src/reference/gremlin-variants.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc docs/src/reference/gremlin-variants.asciidoc
index 10607e3,bb8703d..9869e03
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@@ -1072,7 -1092,7 +1072,7 @@@ and then convert those results to somet
  === Application Examples
  
  The TinkerPop source code contains a simple Python script that shows a basic example of how gremlinpython works. It
- can be found in GitHub link:https://github.com/apache/tinkerpop/tree/xx.yy.zz/gremlin-python/src/main/python/example.py[here]
 -can be found in GitHub link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-python/src/main/jython/example.py[here]
++can be found in GitHub link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-python/src/main/python/example.py[here]
  and is designed to work best with a running <<gremlin-server,Gremlin Server>> configured with the default
  `conf/gremlin-server.yaml` file as included with the standard release packaging.