Merge branch 'tp33'
Conflicts:
docs/src/reference/preface.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b83d6e37
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b83d6e37
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b83d6e37
Branch: refs/heads/master
Commit: b83d6e373d793f2e1059f947abf8317129ec2189
Parents: 6a70509 5e48acc
Author: Stephen Mallette <[email protected]>
Authored: Fri Aug 10 11:36:22 2018 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Fri Aug 10 11:36:22 2018 -0400
----------------------------------------------------------------------
docs/src/reference/preface.asciidoc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b83d6e37/docs/src/reference/preface.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/preface.asciidoc
index 4776a75,8977de2..da93d3a
--- a/docs/src/reference/preface.asciidoc
+++ b/docs/src/reference/preface.asciidoc
@@@ -14,9 -14,11 +14,11 @@@ WITHOUT WARRANTIES OR CONDITIONS OF AN
See the License for the specific language governing permissions and
limitations under the License.
////
- [[preface]]
-= TinkerPop3 Documentation
+= TinkerPop Documentation
+ [[preface]]
+ = Preface
+
In the beginning...
== TinkerPop0
