diff --git a/.pullapprove.yml b/.pullapprove.yml
index 375feadf0ab..36fb155b68d 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -14,16 +14,15 @@ groups:
       - alainjobart
       - alainjobart-bot
       - AndyDiamondstein
+      - bbeaudreault
+      - demmer
       - enisoc
       - enisoc-bot
-      - erzel
-      - erzel-bot
+      - harshit-gangal
       - mberlin-bot
       - michael-berlin
-      - sougou
-      - sougou-bot
-      - thompsonja
-      - thompsonja-bot
       - pivanof
       - pivanof-bot
+      - sougou
+      - sougou-bot
 
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000000..585940699b5
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.2.3
diff --git a/.travis.yml b/.travis.yml
index c662c8f5d2c..9203c871b30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,152 +1,61 @@
-# TODO(mberlin): Travis will break this configuration on Sep 5, 2017.
-# Moving off the container based infrastructure (sudo: required) may buy us more time.
-# But we should move to Docker based tests eventually.
-# See their announcement: https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming
-dist: precise
-# Use container-based infrastructure (see: http://docs.travis-ci.com/user/workers/container-based-infrastructure/).
-sudo: false
+# Travis CI configuration for Vitess.
+#
+# Note that we have our own test runner written in Go (test.go) which downloads
+# our bootstrap Docker image and runs all tests within Docker.
+# This solution is slower than running the tests natively, but has the
+# advantage that we do not have to install (and cache) any dependencies within
+# Travis itself.
+#
+# For the record, we expect the following overhead per Travis build:
+# - 20 seconds Travis starting up the VM.
+# - Up to 2 minutes to pull the Docker image.
+# - More than a minute to run "make build" and cache the result as temporary
+#   Docker image.
+#
+# In total, it will always take up to 4 minutes until the environment is
+# bootstrapped and the first test can be run.
+#
+# Open TODOs:
+# - Re-add travis/check_make_proto.sh, ideally as part of test/config.json.
+# - Add a presubmit which checks that vendor/vendor.json is the same as in the Docker image. This will prevent people from making changes to it without pushing new bootstrap Docker images.
+
+# sudo is required because we run Docker in our builds.
+# See: https://docs.travis-ci.com/user/docker/
+sudo: required
+
+services:
+  - docker
+
 language: go
 go:
-  - 1.8
+  - 1.9
 go_import_path: github.com/youtube/vitess
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      # NOTE: When you add a dependency, don't forget to add comment why it's necessary.
-      - automake
-      - libtool
-      - php5-cli
-      - php5-dev
-      - python-dev
-      - python-mysqldb
-      - python-pip
-      - libssl-dev
-      - g++-4.8
-      - gcc-4.8
-      - git
-      - pkg-config
-      - python-virtualenv
-      # installs libaio1 which is required by MariaDB 10.0 server package
-      - libaio-dev
-      # required by travis script below to measure CPU and memory usage
-      - time
-      # Optional dependency. Without a running syslog daemon, Vitess will keep complaining that it could not log events and spam the logs.
-      - rsyslog
-# Cache directories of dependencies which are built by bootstrap.sh
-cache:
-  directories:
-    # Cache downloaded and extracted MariaDB 10.0 packages.
-    - $MYSQL_ROOT
-    # Cache bootstrapped dependencies (e.g. protobuf and gRPC).
-    - $HOME/gopath/dist/etcd
-    - $HOME/gopath/dist/grpc/.build_finished
-    - $HOME/gopath/dist/grpc/usr/local
-    - $HOME/gopath/dist/py-mock-1.0.1/.build_finished
-    - $HOME/gopath/dist/py-mock-1.0.1/lib/python2.7/site-packages
-    - $HOME/gopath/dist/vt-zookeeper-3.4.6/.build_finished
-    - $HOME/gopath/dist/vt-zookeeper-3.4.6/lib
-    # Maven repository for Java dependencies.
-    - $HOME/.m2
-    - $HOME/.phpenv
-before_cache:
-  # Travis CI caching doesn't work with these symlinks. Just delete them.
-  - rm $HOME/gopath/bin/etcd
-  - rm $HOME/gopath/bin/zksrv.sh
-  # Delete these files because they keep changing (having the latest timestamp
-  # of an update) and trigger a lengthy update of the cache (~25 seconds).
-  - rm $HOME/.m2/repository/io/vitess/*/maven-metadata-local.xml
-  - rm $HOME/.m2/repository/io/vitess/*/*-SNAPSHOT/*-SNAPSHOT*.jar
-  - rm $HOME/.m2/repository/io/vitess/*/*-SNAPSHOT/_remote.repositories
-  - rm $HOME/.m2/repository/io/vitess/*/*-SNAPSHOT/maven-metadata-local.xml
-  - rm $HOME/.m2/repository/io/vitess/*/*-SNAPSHOT/resolver-status.properties
-  - rm $HOME/.m2/repository/io/grpc/grpc-core/resolver-status.properties
-  - rm $HOME/.m2/repository/io/grpc/protoc-gen-grpc-java/*/protoc-gen-grpc-java-*.pom.lastUpdated
-  - rm $HOME/.m2/repository/io/netty/netty-codec-http2/resolver-status.properties
-  # Don't cache unnecessary PHP files.
-  - rm $HOME/.phpenv/versions/*/sbin/*
-  - rm $HOME/.phpenv/versions/*/bin/php-cgi
-  - rm $HOME/.phpenv/shims/php-cgi
-  - find $HOME/.phpenv/vendor/grpc/grpc -mindepth 1 -maxdepth 1 ! -name src | xargs rm -rf
-  - find $HOME/.phpenv/vendor/grpc/grpc/src -mindepth 1 -maxdepth 1 ! -name php | xargs rm -rf
 env:
   global:
-    - MYSQL_FLAVOR=MariaDB
-    - MYSQL_ROOT=$HOME/mysql
-    - VT_MYSQL_ROOT=$MYSQL_ROOT/usr
-    # Enable parallel compilation e.g. for gRPC.
-    # (The Travis CI worker is allowed to use up to 2 cores, but as of 07/2015 4 parallel compilations is actually faster.)
-    - MAKEFLAGS=-j4
     # Run go build and test with -p 4 (i.e. up to 4 packages are compiled/tested in parallel).
     # As of 07/2015 this value works best in a Travis CI container.
+    # TODO(mberlin): This will probably not be passed through to Docker. Verify and fix this.
     - VT_GO_PARALLEL_VALUE=4
-    - PATH="$HOME/.phpenv/bin:$PATH"
     # Note: The per test timeout must always be < 10 minutes because test.go
     #       does not produce any log output while running and Travis kills a
     #       build after 10 minutes without log output.
     #       See: https://docs.travis-ci.com/user/customizing-the-build#Build-Timeouts
     # To diagnose stuck tests, add "-follow" to TEST_FLAGS below. Then test.go
     # will print the test's output.
-    - TEST_FLAGS="-docker=false -timeout=8m -print-log -remote-stats=http://enisoc.com:15123/travis/stats"
-    - CC=gcc-4.8
-    - CXX=g++-4.8
-    # TODO: uncomment when php crashing is fixed
-    # - INSTALL_GRPC_PHP="$HOME/.phpenv/lib"
-    - SAUCE_USERNAME=vitess
+    - TEST_FLAGS="-docker -use_docker_cache -timeout=8m -print-log -remote-stats=http://enisoc.com:15123/travis/stats"
   matrix:
     # NOTE: Travis CI schedules up to 5 tests simultaneously.
     #       All our tests should be spread out as evenly as possible across these 5 slots.
-    #       We should always utilize all 5 slots because the cost of the setup is high (up to one minute).
-    # NOTE: Use "" if you specify a space separated list of multiple targets.
+    #       We should always utilize all 5 slots because the cost of the setup is high (up to four minutes).
     - TEST_MATRIX="-shard 0"
     - TEST_MATRIX="-shard 1"
     - TEST_MATRIX="-shard 2"
     - TEST_MATRIX="-shard 3"
     - TEST_MATRIX="-shard 4"
-before_install:
-  - travis/download_mariadb.sh
-  # TODO: uncomment when php crashing is fixed
-  # - travis/php_init.sh
-install:
-  # TODO: uncomment when php crashing is fixed
-  # - eval "$(phpenv init -)"
-  - ./bootstrap.sh
-before_script:
-  - source dev.env
-  # Travis only tests. Run only on the first shard.
-  # Part of "before_script" because in "script" the job would not fail immediately if a command fails.
-  - |
-    if [[ $TEST_MATRIX = *"-shard 0"* ]]; then
-      travis/check_make_proto.sh
-    fi
-  # Webdriver tests are only on the last shard for non PRs. Start Sauce Connect only on this shard.
-  - |
-    if [[ $TEST_MATRIX = *"-shard 4"* && $TRAVIS_PULL_REQUEST = "false" ]]; then
-      tools/sauce_connect_setup.sh
-    fi
 script:
-  # Log GOMAXPROCS (should be 2 as of 07/2015).
-  - go run travis/log_gomaxprocs.go
-  - |
-    if [[ $TRAVIS_PULL_REQUEST = "false" ]]; then
-      go run test.go $TEST_FLAGS $TEST_MATRIX
-    else
-      # Exclude webdriver tests on Travis PRs since the sauce addon does not work for PRs
-      go run test.go $TEST_FLAGS $TEST_MATRIX -exclude=webdriver
-    fi
-after_script:
-  # Stop Sauce Connect at the end
-  - |
-    if [[ $TEST_MATRIX = *"-shard 4"* && $TRAVIS_PULL_REQUEST = "false" ]]; then
-      tools/sauce_connect_teardown.sh
-    fi
-after_failure:
-  # In case of errors, output log files to make it easier to debug the error.
-  # List all available files.
-  - ls -alR $HOME/gopath/vtdataroot
-  # Output *.log* and *.stderr files. (Add -keep-data to TEST_FLAGS above or tests will delete their logs.)
-  - find $HOME/gopath/vtdataroot \( -name "*.log*" -or -name "*.stderr" \) -type f -print0 | xargs -0r --verbose --max-args=1 cat
+  - go run test.go $TEST_FLAGS $TEST_MATRIX
+  # Uncomment the next line to verify the GOMAXPROCS value (should be 2 as of 09/2017).
+  # - ./docker/test/run.sh mysql57 'go run travis/log_gomaxprocs.go'
 notifications:
   slack:
     secure: S9n4rVWuEvSaF9RZUIx3Nkc2ycpM254zmalyMMbT5EmV1Xz6Zww2FL39RR5d57zsZ2M8GVW5n9uB8Bx57mr+L/wClEltzknYr7MA2/yYNMo5iK83tdQtNNw5U+dZG9/Plhlm4n883lcw9aZOyotNcLg2zBsd48Y74olk4NdmSfo=
diff --git a/ADOPTERS.md b/ADOPTERS.md
index cfbf8e48763..f36b4b44c21 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -1,11 +1,13 @@
 This is an alphabetical list of known adopters of Vitess. Some have already gone into production, and others are at various stages of testing.
 
+* [YouTube](http://youtube.com)
+* [Axon](http://axon.com)
 * [BetterCloud](http://bettercloud.com)
 * [FlipKart](http://flipkart.com)
 * [HubSpot](http://product.hubspot.com/)
 * [Nozzle](http://nozzle.io)
 * [Pixel Federation](http://pixelfederation.com)
+* [Quiz of Kings](http://quizofkings.com)
 * [Slack](http://slack.com)
 * [Square](http://square.com)
 * [Stitch Labs](http://stitchlabs.com)
-* [YouTube](http://youtube.com)
diff --git a/Makefile b/Makefile
index ee04cbef3af..94a1b828440 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ MAKEFLAGS = -s
 
 .PHONY: all build build_web test clean unit_test unit_test_cover unit_test_race integration_test proto proto_banner site_test site_integration_test docker_bootstrap docker_test docker_unit_test java_test php_test reshard_tests
 
-all: build test
+all: build
 
 # Set a custom value for -p, the number of packages to be built/tested in parallel.
 # This is currently only used by our Travis CI test configuration.
@@ -80,6 +80,10 @@ unit_test: build
 unit_test_cover: build
 	go test $(VT_GO_PARALLEL) -cover ./go/... | misc/parse_cover.py
 
+# TODO(mberlin): This is currently disabled in test/config.json for automatic
+# runs on Travis (manual=false). Re-enable it there once we switched the Travis
+# tests to using Docker and we verified that this is no longer flaky e.g. in
+# doubt increase timeouts in all tests.
 unit_test_race: build
 	tools/unit_test_race.sh
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 0a88305902b..934e71c9922 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -21,10 +21,9 @@ fi
 
 # Run parallel make, based on number of cores available.
 case $(uname) in
-Linux)	NB_CORES=$(grep -c '^processor' /proc/cpuinfo);;
-Darwin)	NB_CORES=$(sysctl hw.ncpu | awk '{ print $2 }');;
+  Linux)  NB_CORES=$(grep -c '^processor' /proc/cpuinfo);;
+  Darwin) NB_CORES=$(sysctl hw.ncpu | awk '{ print $2 }');;
 esac
-
 if [ -n "$NB_CORES" ]; then
   export MAKEFLAGS="-j$((NB_CORES+1)) -l${NB_CORES}"
 fi
@@ -34,7 +33,7 @@ function fail() {
   exit 1
 }
 
-[ -f bootstrap.sh ] || fail "bootstrap.sh must be run from its current directory"
+[ "$(dirname $0)" = '.' ] || fail "bootstrap.sh must be run from its current directory"
 
 go version 2>&1 >/dev/null || fail "Go is not installed or is not on \$PATH"
 
@@ -49,6 +48,24 @@ mkdir -p $VTROOT/vthook
 echo "Updating git submodules..."
 git submodule update --init
 
+# Install "protoc" protobuf compiler binary.
+protoc_version=3.4.0
+protoc_dist=$VTROOT/dist/protoc
+protoc_version_file=$protoc_dist/version
+if [[ -f $protoc_version_file && "$(cat $protoc_version_file)" == "$protoc_version" ]]; then
+  echo "skipping protoc install. remove $protoc_version_file to force re-install."
+else
+  rm -rf $protoc_dist
+  mkdir -p $protoc_dist
+  download_url=https://github.com/google/protobuf/releases/download/v${protoc_version}/protoc-${protoc_version}-linux-x86_64.zip
+  (cd $protoc_dist && \
+    wget $download_url && \
+    unzip protoc-${protoc_version}-linux-x86_64.zip)
+  [ $? -eq 0 ] || fail "protoc download failed"
+  echo "$protoc_version" > $protoc_version_file
+fi
+ln -snf $protoc_dist/bin/protoc $VTROOT/bin/protoc
+
 # install zookeeper
 zk_ver=3.4.6
 zk_dist=$VTROOT/dist/vt-zookeeper-$zk_ver
@@ -268,7 +285,9 @@ selenium_dist=$VTROOT/dist/selenium
 mkdir -p $selenium_dist
 $VIRTUALENV $selenium_dist
 PIP=$selenium_dist/bin/pip
-$PIP install selenium
+# PYTHONPATH is removed for `pip install` because otherwise it can pick up go/dist/grpc/usr/local/lib/python2.7/site-packages
+# instead of go/dist/selenium/lib/python3.5/site-packages and then can't find module 'pip._vendor.requests'
+PYTHONPATH= $PIP install selenium
 mkdir -p $VTROOT/dist/chromedriver
 curl -sL http://chromedriver.storage.googleapis.com/2.25/chromedriver_linux64.zip > chromedriver_linux64.zip
 unzip -o -q chromedriver_linux64.zip -d $VTROOT/dist/chromedriver
diff --git a/composer.json b/composer.json
index 54337b8b34e..37f01bd54bb 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "php": ">=5.5.0",
     "stanley-cheung/protobuf-php": "v0.6",
     "google/auth": "v0.10",
-    "grpc/grpc": "v1.0.0"
+    "grpc/grpc": "v1.6.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/composer.lock b/composer.lock
index 4ef7ef1e91f..a6a61f72ec4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "b37bde69302058ef01f45bfe5858e396",
-    "content-hash": "64f1877959de9ad06d22633049abb636",
+    "content-hash": "4ff760bfd869bb1225c1cfd1b5d3cb8b",
     "packages": [
         {
             "name": "firebase/php-jwt",
@@ -48,7 +47,7 @@
             ],
             "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
             "homepage": "https://github.com/firebase/php-jwt",
-            "time": "2015-07-22 18:31:08"
+            "time": "2015-07-22T18:31:08+00:00"
         },
         {
             "name": "google/auth",
@@ -96,70 +95,76 @@
                 "google",
                 "oauth2"
             ],
-            "time": "2016-08-02 22:00:48"
+            "time": "2016-08-02T22:00:48+00:00"
         },
         {
             "name": "grpc/grpc",
-            "version": "v1.0.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/grpc/grpc.git",
-                "reference": "2a69139aa7f609e439c24a46754252a5f9d37500"
+                "url": "https://github.com/grpc/grpc-php.git",
+                "reference": "8d190d91ddb9d980f685d9caf79bca62d7edc1e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grpc/grpc/zipball/2a69139aa7f609e439c24a46754252a5f9d37500",
-                "reference": "2a69139aa7f609e439c24a46754252a5f9d37500",
+                "url": "https://api.github.com/repos/grpc/grpc-php/zipball/8d190d91ddb9d980f685d9caf79bca62d7edc1e6",
+                "reference": "8d190d91ddb9d980f685d9caf79bca62d7edc1e6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0",
-                "stanley-cheung/protobuf-php": "v0.6"
+                "php": ">=5.5.0"
             },
             "require-dev": {
                 "google/auth": "v0.9"
             },
+            "suggest": {
+                "ext-protobuf": "For better performance, install the protobuf C extension.",
+                "google/protobuf": "To get started using grpc quickly, install the native protobuf library."
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Grpc\\": "src/php/lib/Grpc/"
+                    "Grpc\\": "src/lib/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "Apache-2.0"
             ],
             "description": "gRPC library for PHP",
-            "homepage": "http://grpc.io",
+            "homepage": "https://grpc.io",
             "keywords": [
                 "rpc"
             ],
-            "time": "2016-08-19 00:55:10"
+            "time": "2017-09-11T20:50:39+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "dev-master",
+            "version": "6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "3b45e7675e8997ac96142b0265d158343958f708"
+                "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3b45e7675e8997ac96142b0265d158343958f708",
-                "reference": "3b45e7675e8997ac96142b0265d158343958f708",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
+                "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
                 "shasum": ""
             },
             "require": {
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.3.1",
+                "guzzlehttp/psr7": "^1.4",
                 "php": ">=5.5"
             },
             "require-dev": {
                 "ext-curl": "*",
-                "phpunit/phpunit": "^4.0",
+                "phpunit/phpunit": "^4.0 || ^5.0",
                 "psr/log": "^1.0"
             },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -196,32 +201,32 @@
                 "rest",
                 "web service"
             ],
-            "time": "2016-08-04 00:05:49"
+            "time": "2017-06-22T18:50:49+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.2.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579"
+                "reference": "09e549f5534380c68761260a71f847644d8f65aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579",
-                "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/09e549f5534380c68761260a71f847644d8f65aa",
+                "reference": "09e549f5534380c68761260a71f847644d8f65aa",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.4-dev"
                 }
             },
             "autoload": {
@@ -247,7 +252,7 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2016-05-18 16:56:05"
+            "time": "2017-05-20T23:14:18+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
@@ -255,12 +260,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "64862e854f876bc5aee2996cab2f552db8586065"
+                "reference": "811b676fbab9c99e359885032e5ebc70e442f5b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/64862e854f876bc5aee2996cab2f552db8586065",
-                "reference": "64862e854f876bc5aee2996cab2f552db8586065",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/811b676fbab9c99e359885032e5ebc70e442f5b8",
+                "reference": "811b676fbab9c99e359885032e5ebc70e442f5b8",
                 "shasum": ""
             },
             "require": {
@@ -312,7 +317,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-08-03 09:33:34"
+            "time": "2017-07-17T09:11:21+00:00"
         },
         {
             "name": "psr/cache",
@@ -320,12 +325,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+                "reference": "78c5a01ddbf11cf731f1338a4f5aba23b14d5b47"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/78c5a01ddbf11cf731f1338a4f5aba23b14d5b47",
+                "reference": "78c5a01ddbf11cf731f1338a4f5aba23b14d5b47",
                 "shasum": ""
             },
             "require": {
@@ -358,7 +363,7 @@
                 "psr",
                 "psr-6"
             ],
-            "time": "2016-08-06 20:24:11"
+            "time": "2016-10-13T14:48:10+00:00"
         },
         {
             "name": "psr/http-message",
@@ -408,7 +413,7 @@
                 "request",
                 "response"
             ],
-            "time": "2016-08-06 14:39:51"
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "stanley-cheung/protobuf-php",
@@ -460,7 +465,7 @@
                 "protocol buffer",
                 "serializing"
             ],
-            "time": "2016-07-22 02:12:15"
+            "time": "2016-07-22T02:12:15+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/data/test/tabletserver/exec_cases.txt b/data/test/tabletserver/exec_cases.txt
index 4fb2d9c4903..17b2d064124 100644
--- a/data/test/tabletserver/exec_cases.txt
+++ b/data/test/tabletserver/exec_cases.txt
@@ -1036,6 +1036,30 @@
   "PKValues":[":a"]
 }
 
+# insert no values autoinc
+"insert into auto values ()"
+{
+  "PlanID": "INSERT_PK",
+  "TableName": "auto",
+  "FullQuery": "insert into auto values ()",
+  "OuterQuery": "insert into auto(id) values (null)",
+  "PKValues":[
+    [null]
+  ]
+}
+
+# insert no values defaults
+"insert into with_defaults values ()"
+{
+  "PlanID": "INSERT_PK",
+  "TableName": "with_defaults",
+  "FullQuery": "insert into with_defaults values ()",
+  "OuterQuery": "insert into with_defaults(aid, bid, cid) values (3, -2, null)",
+  "PKValues":[
+    3
+  ]
+}
+
 # nextval on non-sequence table
 "select next value from a"
 "a is not a sequence"
diff --git a/data/test/tabletserver/schema_test.json b/data/test/tabletserver/schema_test.json
index 29c710c0d51..1a23e93eea4 100644
--- a/data/test/tabletserver/schema_test.json
+++ b/data/test/tabletserver/schema_test.json
@@ -247,6 +247,68 @@
     ],
     "Type": 1
   },
+  {
+    "Name": "auto",
+    "Columns": [
+      {
+        "Name": "id",
+        "IsAuto": true
+      }
+    ],
+    "Indexes": [
+      {
+        "Name": "PRIMARY",
+        "Unique": true,
+        "Columns": [
+          "id"
+        ],
+        "Cardinality": [
+          1
+        ],
+        "DataColumns": [
+        ]
+      }
+    ],
+    "PKColumns": [
+      0
+    ],
+    "Type": 0
+  },
+  {
+    "Name": "with_defaults",
+    "Columns": [
+      {
+        "Name": "aid",
+        "Default": 3
+      },
+      {
+        "Name": "bid",
+        "Default": -2
+      },
+      {
+        "Name": "cid",
+        "Default": null
+      }
+    ],
+    "Indexes": [
+      {
+        "Name": "PRIMARY",
+        "Unique": true,
+        "Columns": [
+          "id"
+        ],
+        "Cardinality": [
+          1
+        ],
+        "DataColumns": [
+        ]
+      }
+    ],
+    "PKColumns": [
+      0
+    ],
+    "Type": 0
+  },
   {
     "Name": "msg",
     "Columns": [
diff --git a/data/test/vtexplain/comments-output.json b/data/test/vtexplain/comments-output.json
new file mode 100644
index 00000000000..c409a3d888d
--- /dev/null
+++ b/data/test/vtexplain/comments-output.json
@@ -0,0 +1,45 @@
+[
+    {
+        "SQL": "SELECT * from user",
+        "Plans": [
+            {
+                "Original": "select * from user",
+                "Instructions": {
+                    "Opcode": "SelectScatter",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select * from user",
+                    "FieldQuery": "select * from user where 1 != 1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user limit 10001"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user limit 10001"
+                ]
+            }
+        }
+    }
+]
diff --git a/data/test/vtexplain/comments-output.txt b/data/test/vtexplain/comments-output.txt
new file mode 100644
index 00000000000..a6210cca7cd
--- /dev/null
+++ b/data/test/vtexplain/comments-output.txt
@@ -0,0 +1,12 @@
+----------------------------------------------------------------------
+SELECT * from user
+
+[ks_sharded/-80]:
+select * from user where 1 != 1
+select * from user limit 10001
+
+[ks_sharded/80-]:
+select * from user where 1 != 1
+select * from user limit 10001
+
+----------------------------------------------------------------------
diff --git a/data/test/vtexplain/comments-queries.sql b/data/test/vtexplain/comments-queries.sql
new file mode 100644
index 00000000000..342fa4a0ac4
--- /dev/null
+++ b/data/test/vtexplain/comments-queries.sql
@@ -0,0 +1,14 @@
+
+/* this is a comment about a commented query */
+/* SELECT * from users; */
+
+/* this is a comment about another commented query */
+-- SELECT * from users;
+
+/* this is a comment about a query with a semicolon; or two; */
+SELECT * from user;
+
+/* this is a semicolon with no query */
+;
+
+-- this is a single line comment at the end of the file
diff --git a/data/test/vtexplain/insertsharded-output.json b/data/test/vtexplain/insertsharded-output.json
new file mode 100644
index 00000000000..036a835d15f
--- /dev/null
+++ b/data/test/vtexplain/insertsharded-output.json
@@ -0,0 +1,904 @@
+[
+    {
+        "SQL": "insert into user (id, name) values(1, 'alice')",
+        "Plans": [
+            {
+                "Original": "insert into name_user_map(name, user_id) values (:name0, :user_id0)",
+                "Instructions": {
+                    "Opcode": "InsertSharded",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into name_user_map(name, user_id) values (:_name0, :user_id0)",
+                    "Values": [
+                        [
+                            ":name0"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert into user(id, name) values (:vtg1, :vtg2)",
+                "Instructions": {
+                    "Opcode": "InsertSharded",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into user(id, name) values (:_id0, :_name0)",
+                    "Values": [
+                        [
+                            ":vtg1"
+                        ],
+                        [
+                            ":vtg2"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert into user(id, name) values ",
+                    "Mid": [
+                        "(:_id0, :_name0)"
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:475e26c086f437f36bd72ecd883504a7 */",
+                        "BindVars": {
+                            "_name0": "'alice'",
+                            "name0": "'alice'",
+                            "user_id0": "1"
+                        }
+                    },
+                    {
+                        "SQL": "insert into user(id, name) values (:_id0, :_name0) /* vtgate:: keyspace_id:166b40b44aba4bd6 */",
+                        "BindVars": {
+                            "_id0": "1",
+                            "_name0": "'alice'",
+                            "vtg1": "1",
+                            "vtg2": "'alice'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into name_user_map(name, user_id) values ('alice', 1)",
+                    "commit",
+                    "begin",
+                    "insert into user(id, name) values (1, 'alice')",
+                    "commit"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert into user (id, name) values(2, 'bob')",
+        "Plans": [
+            {
+                "Original": "insert into name_user_map(name, user_id) values (:name0, :user_id0)",
+                "Instructions": {
+                    "Opcode": "InsertSharded",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into name_user_map(name, user_id) values (:_name0, :user_id0)",
+                    "Values": [
+                        [
+                            ":name0"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert into user(id, name) values (:vtg1, :vtg2)",
+                "Instructions": {
+                    "Opcode": "InsertSharded",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into user(id, name) values (:_id0, :_name0)",
+                    "Values": [
+                        [
+                            ":vtg1"
+                        ],
+                        [
+                            ":vtg2"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert into user(id, name) values ",
+                    "Mid": [
+                        "(:_id0, :_name0)"
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into user(id, name) values (:_id0, :_name0) /* vtgate:: keyspace_id:06e7ea22ce92708f */",
+                        "BindVars": {
+                            "_id0": "2",
+                            "_name0": "'bob'",
+                            "vtg1": "2",
+                            "vtg2": "'bob'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into user(id, name) values (2, 'bob')",
+                    "commit"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "name0": "'bob'",
+                            "user_id0": "2"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into name_user_map(name, user_id) values ('bob', 2)",
+                    "commit"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert ignore into user (id, name) values(2, 'bob')",
+        "Plans": [
+            {
+                "Original": "select name from name_user_map where name = :name and user_id = :user_id",
+                "Instructions": {
+                    "Opcode": "SelectEqualUnique",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select name from name_user_map where name = :name and user_id = :user_id",
+                    "FieldQuery": "select name from name_user_map where 1 != 1",
+                    "Vindex": "md5",
+                    "Values": [
+                        ":name"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into name_user_map(name, user_id) values (:name0, :user_id0)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0)",
+                    "Values": [
+                        [
+                            ":name0"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert ignore into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into user(id, name) values (:vtg1, :vtg2)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into user(id, name) values (:_id0, :_name0)",
+                    "Values": [
+                        [
+                            ":vtg1"
+                        ],
+                        [
+                            ":vtg2"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert ignore into user(id, name) values ",
+                    "Mid": [
+                        "(:_id0, :_name0)"
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into user(id, name) values (:_id0, :_name0) /* vtgate:: keyspace_id:06e7ea22ce92708f */",
+                        "BindVars": {
+                            "_id0": "2",
+                            "_name0": "'bob'",
+                            "vtg1": "2",
+                            "vtg2": "'bob'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into user(id, name) values (2, 'bob')",
+                    "commit"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "name0": "'bob'",
+                            "user_id0": "2"
+                        }
+                    },
+                    {
+                        "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
+                        "BindVars": {
+                            "name": "'bob'",
+                            "user_id": "2"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into name_user_map(name, user_id) values ('bob', 2)",
+                    "commit",
+                    "select name from name_user_map where 1 != 1",
+                    "select name from name_user_map where name = 'bob' and user_id = 2 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert ignore into user (id, name, nickname) values(2, 'bob', 'bob')",
+        "Plans": [
+            {
+                "Original": "select name from name_user_map where name = :name and user_id = :user_id",
+                "Instructions": {
+                    "Opcode": "SelectEqualUnique",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select name from name_user_map where name = :name and user_id = :user_id",
+                    "FieldQuery": "select name from name_user_map where 1 != 1",
+                    "Vindex": "md5",
+                    "Values": [
+                        ":name"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into name_user_map(name, user_id) values (:name0, :user_id0)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0)",
+                    "Values": [
+                        [
+                            ":name0"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert ignore into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into user(id, name, nickname) values (:vtg1, :vtg2, :vtg3)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into user(id, name, nickname) values (:_id0, :_name0, :vtg3)",
+                    "Values": [
+                        [
+                            ":vtg1"
+                        ],
+                        [
+                            ":vtg2"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert ignore into user(id, name, nickname) values ",
+                    "Mid": [
+                        "(:_id0, :_name0, :vtg3)"
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into user(id, name, nickname) values (:_id0, :_name0, :vtg3) /* vtgate:: keyspace_id:06e7ea22ce92708f */",
+                        "BindVars": {
+                            "_id0": "2",
+                            "_name0": "'bob'",
+                            "vtg1": "2",
+                            "vtg2": "'bob'",
+                            "vtg3": "'bob'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into user(id, name, nickname) values (2, 'bob', 'bob')",
+                    "commit"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "name0": "'bob'",
+                            "user_id0": "2"
+                        }
+                    },
+                    {
+                        "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
+                        "BindVars": {
+                            "name": "'bob'",
+                            "user_id": "2"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into name_user_map(name, user_id) values ('bob', 2)",
+                    "commit",
+                    "select name from name_user_map where name = 'bob' and user_id = 2 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert ignore into user (id, name) values(2, 'bob'),(3, 'charlie')",
+        "Plans": [
+            {
+                "Original": "select name from name_user_map where name = :name and user_id = :user_id",
+                "Instructions": {
+                    "Opcode": "SelectEqualUnique",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select name from name_user_map where name = :name and user_id = :user_id",
+                    "FieldQuery": "select name from name_user_map where 1 != 1",
+                    "Vindex": "md5",
+                    "Values": [
+                        ":name"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into name_user_map(name, user_id) values (:name0, :user_id0), (:name1, :user_id1)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0), (:_name1, :user_id1)",
+                    "Values": [
+                        [
+                            ":name0",
+                            ":name1"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert ignore into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)",
+                        "(:_name1, :user_id1)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into user(id, name) values (:vtg1, :vtg2), (:vtg3, :vtg4)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into user(id, name) values (:_id0, :_name0), (:_id1, :_name1)",
+                    "Values": [
+                        [
+                            ":vtg1",
+                            ":vtg3"
+                        ],
+                        [
+                            ":vtg2",
+                            ":vtg4"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert ignore into user(id, name) values ",
+                    "Mid": [
+                        "(:_id0, :_name0)",
+                        "(:_id1, :_name1)"
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into user(id, name) values (:_id0, :_name0),(:_id1, :_name1) /* vtgate:: keyspace_id:06e7ea22ce92708f,4eb190c9a2fa169c */",
+                        "BindVars": {
+                            "_id0": "2",
+                            "_id1": "3",
+                            "_name0": "'bob'",
+                            "_name1": "'charlie'",
+                            "vtg1": "2",
+                            "vtg2": "'bob'",
+                            "vtg3": "3",
+                            "vtg4": "'charlie'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into user(id, name) values (2, 'bob'), (3, 'charlie')",
+                    "commit"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0),(:_name1, :user_id1) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b,91f3487c9b6830974afd7308bdf9c10d */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "_name1": "'charlie'",
+                            "name0": "'bob'",
+                            "name1": "'charlie'",
+                            "user_id0": "2",
+                            "user_id1": "3"
+                        }
+                    },
+                    {
+                        "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
+                        "BindVars": {
+                            "name": "'bob'",
+                            "user_id": "2"
+                        }
+                    },
+                    {
+                        "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
+                        "BindVars": {
+                            "name": "'charlie'",
+                            "user_id": "3"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into name_user_map(name, user_id) values ('bob', 2), ('charlie', 3)",
+                    "commit",
+                    "select name from name_user_map where name = 'bob' and user_id = 2 limit 10001",
+                    "select name from name_user_map where name = 'charlie' and user_id = 3 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert into user (id, name, nickname) values(2, 'bob', 'bobby') on duplicate key update nickname='bobby'",
+        "Plans": [
+            {
+                "Original": "select name from name_user_map where name = :name and user_id = :user_id",
+                "Instructions": {
+                    "Opcode": "SelectEqualUnique",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select name from name_user_map where name = :name and user_id = :user_id",
+                    "FieldQuery": "select name from name_user_map where 1 != 1",
+                    "Vindex": "md5",
+                    "Values": [
+                        ":name"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into name_user_map(name, user_id) values (:name0, :user_id0)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0)",
+                    "Values": [
+                        [
+                            ":name0"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert ignore into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert into user(id, name, nickname) values (:vtg1, :vtg2, :vtg3) on duplicate key update nickname = :vtg4",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into user(id, name, nickname) values (:_id0, :_name0, :vtg3) on duplicate key update nickname = :vtg4",
+                    "Values": [
+                        [
+                            ":vtg1"
+                        ],
+                        [
+                            ":vtg2"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert into user(id, name, nickname) values ",
+                    "Mid": [
+                        "(:_id0, :_name0, :vtg3)"
+                    ],
+                    "Suffix": " on duplicate key update nickname = :vtg4"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into user(id, name, nickname) values (:_id0, :_name0, :vtg3) on duplicate key update nickname = :vtg4 /* vtgate:: keyspace_id:06e7ea22ce92708f */",
+                        "BindVars": {
+                            "_id0": "2",
+                            "_name0": "'bob'",
+                            "vtg1": "2",
+                            "vtg2": "'bob'",
+                            "vtg3": "'bobby'",
+                            "vtg4": "'bobby'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into user(id, name, nickname) values (2, 'bob', 'bobby') on duplicate key update nickname = 'bobby'",
+                    "commit"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "name0": "'bob'",
+                            "user_id0": "2"
+                        }
+                    },
+                    {
+                        "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
+                        "BindVars": {
+                            "name": "'bob'",
+                            "user_id": "2"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into name_user_map(name, user_id) values ('bob', 2)",
+                    "commit",
+                    "select name from name_user_map where name = 'bob' and user_id = 2 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert into user (id, name, nickname, address) values(2, 'bob', 'bobby', '123 main st') on duplicate key update nickname=values(nickname), address=values(address)",
+        "Plans": [
+            {
+                "Original": "select name from name_user_map where name = :name and user_id = :user_id",
+                "Instructions": {
+                    "Opcode": "SelectEqualUnique",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select name from name_user_map where name = :name and user_id = :user_id",
+                    "FieldQuery": "select name from name_user_map where 1 != 1",
+                    "Vindex": "md5",
+                    "Values": [
+                        ":name"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into name_user_map(name, user_id) values (:name0, :user_id0)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0)",
+                    "Values": [
+                        [
+                            ":name0"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert ignore into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert into user(id, name, nickname, address) values (:vtg1, :vtg2, :vtg3, :vtg4) on duplicate key update nickname = values(nickname), address = values(address)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into user(id, name, nickname, address) values (:_id0, :_name0, :vtg3, :vtg4) on duplicate key update nickname = values(nickname), address = values(address)",
+                    "Values": [
+                        [
+                            ":vtg1"
+                        ],
+                        [
+                            ":vtg2"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert into user(id, name, nickname, address) values ",
+                    "Mid": [
+                        "(:_id0, :_name0, :vtg3, :vtg4)"
+                    ],
+                    "Suffix": " on duplicate key update nickname = values(nickname), address = values(address)"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into user(id, name, nickname, address) values (:_id0, :_name0, :vtg3, :vtg4) on duplicate key update nickname = values(nickname), address = values(address) /* vtgate:: keyspace_id:06e7ea22ce92708f */",
+                        "BindVars": {
+                            "_id0": "2",
+                            "_name0": "'bob'",
+                            "vtg1": "2",
+                            "vtg2": "'bob'",
+                            "vtg3": "'bobby'",
+                            "vtg4": "'123 main st'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into user(id, name, nickname, address) values (2, 'bob', 'bobby', '123 main st') on duplicate key update nickname = values(nickname), address = values(address)",
+                    "commit"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "name0": "'bob'",
+                            "user_id0": "2"
+                        }
+                    },
+                    {
+                        "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
+                        "BindVars": {
+                            "name": "'bob'",
+                            "user_id": "2"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into name_user_map(name, user_id) values ('bob', 2)",
+                    "commit",
+                    "select name from name_user_map where name = 'bob' and user_id = 2 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert into user (id, name, nickname, address) values(2, 'bob', 'bobby', '123 main st'), (3, 'jane', 'janie', '456 elm st')on duplicate key update nickname=values(nickname), address=values(address)",
+        "Plans": [
+            {
+                "Original": "select name from name_user_map where name = :name and user_id = :user_id",
+                "Instructions": {
+                    "Opcode": "SelectEqualUnique",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select name from name_user_map where name = :name and user_id = :user_id",
+                    "FieldQuery": "select name from name_user_map where 1 != 1",
+                    "Vindex": "md5",
+                    "Values": [
+                        ":name"
+                    ]
+                }
+            },
+            {
+                "Original": "insert ignore into name_user_map(name, user_id) values (:name0, :user_id0), (:name1, :user_id1)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0), (:_name1, :user_id1)",
+                    "Values": [
+                        [
+                            ":name0",
+                            ":name1"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert ignore into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)",
+                        "(:_name1, :user_id1)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert into user(id, name, nickname, address) values (:vtg1, :vtg2, :vtg3, :vtg4), (:vtg5, :vtg6, :vtg7, :vtg8) on duplicate key update nickname = values(nickname), address = values(address)",
+                "Instructions": {
+                    "Opcode": "InsertShardedIgnore",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into user(id, name, nickname, address) values (:_id0, :_name0, :vtg3, :vtg4), (:_id1, :_name1, :vtg7, :vtg8) on duplicate key update nickname = values(nickname), address = values(address)",
+                    "Values": [
+                        [
+                            ":vtg1",
+                            ":vtg5"
+                        ],
+                        [
+                            ":vtg2",
+                            ":vtg6"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert into user(id, name, nickname, address) values ",
+                    "Mid": [
+                        "(:_id0, :_name0, :vtg3, :vtg4)",
+                        "(:_id1, :_name1, :vtg7, :vtg8)"
+                    ],
+                    "Suffix": " on duplicate key update nickname = values(nickname), address = values(address)"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into name_user_map(name, user_id) values (:_name1, :user_id1) /* vtgate:: keyspace_id:2833d31717650107c367cdd51cb7d90c */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "_name1": "'jane'",
+                            "name0": "'bob'",
+                            "name1": "'jane'",
+                            "user_id0": "2",
+                            "user_id1": "3"
+                        }
+                    },
+                    {
+                        "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
+                        "BindVars": {
+                            "name": "'jane'",
+                            "user_id": "3"
+                        }
+                    },
+                    {
+                        "SQL": "insert into user(id, name, nickname, address) values (:_id0, :_name0, :vtg3, :vtg4),(:_id1, :_name1, :vtg7, :vtg8) on duplicate key update nickname = values(nickname), address = values(address) /* vtgate:: keyspace_id:06e7ea22ce92708f,4eb190c9a2fa169c */",
+                        "BindVars": {
+                            "_id0": "2",
+                            "_id1": "3",
+                            "_name0": "'bob'",
+                            "_name1": "'jane'",
+                            "vtg1": "2",
+                            "vtg2": "'bob'",
+                            "vtg3": "'bobby'",
+                            "vtg4": "'123 main st'",
+                            "vtg5": "3",
+                            "vtg6": "'jane'",
+                            "vtg7": "'janie'",
+                            "vtg8": "'456 elm st'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into name_user_map(name, user_id) values ('jane', 3)",
+                    "commit",
+                    "select name from name_user_map where 1 != 1",
+                    "select name from name_user_map where name = 'jane' and user_id = 3 limit 10001",
+                    "begin",
+                    "insert into user(id, name, nickname, address) values (2, 'bob', 'bobby', '123 main st'), (3, 'jane', 'janie', '456 elm st') on duplicate key update nickname = values(nickname), address = values(address)",
+                    "commit"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "_name1": "'jane'",
+                            "name0": "'bob'",
+                            "name1": "'jane'",
+                            "user_id0": "2",
+                            "user_id1": "3"
+                        }
+                    },
+                    {
+                        "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
+                        "BindVars": {
+                            "name": "'bob'",
+                            "user_id": "2"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert ignore into name_user_map(name, user_id) values ('bob', 2)",
+                    "commit",
+                    "select name from name_user_map where name = 'bob' and user_id = 2 limit 10001"
+                ]
+            }
+        }
+    }
+]
diff --git a/data/test/vtexplain/insertsharded-output.txt b/data/test/vtexplain/insertsharded-output.txt
new file mode 100644
index 00000000000..6a0a70d87c8
--- /dev/null
+++ b/data/test/vtexplain/insertsharded-output.txt
@@ -0,0 +1,116 @@
+----------------------------------------------------------------------
+insert into user (id, name) values(1, 'alice')
+
+[ks_sharded/-80]:
+begin
+insert into name_user_map(name, user_id) values ('alice', 1)
+commit
+begin
+insert into user(id, name) values (1, 'alice')
+commit
+
+----------------------------------------------------------------------
+insert into user (id, name) values(2, 'bob')
+
+[ks_sharded/-80]:
+begin
+insert into user(id, name) values (2, 'bob')
+commit
+
+[ks_sharded/80-]:
+begin
+insert into name_user_map(name, user_id) values ('bob', 2)
+commit
+
+----------------------------------------------------------------------
+insert ignore into user (id, name) values(2, 'bob')
+
+[ks_sharded/-80]:
+begin
+insert ignore into user(id, name) values (2, 'bob')
+commit
+
+[ks_sharded/80-]:
+begin
+insert ignore into name_user_map(name, user_id) values ('bob', 2)
+commit
+select name from name_user_map where 1 != 1
+select name from name_user_map where name = 'bob' and user_id = 2 limit 10001
+
+----------------------------------------------------------------------
+insert ignore into user (id, name, nickname) values(2, 'bob', 'bob')
+
+[ks_sharded/-80]:
+begin
+insert ignore into user(id, name, nickname) values (2, 'bob', 'bob')
+commit
+
+[ks_sharded/80-]:
+begin
+insert ignore into name_user_map(name, user_id) values ('bob', 2)
+commit
+select name from name_user_map where name = 'bob' and user_id = 2 limit 10001
+
+----------------------------------------------------------------------
+insert ignore into user (id, name) values(2, 'bob'),(3, 'charlie')
+
+[ks_sharded/-80]:
+begin
+insert ignore into user(id, name) values (2, 'bob'), (3, 'charlie')
+commit
+
+[ks_sharded/80-]:
+begin
+insert ignore into name_user_map(name, user_id) values ('bob', 2), ('charlie', 3)
+commit
+select name from name_user_map where name = 'bob' and user_id = 2 limit 10001
+select name from name_user_map where name = 'charlie' and user_id = 3 limit 10001
+
+----------------------------------------------------------------------
+insert into user (id, name, nickname) values(2, 'bob', 'bobby') on duplicate key update nickname='bobby'
+
+[ks_sharded/-80]:
+begin
+insert into user(id, name, nickname) values (2, 'bob', 'bobby') on duplicate key update nickname = 'bobby'
+commit
+
+[ks_sharded/80-]:
+begin
+insert ignore into name_user_map(name, user_id) values ('bob', 2)
+commit
+select name from name_user_map where name = 'bob' and user_id = 2 limit 10001
+
+----------------------------------------------------------------------
+insert into user (id, name, nickname, address) values(2, 'bob', 'bobby', '123 main st') on duplicate key update nickname=values(nickname), address=values(address)
+
+[ks_sharded/-80]:
+begin
+insert into user(id, name, nickname, address) values (2, 'bob', 'bobby', '123 main st') on duplicate key update nickname = values(nickname), address = values(address)
+commit
+
+[ks_sharded/80-]:
+begin
+insert ignore into name_user_map(name, user_id) values ('bob', 2)
+commit
+select name from name_user_map where name = 'bob' and user_id = 2 limit 10001
+
+----------------------------------------------------------------------
+insert into user (id, name, nickname, address) values(2, 'bob', 'bobby', '123 main st'), (3, 'jane', 'janie', '456 elm st')on duplicate key update nickname=values(nickname), address=values(address)
+
+[ks_sharded/-80]:
+begin
+insert ignore into name_user_map(name, user_id) values ('jane', 3)
+commit
+select name from name_user_map where 1 != 1
+select name from name_user_map where name = 'jane' and user_id = 3 limit 10001
+begin
+insert into user(id, name, nickname, address) values (2, 'bob', 'bobby', '123 main st'), (3, 'jane', 'janie', '456 elm st') on duplicate key update nickname = values(nickname), address = values(address)
+commit
+
+[ks_sharded/80-]:
+begin
+insert ignore into name_user_map(name, user_id) values ('bob', 2)
+commit
+select name from name_user_map where name = 'bob' and user_id = 2 limit 10001
+
+----------------------------------------------------------------------
diff --git a/data/test/vtexplain/insertsharded-queries.sql b/data/test/vtexplain/insertsharded-queries.sql
new file mode 100644
index 00000000000..5c2abe1b35a
--- /dev/null
+++ b/data/test/vtexplain/insertsharded-queries.sql
@@ -0,0 +1,8 @@
+insert into user (id, name) values(1, 'alice');
+insert into user (id, name) values(2, 'bob');
+insert ignore into user (id, name) values(2, 'bob');
+insert ignore into user (id, name, nickname) values(2, 'bob', 'bob');
+insert ignore into user (id, name) values(2, 'bob'),(3, 'charlie');
+insert into user (id, name, nickname) values(2, 'bob', 'bobby') on duplicate key update nickname='bobby';
+insert into user (id, name, nickname, address) values(2, 'bob', 'bobby', '123 main st') on duplicate key update nickname=values(nickname), address=values(address);
+insert into user (id, name, nickname, address) values(2, 'bob', 'bobby', '123 main st'), (3, 'jane', 'janie', '456 elm st')on duplicate key update nickname=values(nickname), address=values(address);
diff --git a/data/test/vtexplain/options-output.json b/data/test/vtexplain/options-output.json
new file mode 100644
index 00000000000..065a0b623c6
--- /dev/null
+++ b/data/test/vtexplain/options-output.json
@@ -0,0 +1,228 @@
+[
+    {
+        "SQL": "select * from user where email='null@void.com'",
+        "Plans": [
+            {
+                "Original": "select * from user where email='null@void.com'",
+                "Instructions": {
+                    "Opcode": "SelectScatter",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select * from user where email = 'null@void.com'",
+                    "FieldQuery": "select * from user where 1 != 1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-40": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where email = 'null@void.com'",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where email = 'null@void.com' limit 10001"
+                ]
+            },
+            "ks_sharded/40-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where email = 'null@void.com'",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where email = 'null@void.com' limit 10001"
+                ]
+            },
+            "ks_sharded/80-c0": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where email = 'null@void.com'",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where email = 'null@void.com' limit 10001"
+                ]
+            },
+            "ks_sharded/c0-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where email = 'null@void.com'",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where email = 'null@void.com' limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "select * from user where id in (1,2,3,4,5,6,7,8)",
+        "Plans": [
+            {
+                "Original": "select * from user where id in (1,2,3,4,5,6,7,8)",
+                "Instructions": {
+                    "Opcode": "SelectIN",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select * from user where id in ::__vals",
+                    "FieldQuery": "select * from user where 1 != 1",
+                    "Vindex": "hash",
+                    "Values": [
+                        [
+                            1,
+                            2,
+                            3,
+                            4,
+                            5,
+                            6,
+                            7,
+                            8
+                        ]
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-40": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where id in ::__vals",
+                        "BindVars": {
+                            "__vals": "(1, 2)"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where id in (1, 2) limit 10001"
+                ]
+            },
+            "ks_sharded/40-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where id in ::__vals",
+                        "BindVars": {
+                            "__vals": "(3, 5)"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where id in (3, 5) limit 10001"
+                ]
+            },
+            "ks_sharded/c0-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where id in ::__vals",
+                        "BindVars": {
+                            "__vals": "(4, 6, 7, 8)"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where id in (4, 6, 7, 8) limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert into user (id, name) values(2, 'bob')",
+        "Plans": [
+            {
+                "Original": "insert into name_user_map(name, user_id) values(:name0, :user_id0)",
+                "Instructions": {
+                    "Opcode": "InsertSharded",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into name_user_map(name, user_id) values (:_name0, :user_id0)",
+                    "Values": [
+                        [
+                            ":name0"
+                        ]
+                    ],
+                    "Table": "name_user_map",
+                    "Prefix": "insert into name_user_map(name, user_id) values ",
+                    "Mid": [
+                        "(:_name0, :user_id0)"
+                    ]
+                }
+            },
+            {
+                "Original": "insert into user (id, name) values(2, 'bob')",
+                "Instructions": {
+                    "Opcode": "InsertSharded",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "insert into user(id, name) values (:_id0, :_name0)",
+                    "Values": [
+                        [
+                            2
+                        ],
+                        [
+                            "bob"
+                        ]
+                    ],
+                    "Table": "user",
+                    "Prefix": "insert into user(id, name) values ",
+                    "Mid": [
+                        "(:_id0, :_name0)"
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-40": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into user(id, name) values (:_id0, :_name0) /* vtgate:: keyspace_id:06e7ea22ce92708f */",
+                        "BindVars": {
+                            "_id0": "2",
+                            "_name0": "'bob'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into user(id, name) values (2, 'bob') /* _stream user (id ) (2 ); */",
+                    "commit"
+                ]
+            },
+            "ks_sharded/c0-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
+                        "BindVars": {
+                            "_name0": "'bob'",
+                            "name0": "'bob'",
+                            "user_id0": "2"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into name_user_map(name, user_id) values ('bob', 2) /* _stream name_user_map (name user_id ) ('Ym9i' 2 ); */",
+                    "commit"
+                ]
+            }
+        }
+    }
+]
diff --git a/data/test/vtexplain/options-output.txt b/data/test/vtexplain/options-output.txt
new file mode 100644
index 00000000000..6293444e9e0
--- /dev/null
+++ b/data/test/vtexplain/options-output.txt
@@ -0,0 +1,48 @@
+----------------------------------------------------------------------
+select * from user where email='null@void.com'
+
+[ks_sharded/-40]:
+select * from user where 1 != 1
+select * from user where email = 'null@void.com' limit 10001
+
+[ks_sharded/40-80]:
+select * from user where 1 != 1
+select * from user where email = 'null@void.com' limit 10001
+
+[ks_sharded/80-c0]:
+select * from user where 1 != 1
+select * from user where email = 'null@void.com' limit 10001
+
+[ks_sharded/c0-]:
+select * from user where 1 != 1
+select * from user where email = 'null@void.com' limit 10001
+
+----------------------------------------------------------------------
+select * from user where id in (1,2,3,4,5,6,7,8)
+
+[ks_sharded/-40]:
+select * from user where 1 != 1
+select * from user where id in (1, 2) limit 10001
+
+[ks_sharded/40-80]:
+select * from user where 1 != 1
+select * from user where id in (3, 5) limit 10001
+
+[ks_sharded/c0-]:
+select * from user where 1 != 1
+select * from user where id in (4, 6, 7, 8) limit 10001
+
+----------------------------------------------------------------------
+insert into user (id, name) values(2, 'bob')
+
+[ks_sharded/-40]:
+begin
+insert into user(id, name) values (2, 'bob') /* _stream user (id ) (2 ); */
+commit
+
+[ks_sharded/c0-]:
+begin
+insert into name_user_map(name, user_id) values ('bob', 2) /* _stream name_user_map (name user_id ) ('Ym9i' 2 ); */
+commit
+
+----------------------------------------------------------------------
diff --git a/data/test/vtexplain/options-queries.sql b/data/test/vtexplain/options-queries.sql
new file mode 100644
index 00000000000..76a72a5adca
--- /dev/null
+++ b/data/test/vtexplain/options-queries.sql
@@ -0,0 +1,3 @@
+select * from user where email='null@void.com';
+select * from user where id in (1,2,3,4,5,6,7,8);
+insert into user (id, name) values(2, 'bob');
diff --git a/data/test/vtexplain/selectsharded-output.json b/data/test/vtexplain/selectsharded-output.json
new file mode 100644
index 00000000000..29b37f66c1b
--- /dev/null
+++ b/data/test/vtexplain/selectsharded-output.json
@@ -0,0 +1,406 @@
+[
+    {
+        "SQL": "select * from user /* scatter */",
+        "Plans": [
+            {
+                "Original": "select * from user",
+                "Instructions": {
+                    "Opcode": "SelectScatter",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select * from user",
+                    "FieldQuery": "select * from user where 1 != 1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user /* scatter */",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user limit 10001"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user /* scatter */",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "select * from user where id = 1 /* equal unique */",
+        "Plans": [
+            {
+                "Original": "select * from user where id = :vtg1",
+                "Instructions": {
+                    "Opcode": "SelectEqualUnique",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select * from user where id = :vtg1",
+                    "FieldQuery": "select * from user where 1 != 1",
+                    "Vindex": "hash",
+                    "Values": [
+                        ":vtg1"
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where id = :vtg1 /* equal unique */",
+                        "BindVars": {
+                            "vtg1": "1"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where id = 1 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "select * from user where id > 100 /* scatter range */",
+        "Plans": [
+            {
+                "Original": "select * from user where id > :vtg1",
+                "Instructions": {
+                    "Opcode": "SelectScatter",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select * from user where id > :vtg1",
+                    "FieldQuery": "select * from user where 1 != 1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where id > :vtg1 /* scatter range */",
+                        "BindVars": {
+                            "vtg1": "100"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where id > 100 limit 10001"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where id > :vtg1 /* scatter range */",
+                        "BindVars": {
+                            "vtg1": "100"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where id > 100 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "select * from user where name = 'bob'/* vindex lookup */",
+        "Plans": [
+            {
+                "Original": "select user_id from name_user_map where name = :name",
+                "Instructions": {
+                    "Opcode": "SelectEqualUnique",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select user_id from name_user_map where name = :name",
+                    "FieldQuery": "select user_id from name_user_map where 1 != 1",
+                    "Vindex": "md5",
+                    "Values": [
+                        ":name"
+                    ]
+                }
+            },
+            {
+                "Original": "select * from user where name = :vtg1",
+                "Instructions": {
+                    "Opcode": "SelectEqual",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select * from user where name = :vtg1",
+                    "FieldQuery": "select * from user where 1 != 1",
+                    "Vindex": "name_user_map",
+                    "Values": [
+                        ":vtg1"
+                    ]
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where name = :vtg1/* vindex lookup */",
+                        "BindVars": {
+                            "vtg1": "'bob'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where name = 'bob' limit 10001"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select user_id from name_user_map where name = :name/* vindex lookup */",
+                        "BindVars": {
+                            "name": "'bob'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select user_id from name_user_map where 1 != 1",
+                    "select user_id from name_user_map where name = 'bob' limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "select * from user where name = 'bob' or nickname = 'bob'/* vindex lookup */",
+        "Plans": [
+            {
+                "Original": "select * from user where name = :vtg1 or nickname = :vtg1",
+                "Instructions": {
+                    "Opcode": "SelectScatter",
+                    "Keyspace": {
+                        "Name": "ks_sharded",
+                        "Sharded": true
+                    },
+                    "Query": "select * from user where (name = :vtg1 or nickname = :vtg1)",
+                    "FieldQuery": "select * from user where 1 != 1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where (name = :vtg1 or nickname = :vtg1)/* vindex lookup */",
+                        "BindVars": {
+                            "vtg1": "'bob'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where (name = 'bob' or nickname = 'bob') limit 10001"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from user where (name = :vtg1 or nickname = :vtg1)/* vindex lookup */",
+                        "BindVars": {
+                            "vtg1": "'bob'"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from user where 1 != 1",
+                    "select * from user where (name = 'bob' or nickname = 'bob') limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "select u.name, n.info from user u join name_info n on u.name = n.name /* join on varchar */",
+        "Plans": [
+            {
+                "Original": "select u.name, n.info from user as u join name_info as n on u.name = n.name",
+                "Instructions": {
+                    "Opcode": "Join",
+                    "Left": {
+                        "Opcode": "SelectScatter",
+                        "Keyspace": {
+                            "Name": "ks_sharded",
+                            "Sharded": true
+                        },
+                        "Query": "select u.name from user as u",
+                        "FieldQuery": "select u.name from user as u where 1 != 1"
+                    },
+                    "Right": {
+                        "Opcode": "SelectEqualUnique",
+                        "Keyspace": {
+                            "Name": "ks_sharded",
+                            "Sharded": true
+                        },
+                        "Query": "select n.info from name_info as n where n.name = :u_name",
+                        "FieldQuery": "select n.info from name_info as n where 1 != 1",
+                        "Vindex": "md5",
+                        "Values": [
+                            ":u_name"
+                        ],
+                        "JoinVars": {
+                            "u_name": {}
+                        }
+                    },
+                    "Cols": [
+                        -1,
+                        1
+                    ],
+                    "Vars": {
+                        "u_name": 0
+                    }
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select u.name from user as u /* join on varchar */",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select u.name from user as u where 1 != 1",
+                    "select u.name from user as u limit 10001"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select u.name from user as u /* join on varchar */",
+                        "BindVars": {}
+                    },
+                    {
+                        "SQL": "select n.info from name_info as n where n.name = :u_name /* join on varchar */",
+                        "BindVars": {
+                            "u_name": "1"
+                        }
+                    },
+                    {
+                        "SQL": "select n.info from name_info as n where n.name = :u_name /* join on varchar */",
+                        "BindVars": {
+                            "u_name": "1"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select u.name from user as u where 1 != 1",
+                    "select u.name from user as u limit 10001",
+                    "select n.info from name_info as n where 1 != 1",
+                    "select n.info from name_info as n where n.name = 1 limit 10001",
+                    "select n.info from name_info as n where n.name = 1 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "select m.id, m.song, e.extra from music m join music_extra e on m.id = e.id where m.user_id = 100 /* join on int */",
+        "Plans": [
+            {
+                "Original": "select m.id, m.song, e.extra from music as m join music_extra as e on m.id = e.id where m.user_id = :vtg1",
+                "Instructions": {
+                    "Opcode": "Join",
+                    "Left": {
+                        "Opcode": "SelectEqualUnique",
+                        "Keyspace": {
+                            "Name": "ks_sharded",
+                            "Sharded": true
+                        },
+                        "Query": "select m.id, m.song from music as m where m.user_id = :vtg1",
+                        "FieldQuery": "select m.id, m.song from music as m where 1 != 1",
+                        "Vindex": "hash",
+                        "Values": [
+                            ":vtg1"
+                        ]
+                    },
+                    "Right": {
+                        "Opcode": "SelectEqualUnique",
+                        "Keyspace": {
+                            "Name": "ks_sharded",
+                            "Sharded": true
+                        },
+                        "Query": "select e.extra from music_extra as e where e.id = :m_id",
+                        "FieldQuery": "select e.extra from music_extra as e where 1 != 1",
+                        "Vindex": "hash",
+                        "Values": [
+                            ":m_id"
+                        ],
+                        "JoinVars": {
+                            "m_id": {}
+                        }
+                    },
+                    "Cols": [
+                        -1,
+                        -2,
+                        1
+                    ],
+                    "Vars": {
+                        "m_id": 0
+                    }
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_sharded/-80": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select e.extra from music_extra as e where e.id = :m_id /* join on int */",
+                        "BindVars": {
+                            "m_id": "1",
+                            "vtg1": "100"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select e.extra from music_extra as e where 1 != 1",
+                    "select e.extra from music_extra as e where e.id = 1 limit 10001"
+                ]
+            },
+            "ks_sharded/80-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select m.id, m.song from music as m where m.user_id = :vtg1 /* join on int */",
+                        "BindVars": {
+                            "vtg1": "100"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "select m.id, m.song from music as m where 1 != 1",
+                    "select m.id, m.song from music as m where m.user_id = 100 limit 10001"
+                ]
+            }
+        }
+    }
+]
diff --git a/data/test/vtexplain/selectsharded-output.txt b/data/test/vtexplain/selectsharded-output.txt
new file mode 100644
index 00000000000..92fb794320f
--- /dev/null
+++ b/data/test/vtexplain/selectsharded-output.txt
@@ -0,0 +1,77 @@
+----------------------------------------------------------------------
+select * from user /* scatter */
+
+[ks_sharded/-80]:
+select * from user where 1 != 1
+select * from user limit 10001
+
+[ks_sharded/80-]:
+select * from user where 1 != 1
+select * from user limit 10001
+
+----------------------------------------------------------------------
+select * from user where id = 1 /* equal unique */
+
+[ks_sharded/-80]:
+select * from user where 1 != 1
+select * from user where id = 1 limit 10001
+
+----------------------------------------------------------------------
+select * from user where id > 100 /* scatter range */
+
+[ks_sharded/-80]:
+select * from user where 1 != 1
+select * from user where id > 100 limit 10001
+
+[ks_sharded/80-]:
+select * from user where 1 != 1
+select * from user where id > 100 limit 10001
+
+----------------------------------------------------------------------
+select * from user where name = 'bob'/* vindex lookup */
+
+[ks_sharded/-80]:
+select * from user where 1 != 1
+select * from user where name = 'bob' limit 10001
+
+[ks_sharded/80-]:
+select user_id from name_user_map where 1 != 1
+select user_id from name_user_map where name = 'bob' limit 10001
+
+----------------------------------------------------------------------
+select * from user where name = 'bob' or nickname = 'bob'/* vindex lookup */
+
+[ks_sharded/-80]:
+select * from user where 1 != 1
+select * from user where (name = 'bob' or nickname = 'bob') limit 10001
+
+[ks_sharded/80-]:
+select * from user where 1 != 1
+select * from user where (name = 'bob' or nickname = 'bob') limit 10001
+
+----------------------------------------------------------------------
+select u.name, n.info from user u join name_info n on u.name = n.name /* join on varchar */
+
+[ks_sharded/-80]:
+select u.name from user as u where 1 != 1
+select u.name from user as u limit 10001
+
+[ks_sharded/80-]:
+select u.name from user as u where 1 != 1
+select u.name from user as u limit 10001
+select n.info from name_info as n where 1 != 1
+select n.info from name_info as n where n.name = 1 limit 10001
+select n.info from name_info as n where n.name = 1 limit 10001
+
+----------------------------------------------------------------------
+select m.id, m.song, e.extra from music m join music_extra e on m.id = e.id where m.user_id = 100 /* join on int */
+
+[ks_sharded/-80]:
+select e.extra from music_extra as e where 1 != 1
+select e.extra from music_extra as e where e.id = 1 limit 10001
+
+[ks_sharded/80-]:
+select m.id, m.song from music as m where 1 != 1
+select m.id, m.song from music as m where m.user_id = 100 limit 10001
+
+----------------------------------------------------------------------
diff --git a/data/test/vtexplain/selectsharded-queries.sql b/data/test/vtexplain/selectsharded-queries.sql
new file mode 100644
index 00000000000..e0c37f34059
--- /dev/null
+++ b/data/test/vtexplain/selectsharded-queries.sql
@@ -0,0 +1,7 @@
+select * from user /* scatter */;
+select * from user where id = 1 /* equal unique */;
+select * from user where id > 100 /* scatter range */;
+select * from user where name = 'bob'/* vindex lookup */;
+select * from user where name = 'bob' or nickname = 'bob'/* vindex lookup */;
+select u.name, n.info from user u join name_info n on u.name = n.name /* join on varchar */;
+select m.id, m.song, e.extra from music m join music_extra e on m.id = e.id where m.user_id = 100 /* join on int */;
diff --git a/data/test/vtexplain/test-schema.sql b/data/test/vtexplain/test-schema.sql
new file mode 100644
index 00000000000..83675c2bed7
--- /dev/null
+++ b/data/test/vtexplain/test-schema.sql
@@ -0,0 +1,48 @@
+create table t1 (
+	id bigint(20) unsigned not null,
+	val bigint(20) unsigned not null default 0,
+	primary key (id)
+);
+
+create table user (
+	id bigint,
+	name varchar(64),
+	email varchar(64),
+	primary key (id)
+) Engine=InnoDB;
+
+create table name_user_map (
+	name varchar(64),
+	user_id bigint,
+	primary key (name, user_id)
+) Engine=InnoDB;
+
+create table name_info(
+	name varchar(128),
+	info varchar(128),
+	primary key(name)
+);
+
+create table email_info(
+	name varchar(128),
+	info varchar(128),
+	primary key(name)
+);
+
+create table music (
+	user_id bigint,
+	id bigint,
+	song varchar(64),
+	primary key (user_id, id)
+) Engine=InnoDB;
+
+create table music_extra (
+	id bigint,
+	extra varchar(64),
+	primary key (id)
+) Engine=InnoDB;
+
+create table table_not_in_vschema (
+	id bigint,
+	primary key (id)
+) Engine=InnoDB;
diff --git a/data/test/vtexplain/test-vschema.json b/data/test/vtexplain/test-vschema.json
new file mode 100644
index 00000000000..ca45149e6f0
--- /dev/null
+++ b/data/test/vtexplain/test-vschema.json
@@ -0,0 +1,88 @@
+{
+	"ks_unsharded": {
+		"Sharded": false,
+		"Tables": {
+			"t1": {},
+			"table_not_in_schema": {}
+		}
+	},
+	"ks_sharded": {
+		"Sharded": true,
+		"vindexes": {
+			"music_user_map": {
+				"type": "lookup_hash_unique",
+				"owner": "music",
+				"params": {
+					"table": "music_user_map",
+					"from": "music_id",
+					"to": "user_id"
+				}
+			},
+			"name_user_map": {
+				"type": "lookup_hash",
+				"owner": "user",
+				"params": {
+					"table": "name_user_map",
+					"from": "name",
+					"to": "user_id"
+				}
+			},
+			"hash": {
+				"type": "hash"
+			},
+			"md5": {
+				"type": "unicode_loose_md5"
+			}
+		},
+		"tables": {
+			"user": {
+				"column_vindexes": [
+					{
+						"column": "id",
+						"name": "hash"
+					},
+					{
+						"column": "name",
+						"name": "name_user_map"
+					}
+				]
+			},
+			"music": {
+				"column_vindexes": [
+					{
+						"column": "user_id",
+						"name": "hash"
+					},
+					{
+						"column": "id",
+						"name": "music_user_map"
+					}
+				]
+			},
+			"music_extra": {
+				"column_vindexes": [
+					{
+						"column": "id",
+						"name": "hash"
+					}
+				]
+			},
+			"name_user_map": {
+				"column_vindexes": [
+					{
+						"column": "name",
+						"name": "md5"
+					}
+				]
+			},
+			"name_info": {
+				"column_vindexes": [
+					{
+						"column": "name",
+						"name": "md5"
+					}
+				]
+			}
+		}
+	}
+}
diff --git a/data/test/vtexplain/unsharded-output.json b/data/test/vtexplain/unsharded-output.json
new file mode 100644
index 00000000000..cae341dcb39
--- /dev/null
+++ b/data/test/vtexplain/unsharded-output.json
@@ -0,0 +1,171 @@
+[
+    {
+        "SQL": "select * from t1",
+        "Plans": [
+            {
+                "Original": "select * from t1",
+                "Instructions": {
+                    "Opcode": "SelectUnsharded",
+                    "Keyspace": {
+                        "Name": "ks_unsharded",
+                        "Sharded": false
+                    },
+                    "Query": "select * from t1",
+                    "FieldQuery": "select * from t1 where 1 != 1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_unsharded/-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "select * from t1",
+                        "BindVars": {}
+                    }
+                ],
+                "MysqlQueries": [
+                    "select * from t1 where 1 != 1",
+                    "select * from t1 limit 10001"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert into t1 (id,val) values (1,2)",
+        "Plans": [
+            {
+                "Original": "insert into t1(id, val) values (:vtg1, :vtg2)",
+                "Instructions": {
+                    "Opcode": "InsertUnsharded",
+                    "Keyspace": {
+                        "Name": "ks_unsharded",
+                        "Sharded": false
+                    },
+                    "Query": "insert into t1(id, val) values (:vtg1, :vtg2)",
+                    "Table": "t1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_unsharded/-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into t1(id, val) values (:vtg1, :vtg2)",
+                        "BindVars": {
+                            "vtg1": "1",
+                            "vtg2": "2"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into t1(id, val) values (1, 2)",
+                    "commit"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "update t1 set val = 10",
+        "Plans": [
+            {
+                "Original": "update t1 set val = :vtg1",
+                "Instructions": {
+                    "Opcode": "UpdateUnsharded",
+                    "Keyspace": {
+                        "Name": "ks_unsharded",
+                        "Sharded": false
+                    },
+                    "Query": "update t1 set val = :vtg1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_unsharded/-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "update t1 set val = :vtg1",
+                        "BindVars": {
+                            "vtg1": "10"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "select id from t1 limit 10001 for update",
+                    "update t1 set val = 10 where id in (1)",
+                    "commit"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "delete from t1 where id = 100",
+        "Plans": [
+            {
+                "Original": "delete from t1 where id = :vtg1",
+                "Instructions": {
+                    "Opcode": "DeleteUnsharded",
+                    "Keyspace": {
+                        "Name": "ks_unsharded",
+                        "Sharded": false
+                    },
+                    "Query": "delete from t1 where id = :vtg1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_unsharded/-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "delete from t1 where id = :vtg1",
+                        "BindVars": {
+                            "vtg1": "100"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "delete from t1 where id in (100)",
+                    "commit"
+                ]
+            }
+        }
+    },
+    {
+        "SQL": "insert into t1 (id,val) values (1,2) on duplicate key update val=3",
+        "Plans": [
+            {
+                "Original": "insert into t1(id, val) values (:vtg1, :vtg2) on duplicate key update val = :vtg3",
+                "Instructions": {
+                    "Opcode": "InsertUnsharded",
+                    "Keyspace": {
+                        "Name": "ks_unsharded",
+                        "Sharded": false
+                    },
+                    "Query": "insert into t1(id, val) values (:vtg1, :vtg2) on duplicate key update val = :vtg3",
+                    "Table": "t1"
+                }
+            }
+        ],
+        "TabletActions": {
+            "ks_unsharded/-": {
+                "TabletQueries": [
+                    {
+                        "SQL": "insert into t1(id, val) values (:vtg1, :vtg2) on duplicate key update val = :vtg3",
+                        "BindVars": {
+                            "vtg1": "1",
+                            "vtg2": "2",
+                            "vtg3": "3"
+                        }
+                    }
+                ],
+                "MysqlQueries": [
+                    "begin",
+                    "insert into t1(id, val) values (1, 2) on duplicate key update val = 3",
+                    "commit"
+                ]
+            }
+        }
+    }
+]
diff --git a/data/test/vtexplain/unsharded-output.txt b/data/test/vtexplain/unsharded-output.txt
new file mode 100644
index 00000000000..8ab1a550957
--- /dev/null
+++ b/data/test/vtexplain/unsharded-output.txt
@@ -0,0 +1,41 @@
+----------------------------------------------------------------------
+select * from t1
+
+[ks_unsharded/-]:
+select * from t1 where 1 != 1
+select * from t1 limit 10001
+
+----------------------------------------------------------------------
+insert into t1 (id,val) values (1,2)
+
+[ks_unsharded/-]:
+begin
+insert into t1(id, val) values (1, 2)
+commit
+
+----------------------------------------------------------------------
+update t1 set val = 10
+
+[ks_unsharded/-]:
+begin
+select id from t1 limit 10001 for update
+update t1 set val = 10 where id in (1)
+commit
+
+----------------------------------------------------------------------
+delete from t1 where id = 100
+
+[ks_unsharded/-]:
+begin
+delete from t1 where id in (100)
+commit
+
+----------------------------------------------------------------------
+insert into t1 (id,val) values (1,2) on duplicate key update val=3
+
+[ks_unsharded/-]:
+begin
+insert into t1(id, val) values (1, 2) on duplicate key update val = 3
+commit
+
+----------------------------------------------------------------------
diff --git a/data/test/vtexplain/unsharded-queries.sql b/data/test/vtexplain/unsharded-queries.sql
new file mode 100644
index 00000000000..429d7300281
--- /dev/null
+++ b/data/test/vtexplain/unsharded-queries.sql
@@ -0,0 +1,5 @@
+select * from t1;
+insert into t1 (id,val) values (1,2);
+update t1 set val = 10;
+delete from t1 where id = 100;
+insert into t1 (id,val) values (1,2) on duplicate key update val=3;
diff --git a/data/test/vtgate/aggr_cases.txt b/data/test/vtgate/aggr_cases.txt
index e1d1cb0480d..92e9950c390 100644
--- a/data/test/vtgate/aggr_cases.txt
+++ b/data/test/vtgate/aggr_cases.txt
@@ -257,7 +257,7 @@
   }
 }
 
-# group by a unique vindex should revert to simple route
+# group by a unique vindex should use a simple route
 "select id, count(*) from user group by id"
 {
   "Original": "select id, count(*) from user group by id",
@@ -272,6 +272,145 @@
   }
 }
 
+# group by a unique vindex and other column should use a simple route
+"select id, col, count(*) from user group by id, col"
+{
+  "Original": "select id, col, count(*) from user group by id, col",
+  "Instructions": {
+    "Opcode": "SelectScatter",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "select id, col, count(*) from user group by id, col",
+    "FieldQuery": "select id, col, count(*) from user where 1 != 1 group by id, col"
+  }
+}
+
+# group by a non-vindex column should use an OrderdAggregate primitive
+"select col, count(*) from user group by col"
+{
+  "Original": "select col, count(*) from user group by col",
+  "Instructions": {
+    "Aggregates": [
+      {
+        "Opcode": "count",
+        "Col": 1
+      }
+    ],
+    "Keys": [
+      0
+    ],
+    "Input": {
+      "Opcode": "SelectScatter",
+      "Keyspace": {
+        "Name": "user",
+        "Sharded": true
+      },
+      "Query": "select col, count(*) from user group by col order by col asc",
+      "FieldQuery": "select col, count(*) from user where 1 != 1 group by col",
+      "OrderBy": [
+        {
+          "Col": 0,
+          "Desc": false
+        }
+      ]
+    }
+  }
+}
+
+# group by a non-unique vindex column should use an OrderdAggregate primitive
+"select name, count(*) from user group by name"
+{
+  "Original": "select name, count(*) from user group by name",
+  "Instructions": {
+    "Aggregates": [
+      {
+        "Opcode": "count",
+        "Col": 1
+      }
+    ],
+    "Keys": [
+      0
+    ],
+    "Input": {
+      "Opcode": "SelectScatter",
+      "Keyspace": {
+        "Name": "user",
+        "Sharded": true
+      },
+      "Query": "select name, count(*) from user group by name order by name asc",
+      "FieldQuery": "select name, count(*) from user where 1 != 1 group by name",
+      "OrderBy": [
+        {
+          "Col": 0,
+          "Desc": false
+        }
+      ]
+    }
+  }
+}
+
+# group by a unique vindex should use a simple route, even if aggr is complex
+"select id, 1+count(*) from user group by id"
+{
+  "Original": "select id, 1+count(*) from user group by id",
+  "Instructions": {
+    "Opcode": "SelectScatter",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "select id, 1 + count(*) from user group by id",
+    "FieldQuery": "select id, 1 + count(*) from user where 1 != 1 group by id"
+  }
+}
+
+# group by a unique vindex where alias from select list is used
+"select id as val, 1+count(*) from user group by val"
+{
+  "Original": "select id as val, 1+count(*) from user group by val",
+  "Instructions": {
+    "Opcode": "SelectScatter",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "select id as val, 1 + count(*) from user group by val",
+    "FieldQuery": "select id as val, 1 + count(*) from user where 1 != 1 group by val"
+  }
+}
+
+# group by a unique vindex where expression is qualified (alias should be ignored)
+"select val as id, 1+count(*) from user group by user.id"
+{
+  "Original": "select val as id, 1+count(*) from user group by user.id",
+  "Instructions": {
+    "Opcode": "SelectScatter",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "select val as id, 1 + count(*) from user group by user.id",
+    "FieldQuery": "select val as id, 1 + count(*) from user where 1 != 1 group by user.id"
+  }
+}
+
+# group by a unique vindex where it should skip non-aliased expressions.
+"select *, id, 1+count(*) from user group by id"
+{
+  "Original": "select *, id, 1+count(*) from user group by id",
+  "Instructions": {
+    "Opcode": "SelectScatter",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "select *, id, 1 + count(*) from user group by id",
+    "FieldQuery": "select *, id, 1 + count(*) from user where 1 != 1 group by id"
+  }
+}
+
 # group by a unique vindex should revert to simple route, and having clause should find the correct symbols.
 "select id, count(*) c from user group by id having id=1 and c=10"
 {
@@ -826,3 +965,11 @@
       "Values":[5]
    }
 }
+
+# Group by invalid column number (code is duplicated from symab).
+"select id from user group by 1.1"
+"column number is not an int"
+
+# Group by out of range column number (code is duplicated from symab).
+"select id from user group by 2"
+"column number out of range: 2"
diff --git a/data/test/vtgate/unsupported_cases.txt b/data/test/vtgate/unsupported_cases.txt
index 91f7db6b50a..8cf281f94c0 100644
--- a/data/test/vtgate/unsupported_cases.txt
+++ b/data/test/vtgate/unsupported_cases.txt
@@ -65,7 +65,7 @@
 
 # scatter order by with * expression
 "select * from user order by id"
-"unsupported: scatter order by with a '*' in select expression"
+"unsupported: in scatter query: order by must reference a column in the select list: id asc"
 
 # filtering on a cross-shard subquery
 "select id from (select user.id, user.col from user join user_extra) as t where id=5"
@@ -123,6 +123,10 @@
 "select * from user join user_extra"
 "unsupported: '*' expression in cross-shard query"
 
+# Group by column number, used with non-aliased expression (duplicated code)
+"select * from user group by 1"
+"unsupported: '*' expression in cross-shard query"
+
 # Filtering on scatter aggregates
 "select count(*) a from user having a >10"
 "unsupported: filtering on results of aggregates"
diff --git a/dev.env b/dev.env
index f290df1f562..c4d85150712 100644
--- a/dev.env
+++ b/dev.env
@@ -34,8 +34,6 @@ mkdir -p $VTDATAROOT
 
 export VTPORTSTART=15000
 
-export GO15VENDOREXPERIMENT=1
-
 for pypath in $(find $VTROOT/dist -name site-packages -or -name dist-packages | grep -v src/python/grpcio/.tox/py27/lib/python2.7/site-packages)
 do
   export PYTHONPATH=$(prepend_path $PYTHONPATH $pypath)
diff --git a/doc/BackupAndRestore.md b/doc/BackupAndRestore.md
index 7b622289921..5e4676058e1 100644
--- a/doc/BackupAndRestore.md
+++ b/doc/BackupAndRestore.md
@@ -120,7 +120,7 @@ the [scope](https://cloud.google.com/compute/docs/authentication#using) that
 grants read-write access to Cloud Storage. When using Container Engine, you can
 do this for all the instances it creates by adding `--scopes storage-rw` to the
 `gcloud container clusters create` command as shown in the [Vitess on Kubernetes
-guide](http://vitess.io/getting-started/#start-a-container-engine-cluster).
+guide]({% link getting-started/index.md %}#start-a-container-engine-cluster).
 
 ## Creating a backup
 
@@ -181,14 +181,14 @@ vttablet ... -backup_storage_implementation=file \
 
 **vtctl** provides two commands for managing backups:
 
-* [ListBackups](/reference/vtctl.html#listbackups) displays the
+* [ListBackups]({% link reference/vtctl.md %}#listbackups) displays the
     existing backups for a keyspace/shard in chronological order.
 
     ``` sh
     vtctl ListBackups <keyspace/shard>
     ```
 
-* [RemoveBackup](/reference/vtctl.html#removebackup) deletes a
+* [RemoveBackup]({% link reference/vtctl.md %}#removebackup) deletes a
     specified backup for a keyspace/shard.
 
     ``` sh
@@ -233,7 +233,7 @@ The back-up and restore processes simultaneously copy and either
 compress or decompress multiple files to increase throughput. You
 can control the concurrency using command-line flags:
 
-* The vtctl [Backup](/reference/vtctl.html#backup) command uses the
+* The vtctl [Backup]({% link reference/vtctl.md %}#backup) command uses the
   `-concurrency` flag.
 * vttablet uses the `-restore_concurrency` flag.
 
diff --git a/doc/Concepts.md b/doc/Concepts.md
index 790105f3ac5..eebafbb16ac 100644
--- a/doc/Concepts.md
+++ b/doc/Concepts.md
@@ -20,7 +20,7 @@ data resides.
 ## Keyspace ID
 
 The *keyspace ID* is the value that is used to decide on which shard a given
-record lives. [Range-based Sharding](http://vitess.io/user-guide/sharding.html#range-based-sharding)
+record lives. [Range-based Sharding]({% link user-guide/sharding.md %}#range-based-sharding)
 refers to creating shards that each cover a particular range of keyspace IDs.
 
 Often, the keyspace ID is computed as the hash of some column in your data,
@@ -51,7 +51,7 @@ shards with non-overlapping data.
 
 ### Resharding
 
-Vitess supports [dynamic resharding](http://vitess.io/user-guide/sharding.html#resharding),
+Vitess supports [dynamic resharding]({% link user-guide/sharding.md %}#resharding),
 in which the number of shards is changed on a live cluster. This can be either
 splitting one or more shards into smaller pieces, or merging neighboring shards
 into bigger pieces.
@@ -144,14 +144,14 @@ to a newly designated master database so that replication can continue.
 
 ## Topology Service
 
-The *[Topology Service](/user-guide/topology-service.html)*
+The *[Topology Service]({% link user-guide/topology-service.md %})*
 is a set of backend processes running on different servers.
 Those servers store topology data and provide a distributed locking service.
 
 Vitess uses a plug-in system to support various backends for storing topology
 data, which are assumed to provide a distributed, consistent key-value store.
-By default, our [local example](http://vitess.io/getting-started/local-instance.html)
-uses the ZooKeeper plugin, and the [Kubernetes example](http://vitess.io/getting-started/)
+By default, our [local example]({% link getting-started/local-instance.md %})
+uses the ZooKeeper plugin, and the [Kubernetes example]({% link getting-started/index.md %})
 uses etcd.
 
 The topology service exists for several reasons:
diff --git a/doc/Contributing.md b/doc/Contributing.md
index 8aba34dc759..a5a116e9322 100644
--- a/doc/Contributing.md
+++ b/doc/Contributing.md
@@ -58,9 +58,9 @@ Before diving into the Vitess codebase, make yourself familiar with the system a
 
 * Read the [What is Vitess](/overview/) page, in particular the architecture section.
 
-* Read the [Vitess concepts](/overview/concepts.html) and the [Sharding](/user-guide/sharding.html) page.
+* Read the [Vitess concepts]({% link overview/concepts.md %}) and the [Sharding]({% link user-guide/sharding.md %}) page.
 
-  * We also recommend to look at our [latest presentations](/resources/presentations.html). They contain many illustrations which help understanding how Vitess works in detail.
+  * We also recommend to look at our [latest presentations]({% link resources/presentations.md %}). They contain many illustrations which help understanding how Vitess works in detail.
 
   * After studying the pages, try to answer the following question (click expand to see the answer):
     <details> 
diff --git a/doc/DockerBuild.md b/doc/DockerBuild.md
index c237e231eeb..e0fe75cbf8f 100644
--- a/doc/DockerBuild.md
+++ b/doc/DockerBuild.md
@@ -97,4 +97,4 @@ Then you can run our build script for the `lite` image which extracts the Vitess
     with a specific label that you change each time you make a new build,
     so you can control when pods update.
 
-1.  Launch [Vitess on Kubernetes](http://vitess.io/getting-started/) as usual.
+1.  Launch [Vitess on Kubernetes]({% link getting-started/index.md %}) as usual.
diff --git a/doc/GettingStarted.md b/doc/GettingStarted.md
index 37c4d5e411f..d03406b17d4 100644
--- a/doc/GettingStarted.md
+++ b/doc/GettingStarted.md
@@ -17,7 +17,7 @@ To run Vitess in Docker, you can either use our pre-built images on [Docker Hub]
 * The [vitess/lite](https://hub.docker.com/r/vitess/lite/) image contains only
   the compiled Vitess binaries, excluding ZooKeeper. It can run Vitess, but
   lacks the environment needed to build Vitess or run tests. It's primarily used
-  for the [Vitess on Kubernetes](http://vitess.io/getting-started/) guide.
+  for the [Vitess on Kubernetes]({% link getting-started/index.md %}) guide.
 
 For example, you can directly run `vitess/base`, and Docker will download the
 image for you:
@@ -73,7 +73,7 @@ OS X 10.11 (El Capitan) should work as well, the installation instructions are b
 
 In addition, Vitess requires the software and libraries listed below.
 
-1.  [Install Go 1.8+](http://golang.org/doc/install).
+1.  [Install Go 1.9+](http://golang.org/doc/install).
 
 2.  Install [MariaDB 10.0](https://downloads.mariadb.org/) or
     [MySQL 5.6](http://dev.mysql.com/downloads/mysql). You can use any
@@ -283,7 +283,7 @@ In addition, Vitess requires the software and libraries listed below.
 export VT_TEST_FLAGS='--topo-server-flavor=etcd'
 ```
 
-The default targets when running `make` or `make test` contain a full set of
+The default targets when running `make test` contain a full set of
 tests intended to help Vitess developers to verify code changes. Those tests
 simulate a small Vitess cluster by launching many servers on the local
 machine. To do so, they require a lot of resources; a minimum of 8GB RAM
@@ -298,7 +298,7 @@ make site_test
 
 #### Common Test Issues
 
-Attempts to run the full developer test suite (`make` or `make test`)
+Attempts to run the full developer test suite (`make test`)
 on an underpowered machine often results in failure. If you still see
 the same failures when running the lighter set of tests (`make site_test`),
 please let the development team know in the
@@ -437,8 +437,8 @@ lock service. ZooKeeper is included in the Vitess distribution.
 1.  **Start vttablets**
 
     The `vttablet-up.sh` script brings up three vttablets, and assigns them to
-    a [keyspace](http://vitess.io/overview/concepts.html#keyspace) and [shard]
-    (http://vitess.io/overview/concepts.html#shard) according to the variables
+    a [keyspace]({% link overview/concepts.md %}#keyspace) and [shard]
+    ({% link overview/concepts.md %}#shard) according to the variables
     set at the top of the script file.
 
     ``` sh
@@ -460,7 +460,7 @@ lock service. ZooKeeper is included in the Vitess distribution.
     This is what an unsharded keyspace looks like.
 
     If you click on the shard box, you'll see a list of [tablets]
-    (http://vitess.io/overview/concepts.html#tablet) in that shard.
+    ({% link overview/concepts.md %}#tablet) in that shard.
     Note that it's normal for the tablets to be unhealthy at this point, since
     you haven't initialized them yet.
 
@@ -491,17 +491,19 @@ lock service. ZooKeeper is included in the Vitess distribution.
 
     After running this command, go back to the **Shard Status** page
     in the *vtctld* web interface. When you refresh the
-    page, you should see that one *vttablet* is the master
-    and the other two are replicas.
+    page, you should see that one *vttablet* is the master,
+    two are replicas and two are rdonly.
 
     You can also see this on the command line:
 
     ``` sh
     vitess/examples/local$ ./lvtctl.sh ListAllTablets test
     ### example output:
-    # test-0000000100 test_keyspace 0 master localhost:15100 localhost:33100 []
-    # test-0000000101 test_keyspace 0 replica localhost:15101 localhost:33101 []
-    # test-0000000102 test_keyspace 0 replica localhost:15102 localhost:33102 []
+    # test-0000000100 test_keyspace 0 master localhost:15100 localhost:17100 []
+    # test-0000000101 test_keyspace 0 replica localhost:15101 localhost:17101 []
+    # test-0000000102 test_keyspace 0 replica localhost:15102 localhost:17102 []
+    # test-0000000103 test_keyspace 0 rdonly localhost:15103 localhost:17103 []
+    # test-0000000104 test_keyspace 0 rdonly localhost:15104 localhost:17104 []
     ```
 
 1.  **Create a table**
@@ -529,7 +531,7 @@ lock service. ZooKeeper is included in the Vitess distribution.
 1.  **Take a backup**
 
     Now that the initial schema is applied, it's a good time to take the first
-    [backup](http://vitess.io/user-guide/backup-and-restore.html). This backup
+    [backup]({% link user-guide/backup-and-restore.md %}). This backup
     will be used to automatically restore any additional replicas that you run,
     before they connect themselves to the master and catch up on replication.
     If an existing tablet goes down and comes back up without its data, it will
@@ -607,10 +609,10 @@ See the comments at the top of each sample file for usage instructions.
 ### Try Vitess resharding
 
 Now that you have a full Vitess stack running, you may want to go on to the
-[Horizontal Sharding workflow guide](http://vitess.io/user-guide/horizontal-sharding-workflow.html)
-or [Horizontal Sharding codelab](http://vitess.io/user-guide/horizontal-sharding.html)
+[Horizontal Sharding workflow guide]({% link user-guide/horizontal-sharding-workflow.md %})
+or [Horizontal Sharding codelab]({% link user-guide/horizontal-sharding.md %})
 (if you prefer to run each step manually through commands) to try out
-[dynamic resharding](http://vitess.io/user-guide/sharding.html#resharding).
+[dynamic resharding]({% link user-guide/sharding.md %}#resharding).
 
 If so, you can skip the tear-down since the sharding guide picks up right here.
 If not, continue to the clean-up steps below.
diff --git a/doc/GettingStartedKubernetes.md b/doc/GettingStartedKubernetes.md
index 34ef212c6b0..424c248cf23 100644
--- a/doc/GettingStartedKubernetes.md
+++ b/doc/GettingStartedKubernetes.md
@@ -9,13 +9,13 @@ The `kubectl` steps will apply to any Kubernetes cluster.
 
 ## Prerequisites
 
-To complete the exercise in this guide, you must locally install Go 1.8+,
+To complete the exercise in this guide, you must locally install Go 1.9+,
 Vitess' `vtctlclient` tool, and Google Cloud SDK. The
 following sections explain how to set these up in your environment.
 
-### Install Go 1.8+
+### Install Go 1.9+
 
-You need to install [Go 1.8+](http://golang.org/doc/install) to build the
+You need to install [Go 1.9+](http://golang.org/doc/install) to build the
 `vtctlclient` tool, which issues commands to Vitess.
 
 After installing Go, make sure your `GOPATH` environment
@@ -139,7 +139,7 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
     ```
 
     **Note:** The `--scopes storage-rw` argument is necessary to allow
-    [built-in backup/restore](http://vitess.io/user-guide/backup-and-restore.html)
+    [built-in backup/restore]({% link user-guide/backup-and-restore.md %})
     to access [Google Cloud Storage](https://cloud.google.com/storage/).
 
 1.  Create a Cloud Storage bucket:
@@ -171,7 +171,7 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
     used to customize your cluster settings.
 
     Currently, we have out-of-the-box support for storing
-    [backups](http://vitess.io/user-guide/backup-and-restore.html) in
+    [backups]({% link user-guide/backup-and-restore.md %}) in
     [Google Cloud Storage](https://cloud.google.com/storage/). If you're using
     GCS, fill in the fields requested by the configure script, including the
     name of the bucket you created above.
@@ -199,7 +199,7 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
 
 1.  **Start an etcd cluster**
 
-    The Vitess [topology service](http://vitess.io/overview/concepts.html#topology-service)
+    The Vitess [topology service]({% link overview/concepts.md %}#topology-service)
     stores coordination data for all the servers in a Vitess cluster.
     It can store this data in one of several consistent storage systems.
     In this example, we'll use [etcd](https://github.com/coreos/etcd).
@@ -218,9 +218,9 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
     ```
 
     This command creates two clusters. One is for the
-    [global cell](/user-guide/topology-service.html#global-vs-local),
+    [global cell]({% link user-guide/topology-service.md %}#global-vs-local),
     and the other is for a
-    [local cell](http://vitess.io/overview/concepts.html#cell-data-center)
+    [local cell]({% link overview/concepts.md %}#cell-data-center)
     called *test*. You can check the status of the
     [pods](http://kubernetes.io/v1.1/docs/user-guide/pods.html)
     in the cluster by running:
@@ -326,12 +326,12 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
     vitess/examples/kubernetes$ ./kvtctl.sh help ListAllTablets
     ```
 
-    See the [vtctl reference](http://vitess.io/reference/vtctl.html) for a
+    See the [vtctl reference]({% link reference/vtctl.md %}) for a
     web-formatted version of the `vtctl help` output.
 
 1.  **Start vttablets**
 
-    A Vitess [tablet](http://vitess.io/overview/concepts.html#tablet) is the
+    A Vitess [tablet]({% link overview/concepts.md %}#tablet) is the
     unit of scaling for the database. A tablet consists of the
     `vttablet` and `mysqld` processes, running on the same
     host. We enforce this coupling in Kubernetes by putting the respective
@@ -358,8 +358,8 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
     ```
 
     In the vtctld web UI, you should soon see a
-    [keyspace](http://vitess.io/overview/concepts.html#keyspace) named `test_keyspace`
-    with a single [shard](http://vitess.io/overview/concepts.html#shard) named `0`.
+    [keyspace]({% link overview/concepts.md %}#keyspace) named `test_keyspace`
+    with a single [shard]({% link overview/concepts.md %}#shard) named `0`.
     Click on the shard name to see the list of tablets. When all 5 tablets
     show up on the shard status page, you're ready to continue. Note that it's
     normal for the tablets to be unhealthy at this point, since you haven't
@@ -420,7 +420,7 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
 
     The **replica** tablets are used for serving live web traffic, while the
     **rdonly** tablets are used for offline processing, such as batch jobs and backups.
-    The amount of each [tablet type](http://vitess.io/overview/concepts.html#tablet)
+    The amount of each [tablet type]({% link overview/concepts.md %}#tablet)
     that you launch can be configured in the `vttablet-up.sh` script.
 
 1.  **Create a table**
@@ -469,7 +469,7 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
 1.  **Take a backup**
 
     Now that the initial schema is applied, it's a good time to take the first
-    [backup](http://vitess.io/user-guide/backup-and-restore.html). This backup
+    [backup]({% link user-guide/backup-and-restore.md %}). This backup
     will be used to automatically restore any additional replicas that you run,
     before they connect themselves to the master and catch up on replication.
     If an existing tablet goes down and comes back up without its data, it will
@@ -505,7 +505,7 @@ $ export KUBECTL=/example/path/to/google-cloud-sdk/bin/kubectl
 
 1.  **Start vtgate**
 
-    Vitess uses [vtgate](http://vitess.io/overview/#vtgate) to route each client
+    Vitess uses [vtgate]({% link overview/index.md %}#vtgate) to route each client
     query to the correct `vttablet`. In Kubernetes, a `vtgate` service
     distributes connections to a pool of `vtgate` pods. The pods are curated by
     a [replication controller]
@@ -600,10 +600,10 @@ provides more detail about how the app server interacts with Vitess.
 ## Try Vitess resharding
 
 Now that you have a full Vitess stack running, you may want to go on to the
-[Sharding in Kubernetes workflow guide](http://vitess.io/user-guide/sharding-kubernetes.html)
-or [Sharding in Kubernetes codelab](http://vitess.io/user-guide/sharding-kubernetes.html)
+[Sharding in Kubernetes workflow guide]({% link user-guide/sharding-kubernetes.md %})
+or [Sharding in Kubernetes codelab]({% link user-guide/sharding-kubernetes.md %})
 (if you prefer to run each step manually through commands) to try out
-[dynamic resharding](http://vitess.io/user-guide/sharding.html#resharding).
+[dynamic resharding]({% link user-guide/sharding.md %}#resharding).
 
 If so, you can skip the tear-down since the sharding guide picks up right here.
 If not, continue to the clean-up steps below.
diff --git a/doc/GitHubWorkflow.md b/doc/GitHubWorkflow.md
index f257904997c..f1559fec80d 100644
--- a/doc/GitHubWorkflow.md
+++ b/doc/GitHubWorkflow.md
@@ -73,7 +73,7 @@ $ git checkout master
 
 Try to commit small pieces along the way as you finish them, with an explanation
 of the changes in the commit message.
-Please see the [Code Review page](/contributing/code-reviews.html) for more guidance.
+Please see the [Code Review page]({% link contributing/code-reviews.md %}) for more guidance.
 
 As you work in a package, you can run just
 the unit tests for that package by running `go test` from within that package.
diff --git a/doc/HorizontalReshardingGuide.md b/doc/HorizontalReshardingGuide.md
index 3d6e8d1d2ad..f38c5563ef4 100644
--- a/doc/HorizontalReshardingGuide.md
+++ b/doc/HorizontalReshardingGuide.md
@@ -1,10 +1,10 @@
 This guide walks you through the process of sharding an existing unsharded
-Vitess [keyspace](http://vitess.io/overview/concepts.html#keyspace).
+Vitess [keyspace]({% link overview/concepts.md %}#keyspace).
 
 ## Prerequisites
 
 We begin by assuming you've completed the
-[Getting Started](http://vitess.io/getting-started/local-instance.html) guide,
+[Getting Started]({% link getting-started/local-instance.md %}) guide,
 and have left the cluster running.
 
 ## Overview
@@ -79,7 +79,7 @@ vitess/examples/local$ ./sharded-vttablet-up.sh
 Since the sharding key is the page number,
 this will result in half the pages going to each shard,
 since *0x80* is the midpoint of the
-[sharding key range](http://vitess.io/user-guide/sharding.html#key-ranges-and-partitions).
+[sharding key range]({% link user-guide/sharding.md %}#key-ranges-and-partitions).
 
 These new shards will run in parallel with the original shard during the
 transition, but actual traffic will be served only by the original shard
@@ -150,7 +150,7 @@ will be served only by the remaining, un-paused *rdonly* tablets.
 ## Check filtered replication
 
 Once the copy from the paused snapshot finishes, *vtworker* turns on
-[filtered replication](http://vitess.io/user-guide/sharding.html#filtered-replication)
+[filtered replication]({% link user-guide/sharding.md %}#filtered-replication)
 from the source shard to each destination shard. This allows the destination
 shards to catch up on updates that have continued to flow in from the app since
 the time of the snapshot.
@@ -194,10 +194,10 @@ I0416 02:10:56.927313      10 split_diff.go:496] Table messages checks out (4 ro
 ## Switch over to new shards
 
 Now we're ready to switch over to serving from the new shards.
-The [MigrateServedTypes](http://vitess.io/reference/vtctl.html#migrateservedtypes)
+The [MigrateServedTypes]({% link reference/vtctl.md %}#migrateservedtypes)
 command lets you do this one
-[tablet type](http://vitess.io/overview/concepts.html#tablet) at a time,
-and even one [cell](http://vitess.io/overview/concepts.html#cell-data-center)
+[tablet type]({% link overview/concepts.md %}#tablet) at a time,
+and even one [cell]({% link overview/concepts.md %}#cell-data-center)
 at a time. The process can be rolled back at any point *until* the master is
 switched over.
 
diff --git a/doc/HorizontalReshardingWorkflowGuide.md b/doc/HorizontalReshardingWorkflowGuide.md
index e37d1bd8692..f28be1a0a34 100644
--- a/doc/HorizontalReshardingWorkflowGuide.md
+++ b/doc/HorizontalReshardingWorkflowGuide.md
@@ -1,5 +1,5 @@
 This guide shows you an example about how to apply range-based sharding
-process in an existing unsharded Vitess [keyspace](http://vitess.io/overview/concepts.html#keyspace)
+process in an existing unsharded Vitess [keyspace]({% link overview/concepts.md %}#keyspace)
 using the horizontal resharding workflow. In this example, we will reshard
 from 1 shard "0" into 2 shards "-80" and "80-".
 
@@ -12,9 +12,9 @@ The horizontal resharding process mainly contains the following steps
     (**Phase: CopySchemaShard**) 
 1.  Copy the data with a batch process called *vtworker*
     (**Phase: SplitClone**).
-    [more details](horizontal-sharding-workflow.html#details-in-splitclone-phase)
+    [more details](#details-in-splitclone-phase)
 1.  Check filtered replication (**Phase: WaitForFilteredReplication**).
-    [more details](horizontal-sharding-workflow.html#details-in-waitforfilteredreplication-phase) 
+    [more details](#details-in-waitforfilteredreplication-phase)
 1.  Check copied data integrity using *vtworker* batch process in the mode
     to compare the source and destination data. (**Phase: SplitDiff**)
 1.  Migrate all the serving rdonly tablets in the original shards.
@@ -23,11 +23,11 @@ The horizontal resharding process mainly contains the following steps
     (**Phase: MigrateServedTypeReplica**)
 1.  Migrate all the serving master tablets in the original shards.
     (**Phase: MigrateServedTypeMaster**)
-    [more details](horizontal-sharding-workflow.html#details-in-migrateservedtypemaste-phase) 
+    [more details](#details-in-migrateservedtypemaste-phase)
 
 ## Prerequisites
 
-You should complete the [Getting Started](http://vitess.io/getting-started/local-instance.html) guide
+You should complete the [Getting Started]({% link getting-started/local-instance.md %}) guide
 (please finish all the steps before Try Vitess resharding) and have left
 the cluster running. Then, please follow these steps before running
 the resharding process:
@@ -41,7 +41,7 @@ the resharding process:
 
 1.  Bring up tablets for 2 additional shards:  *test_keyspace/-80* and
     *test_keyspace/80-* (you can learn more about sharding key range
-    [here](http://vitess.io/user-guide/sharding.html#key-ranges-and-partitions)):
+    [here]({% link user-guide/sharding.md %}#key-ranges-and-partitions)):
 
     ``` sh
     vitess/examples/local$ ./sharded-vttablet-up.sh
@@ -107,7 +107,7 @@ When creating the resharding workflow, the program automatically detect the
 source shards and destination shards and create tasks for the resharding
 process. After the creation, click the workflow node, you can see a list of
 child nodes. Each child node represents a phase in the workflow (each phase
-represents a step mentioned in [Overview](http://vitess.io/user-guide/horizontal-sharding-workflow.html#overview)).
+represents a step mentioned in [Overview]({% link user-guide/horizontal-sharding-workflow.md %}#overview)).
 Further click a phase node, you can inspect tasks in this phase.
 For example, in the "CopySchemaShard" phase, it includes tasks to copy schema
 to 2 destination shards, therefore you can see task node "Shard -80" and
@@ -172,7 +172,7 @@ original shard. You should then see in the vtctld UI *Dashboard* page that shard
 *0* becomes non-serving and shard *-80* and shard *80-* are serving shards.
 Verify this for yourself: inspect the database content using following commands,
 then add messages to the guestbook page (you can use script client.sh mentioned
-[here](http://vitess.io/getting-started/local-instance.html#run-a-client-application))
+[here]({% link getting-started/local-instance.md %}#run-a-client-application))
 and inspect using same commands:
 
 ``` sh
@@ -226,7 +226,7 @@ vitess/examples/local$ ./zk-down.sh
 
 ## Reference
 
-You can checkout the old version tutorial [here](http://vitess.io/user-guide/horizontal-sharding.html).
+You can checkout the old version tutorial [here]({% link user-guide/horizontal-sharding.md %}).
 It walks you through the resharding process by manually executing commands.
 
 ### Details in SplitClone phase
@@ -248,7 +248,7 @@ combine to cover the same range.
 ### Details in WaitForFilteredReplication phase
 
 Once the copying from a paused snapshot (phase SplitClone) has finished,
-*vtworker* turns on [filtered replication](http://vitess.io/user-guide/sharding.html#filtered-replication),
+*vtworker* turns on [filtered replication]({% link user-guide/sharding.md %}#filtered-replication),
 which allows the destination shards to catch up on updates that have continued
 to flow in from the app since the time of the snapshot. After the destination
 shards are caught up, they will continue to replicate new updates. 
diff --git a/doc/LaunchingVitess.md b/doc/LaunchingVitess.md
index da2b139a8f5..0b5d49e4eb6 100644
--- a/doc/LaunchingVitess.md
+++ b/doc/LaunchingVitess.md
@@ -1,9 +1,8 @@
 This section offers guidelines on how to configure and manage Vitess
 in a production environment.
 
-* [Scalability Philosophy](/user-guide/scalability-philosophy.html)
-* [Production Planning](/user-guide/production-planning.html)
-* [Server Configuration](/user-guide/server-configuration.html)
-* [2PC Guide](/user-guide/twopc.html)
-* [Troubleshooting](/user-guide/troubleshooting.html)
-
+* [Scalability Philosophy]({% link user-guide/scalability-philosophy.md %})
+* [Production Planning]({% link user-guide/production-planning.md %})
+* [Server Configuration]({% link user-guide/server-configuration.md %})
+* [2PC Guide]({% link user-guide/twopc.md %})
+* [Troubleshooting]({% link user-guide/troubleshooting.md %})
diff --git a/doc/Production.md b/doc/Production.md
index 1bde0437adb..625a3680792 100644
--- a/doc/Production.md
+++ b/doc/Production.md
@@ -25,7 +25,7 @@ and we are open to contributions in this area.
 
 ## Deploying in Kubernetes
 
-See the [Getting Started](http://vitess.io/getting-started/) guide.
+See the [Getting Started]({% link getting-started/index.md %}) guide.
 
 ## Deploying on bare metal
 
diff --git a/doc/ProductionPlanning.md b/doc/ProductionPlanning.md
index eaae2aa5379..fd2976d1b76 100644
--- a/doc/ProductionPlanning.md
+++ b/doc/ProductionPlanning.md
@@ -44,7 +44,7 @@ You may have to add a few more app class machines to absorb any additional CPU a
 
 The Lock Service should be running, and both the global and local instances
 should be up. See the
-[Topology Service](/user-guide/topology-service.html)
+[Topology Service]({% link user-guide/topology-service.md %})
 document for more information.
 
 Each lock service implementation supports a couple configuration command line
@@ -65,9 +65,9 @@ Before running Vitess in production, please make yourself comfortable first with
 
 Here is a short list of all the basic workflows Vitess supports:
 
-* [Failover / Reparents](http://vitess.io/user-guide/reparenting.html)
-* [Backup/Restore](http://vitess.io/user-guide/backup-and-restore.html)
-* [Schema Management](http://vitess.io/user-guide/schema-management.html) / [Schema Swap](http://vitess.io/user-guide/schema-swap.html)
-* [Resharding](http://vitess.io/user-guide/sharding.html) / [Horizontal Resharding Tutorial](http://vitess.io/user-guide/horizontal-sharding.html)
-* [Upgrading](http://vitess.io/user-guide/upgrading.html)
+* [Failover / Reparents]({% link user-guide/reparenting.md %})
+* [Backup/Restore]({% link user-guide/backup-and-restore.md %})
+* [Schema Management]({% link user-guide/schema-management.md %}) / [Schema Swap]({% link user-guide/schema-swap.md %})
+* [Resharding]({% link user-guide/sharding.md %}) / [Horizontal Resharding Tutorial]({% link user-guide/horizontal-sharding.md %})
+* [Upgrading]({% link user-guide/upgrading.md %})
 
diff --git a/doc/Reparenting.md b/doc/Reparenting.md
index 43cccf7e290..9a5e46c0942 100644
--- a/doc/Reparenting.md
+++ b/doc/Reparenting.md
@@ -33,7 +33,7 @@ Vitess requires the use of global transaction identifiers
   correct when reparenting. (During external reparenting, Vitess
   assumes the external tool manages the replication process.)
 * During resharding, Vitess uses GTIDs for
-  [filtered replication](/user-guide/sharding.html#filtered-replication),
+  [filtered replication]({% link user-guide/sharding.md %}#filtered-replication),
   the process by which source tablet data is transferred to the proper
   destination tablets.
 
@@ -45,7 +45,7 @@ Larger Vitess deployments typically do implement semisynchronous replication.
 
 ## Active Reparenting
 
-You can use the following <code>[vtctl](/reference/vtctl.html)</code>
+You can use the following <code>[vtctl]({% link reference/vtctl.md %})</code>
 commands to perform reparenting operations:
 
 * <code>[PlannedReparentShard](#plannedreparentshard:-planned-reparenting)</code>
@@ -53,7 +53,7 @@ commands to perform reparenting operations:
 
 Both commands lock the shard for write operations. The two commands
 cannot run in parallel, nor can either command run in parallel with the
-<code>[InitShardMaster](/reference/vtctl.html#initshardmaster)</code>
+<code>[InitShardMaster]({% link reference/vtctl.md %}#initshardmaster)</code>
 command.
 
 The two commands are both dependent on the global topology server being
@@ -114,7 +114,7 @@ of the available slaves.
 **Important:** Before calling this command, you must first identify
 the slave with the most advanced replication position as that slave
 must be designated as the new master. You can use the 
-<code>[vtctl ShardReplicationPositions](/reference/vtctl.html#shardreplicationpositions)</code>
+<code>[vtctl ShardReplicationPositions]({% link reference/vtctl.md %}#shardreplicationpositions)</code>
 command to determine the current replication positions of a shard's slaves.
 
 This command performs the following actions:
@@ -140,7 +140,7 @@ This command performs the following actions:
 External reparenting occurs when another tool handles the process
 of changing a shard's master tablet. After that occurs, the tool
 needs to call the
-<code>[vtctl TabletExternallyReparented](/reference/vtctl.html#tabletexternallyreparented)</code>
+<code>[vtctl TabletExternallyReparented]({% link reference/vtctl.md %}#tabletexternallyreparented)</code>
 command to ensure that the topology server, replication graph, and serving
 graph are updated accordingly.
 
@@ -182,7 +182,7 @@ A tablet can be orphaned after a reparenting if it is unavailable
 when the reparent operation is running but then recovers later on.
 In that case, you can manually reset the tablet's master to the
 current shard master using the
-<code>[vtctl ReparentTablet](/reference/vtctl.html#reparenttablet)</code>
+<code>[vtctl ReparentTablet]({% link reference/vtctl.md %}#reparenttablet)</code>
 command. You can then restart replication on the tablet if it was stopped
-by calling the <code>[vtctl StartSlave](/reference/vtctl.html#startslave)</code>
+by calling the <code>[vtctl StartSlave]({% link reference/vtctl.md %}#startslave)</code>
 command.
diff --git a/doc/RowBasedReplication.md b/doc/RowBasedReplication.md
index 76e19f07130..62b73b28ffe 100644
--- a/doc/RowBasedReplication.md
+++ b/doc/RowBasedReplication.md
@@ -4,7 +4,7 @@ In Vitess 2.2, we are adding preliminary support for Row Based Replication. This
 document explains how we are managing it and how it affects various Vitess
 features.
 
-See the [Vites and Replication](/user-guide/vitess-replication.html) document
+See the [Vites and Replication]({% link user-guide/vitess-replication.md %}) document
 for an introduction on various types of replication and how it affects Vitess.
 
 ## MySQL Row Based Replication
@@ -42,7 +42,7 @@ we use RBR for these.
 ### vttablet Replication Stream Watcher
 
 This is enabled by the `watch_replication_stream` option, and is used
-by [Update Stream](/user-guide/update-stream.html). It only cares about the
+by [Update Stream]({% link user-guide/update-stream.md %}). It only cares about the
 GTIDs for the events, so it is unaffected by the use of RBR.
 
 *Note*: the current vttablet also reloads the schema when it sees a DDL in the
@@ -104,7 +104,7 @@ easy to not change the schema at the same time as resharding is on-going.
 ### Applying Schema Changes
 
 When using
-RBR, [Schema Swap](/user-guide/vitess-replication.html#vitess-schema-swap)
+RBR, [Schema Swap]({% link user-guide/vitess-replication.md %}#vitess-schema-swap)
 becomes useless, as replication between hosts with different schemas will most
 likely break. This is however an existing limitation that is already known and
 handled by MySQL DBAs.
@@ -144,7 +144,7 @@ March 2017:
 
 ## Update Stream Extensions
 
-[Update Stream](/user-guide/update-stream.html) can be changed to contain both
+[Update Stream]({% link user-guide/update-stream.md %}) can be changed to contain both
 old and new values of the rows being changed. Again the values will depend on
 the schema. We will also make this feature optional, so if the client is using
 this for Primary Key based cache invalidation for instance, no extra unneeded
diff --git a/doc/ScalabilityPhilosophy.md b/doc/ScalabilityPhilosophy.md
index bf524fdbb39..a3f60d14da1 100644
--- a/doc/ScalabilityPhilosophy.md
+++ b/doc/ScalabilityPhilosophy.md
@@ -140,7 +140,7 @@ available and consistent data store.
 Lock servers were built for this exact purpose, and Vitess needs one such
 cluster to be setup to run smoothly. Vitess can be customized to utilize any
 lock server, and by default it supports Zookeeper, etcd and Consul. We call this
-component [Topology Service](/user-guide/topology-service.html).
+component [Topology Service]({% link user-guide/topology-service.md %}).
 
 As Vitess is meant to run in multiple data centers / regions (called cells
 below), it relies on two different lock servers:
@@ -225,7 +225,7 @@ Vitess RPC interface requires the query itself to be valid UTF-8.
 Since Vitess handles query routing for you and lets you access any
 instance in the cluster from any single VTGate endpoint,
 the Vitess clients have an additional parameter for you to specify
-which [tablet type](/overview/concepts.html#tablet-types) you want
+which [tablet type]({% link overview/concepts.md %}#tablet-types) you want
 to send your query to.
 
 Writes must be directed to a *master* type tablet, as well as reads
diff --git a/doc/ScalingMySQL.md b/doc/ScalingMySQL.md
index 464c939a208..0604c3ae564 100644
--- a/doc/ScalingMySQL.md
+++ b/doc/ScalingMySQL.md
@@ -62,10 +62,10 @@ Setting up these components directly -- for example, writing your own topology s
 
 **Related Vitess documentation:**
 
-* [Running Vitess on Kubernetes](http://vitess.io/getting-started/)
-* [Running Vitess on a local server](http://vitess.io/getting-started/local-instance.html)
-* [Backing up data](http://vitess.io/user-guide/backup-and-restore.html)
-* [Reparenting - basic assignment of master instance in Vitess](http://vitess.io/user-guide/reparenting.html)
+* [Running Vitess on Kubernetes]({% link getting-started/index.md %})
+* [Running Vitess on a local server]({% link getting-started/local-instance.md %})
+* [Backing up data]({% link user-guide/backup-and-restore.md %})
+* [Reparenting - basic assignment of master instance in Vitess]({% link user-guide/reparenting.md %})
 
 ## Step 2: Connect your application to your database
 
@@ -96,9 +96,9 @@ Note that this path is highly dependent on the source setup. Thus, while Vitess
 
 **Related Vitess documentation:**
 
-* [Vitess API Reference](http://vitess.io/reference/vitess-api.html)
-* [Schema Management](http://vitess.io/user-guide/schema-management.html)
-* [Transport Security Model](http://vitess.io/user-guide/transport-security-model.html)
+* [Vitess API Reference]({% link reference/vitess-api.md %})
+* [Schema Management]({% link user-guide/schema-management.md %})
+* [Transport Security Model]({% link user-guide/transport-security-model.md %})
 
 ## Step 3: Vertical sharding (scaling to multiple keyspaces)
 
@@ -117,7 +117,7 @@ Several vtctl functions -- vtctl is Vitess' command-line tool for managing your
 
 **Related Vitess documentation:**
 
-* [vtctl Reference guide](http://vitess.io/reference/vtctl.html)
+* [vtctl Reference guide]({% link reference/vtctl.md %})
 
 ## Step 4: Horizontal sharding (partitioning your data)
 
@@ -141,9 +141,9 @@ Vitess offers robust resharding support, which involves updating the sharding sc
 
 **Related Vitess documentation:**
 
-* [Sharding](http://vitess.io/user-guide/sharding.html)
-* [Horizontal sharding (Codelab)](http://vitess.io/user-guide/horizontal-sharding.html)
-* [Sharding in Kubernetes (Codelab)](http://vitess.io/user-guide/sharding-kubernetes.html)
+* [Sharding]({% link user-guide/sharding.md %})
+* [Horizontal sharding (Codelab)]({% link user-guide/horizontal-sharding.md %})
+* [Sharding in Kubernetes (Codelab)]({% link user-guide/sharding-kubernetes.md %})
 
 ## Related tasks
 
diff --git a/doc/SchemaManagement.md b/doc/SchemaManagement.md
index 46817e124f2..26c7b1c2574 100644
--- a/doc/SchemaManagement.md
+++ b/doc/SchemaManagement.md
@@ -3,11 +3,11 @@ contains table definitions that explain how to create those tables.
 Table definitions identify table names, column names, column types,
 primary key information, and so forth.
 
-This document describes the <code>[vtctl](/reference/vtctl.html)</code>
+This document describes the <code>[vtctl]({% link reference/vtctl.md %})</code>
 commands that you can use to [review](#reviewing-your-schema) or
 [update](#changing-your-schema) your schema in Vitess.
 
-Note that this functionality is not recommended for long-running schema changes. In such cases, we recommend to do a [schema swap](/user-guide/schema-swap.html) instead.
+Note that this functionality is not recommended for long-running schema changes. In such cases, we recommend to do a [schema swap]({% link user-guide/schema-swap.md %}) instead.
 
 ## Reviewing your schema
 
@@ -19,14 +19,14 @@ This section describes the following <code>vtctl</code> commands, which let you
 
 ### GetSchema
 
-The <code>[GetSchema](/reference/vtctl.html#getschema)</code> command
+The <code>[GetSchema]({% link reference/vtctl.md %}#getschema)</code> command
 displays the full schema for a tablet or a subset of the tablet's tables.
 When you call <code>GetSchema</code>, you specify the tablet alias that
 uniquely identifies the tablet. The <code>\<tablet alias\></code>
 argument value has the format <code>\<cell name\>-\<uid\></code>.
 
 **Note:** You can use the
-<code>[vtctl ListAllTablets](/reference/vtctl.html#listalltablets)</code> 
+<code>[vtctl ListAllTablets]({% link reference/vtctl.md %}#listalltablets)</code> 
 command to retrieve a list of tablets in a cell and their unique IDs.
 
 The following example retrieves the schema for the tablet with the
@@ -39,7 +39,7 @@ GetSchema test-000000100
 ### ValidateSchemaShard
 
 The
-<code>[ValidateSchemaShard](/reference/vtctl.html#validateschemashard)</code>
+<code>[ValidateSchemaShard]({% link reference/vtctl.md %}#validateschemashard)</code>
 command confirms that for a given keyspace, all of the slave tablets
 in a specified shard have the same schema as the master tablet in that
 shard. When you call <code>ValidateSchemaShard</code>, you specify both 
@@ -55,7 +55,7 @@ ValidateSchemaShard user/0
 
 ### ValidateSchemaKeyspace
 
-The <code>[ValidateSchemaKeyspace](/reference/vtctl.html#validateschemakeyspace)</code>
+The <code>[ValidateSchemaKeyspace]({% link reference/vtctl.md %}#validateschemakeyspace)</code>
 command confirms that all of the tablets in a given keyspace have
 the the same schema as the master tablet on shard <code>0</code>
 in that keyspace. Thus, whereas the <code>ValidateSchemaShard</code>
@@ -91,7 +91,7 @@ or grants.
 
 ### ApplySchema
 
-The <code>[ApplySchema](/reference/vtctl.html#applyschema)</code>
+The <code>[ApplySchema]({% link reference/vtctl.md %}#applyschema)</code>
 command applies a schema change to the specified keyspace on every
 master tablet, running in parallel on all shards. Changes are then
 propagated to slaves via replication. The command format is:
@@ -103,7 +103,7 @@ When the <code>ApplySchema</code> action actually applies a schema
 change to the specified keyspace, it performs the following steps:
 
 1. It finds shards that belong to the keyspace, including newly added
-   shards if a [resharding event](/user-guide/sharding.html#resharding)
+   shards if a [resharding event]({% link user-guide/sharding.md %}#resharding)
    has taken place.
 1. It validates the SQL syntax and determines the impact of the schema
    change. If the scope of the change is too large, Vitess rejects it.
@@ -155,4 +155,4 @@ impact of a potential change:
   must have 2 million rows or less.
 
 If a schema change gets rejected because it affects too many rows, you can specify the flag `-allow_long_unavailability` to tell `ApplySchema` to skip this check.
-However, we do not recommend this. Instead, you should apply large schema changes by following the [schema swap process](/user-guide/schema-swap.html).
+However, we do not recommend this. Instead, you should apply large schema changes by following the [schema swap process]({% link user-guide/schema-swap.md %}).
diff --git a/doc/SchemaSwap.md b/doc/SchemaSwap.md
index 8120a296aa1..5dc24f0957a 100644
--- a/doc/SchemaSwap.md
+++ b/doc/SchemaSwap.md
@@ -7,7 +7,7 @@ TABLE` or large-scale data changes (e.g. populating a column or clearing out
 values).
 
 If a schema change is not long-running, please use the simpler [vtctl
-ApplySchema](/user-guide/schema-management.html) instead.
+ApplySchema]({% link user-guide/schema-management.md %}) instead.
 
 ## Overview
 
@@ -26,7 +26,7 @@ way it's done, and therefore we refer to it by this name throughout the
 document.
 
 This tutorial outlines the necessary steps for a schema swap and is based on the
-[Vitess Kubernetes Getting Started Guide](http://vitess.io/getting-started/).
+[Vitess Kubernetes Getting Started Guide]({% link getting-started/index.md %}).
 
 **At the high level, a schema swap comprises the following phases:**
 
@@ -57,7 +57,7 @@ We'll add a column to it.
 ## Prerequisites
 
 We assume that you have followed the [Vitess Kubernetes Getting Started
-Guide](http://vitess.io/getting-started/) up to and including the step "9.
+Guide]({% link getting-started/index.md %}) up to and including the step "9.
 Create a table".
 
 ## Schema Swap Steps
diff --git a/doc/ServerConfiguration.md b/doc/ServerConfiguration.md
index 4d5573ba3fb..9d611a385f0 100644
--- a/doc/ServerConfiguration.md
+++ b/doc/ServerConfiguration.md
@@ -173,7 +173,7 @@ CallerID object. It allows unsecure but easy to use authorization using Table
 ACLs.
 
 See the
-[Transport Security Model document](http://vitess.io/user-guide/transport-security-model.html)
+[Transport Security Model document]({% link user-guide/transport-security-model.md %})
 for more information on how to setup both of these features, and what command
 line parameters exist.
 
@@ -190,7 +190,7 @@ Topology Server. First the *topo\_implementation* flag needs to be set to one of
 Note that the local cell for the tablet must exist and be configured properly in
 the Topology Service for vttablet to start. Local cells are configured inside
 the topo server, by using the `vtctl AddCellInfo` command. See
-the [Topology Service](/user-guide/topology-service.html) documentation for more
+the [Topology Service]({% link user-guide/topology-service.md %}) documentation for more
 information.
 
 ## VTTablet
@@ -597,7 +597,7 @@ Things that need to be configured:
 
 ### Periodic backup configuration
 
-We recommend to take backups regularly e.g. you should set up a cron job for it. See our recommendations at  [http://vitess.io/user-guide/backup-and-restore.html#backup-frequency](http://vitess.io/user-guide/backup-and-restore.html#backup-frequency).
+We recommend to take backups regularly e.g. you should set up a cron job for it. See our recommendations at  [{% link user-guide/backup-and-restore.md %}#backup-frequency]({% link user-guide/backup-and-restore.md %}#backup-frequency).
 
 ### Logs archiver/purger
 
@@ -647,7 +647,7 @@ source of truth, and expect it to send a top-down signal to Vitess.
 This signal is sent by ensuring the Orchestrator server has access to
 `vtctlclient`, which it then uses to send an RPC to vtctld, informing
 Vitess of the change in mastership via the
-[TabletExternallyReparented](/reference/vtctl.html#tabletexternallyreparented)
+[TabletExternallyReparented]({% link reference/vtctl.md %}#tabletexternallyreparented)
 command.
 
 ```json
diff --git a/doc/Sharding.md b/doc/Sharding.md
index da943e30eb6..a1ebac0872b 100644
--- a/doc/Sharding.md
+++ b/doc/Sharding.md
@@ -169,7 +169,7 @@ support any filtering, this functionality is all specific to Vitess.
 
 Vitess provides the following tools to help manage range-based shards:
 
-* The [vtctl](/reference/vtctl.html) command-line tool supports
+* The [vtctl]({% link reference/vtctl.md %}) command-line tool supports
     functions for managing keyspaces, shards, tablets, and more.
 * Client APIs account for sharding operations.
 * The [MapReduce framework](https://github.com/youtube/vitess/tree/master/java/hadoop/src/main/java/io/vitess/hadoop)
diff --git a/doc/ShardingKubernetes.md b/doc/ShardingKubernetes.md
index 39787dd636b..b9a6f41cd72 100644
--- a/doc/ShardingKubernetes.md
+++ b/doc/ShardingKubernetes.md
@@ -1,25 +1,25 @@
 This guide walks you through the process of sharding an existing unsharded
-Vitess [keyspace](http://vitess.io/overview/concepts.html#keyspace) in
+Vitess [keyspace]({% link overview/concepts.md %}#keyspace) in
 [Kubernetes](http://kubernetes.io/).
 
 ## Prerequisites
 
 We begin by assuming you've completed the
-[Getting Started on Kubernetes](http://vitess.io/getting-started/) guide, and
+[Getting Started on Kubernetes]({% link getting-started/index.md %}) guide, and
 have left the cluster running.
 
 ## Overview
 
 We will follow a process similar to the one in the general
-[Horizontal Sharding](http://vitess.io/user-guide/horizontal-sharding.html)
+[Horizontal Sharding]({% link user-guide/horizontal-sharding.md %})
 guide, except that here we'll give the commands you'll need to do it for
 the example Vitess cluster in Kubernetes.
 
-Since Vitess makes [sharding](http://vitess.io/user-guide/sharding.html)
+Since Vitess makes [sharding]({% link user-guide/sharding.md %})
 transparent to the app layer, the
 [Guestbook](https://github.com/youtube/vitess/tree/master/examples/kubernetes/guestbook)
 sample app will stay live throughout the
-[resharding](http://vitess.io/user-guide/sharding.html#resharding) process,
+[resharding]({% link user-guide/sharding.md %}#resharding) process,
 confirming that the Vitess cluster continues to serve without downtime.
 
 ## Configure sharding information
@@ -77,7 +77,7 @@ vitess/examples/kubernetes$ ./sharded-vttablet-up.sh
 Since the sharding key in the Guestbook app is the page number,
 this will result in half the pages going to each shard,
 since *0x80* is the midpoint of the
-[sharding key range](http://vitess.io/user-guide/sharding.html#key-ranges-and-partitions).
+[sharding key range]({% link user-guide/sharding.md %}#key-ranges-and-partitions).
 
 These new shards will run in parallel with the original shard during the
 transition, but actual traffic will be served only by the original shard
@@ -153,7 +153,7 @@ will be served only by the remaining, un-paused *rdonly* tablets.
 ## Check filtered replication
 
 Once the copy from the paused snapshot finishes, *vtworker* turns on
-[filtered replication](http://vitess.io/user-guide/sharding.html#filtered-replication)
+[filtered replication]({% link user-guide/sharding.md %}#filtered-replication)
 from the source shard to each destination shard. This allows the destination
 shards to catch up on updates that have continued to flow in from the app since
 the time of the snapshot.
@@ -196,10 +196,10 @@ I0416 02:10:56.927313      10 split_diff.go:496] Table messages checks out (4 ro
 ## Switch over to new shards
 
 Now we're ready to switch over to serving from the new shards.
-The [MigrateServedTypes](http://vitess.io/reference/vtctl.html#migrateservedtypes)
+The [MigrateServedTypes]({% link reference/vtctl.md %}#migrateservedtypes)
 command lets you do this one
-[tablet type](http://vitess.io/overview/concepts.html#tablet) at a time,
-and even one [cell](http://vitess.io/overview/concepts.html#cell-data-center)
+[tablet type]({% link overview/concepts.md %}#tablet) at a time,
+and even one [cell]({% link overview/concepts.md %}#cell-data-center)
 at a time. The process can be rolled back at any point *until* the master is
 switched over.
 
diff --git a/doc/ShardingKubernetesWorkflow.md b/doc/ShardingKubernetesWorkflow.md
index d852b0b0faf..444604a5073 100644
--- a/doc/ShardingKubernetesWorkflow.md
+++ b/doc/ShardingKubernetesWorkflow.md
@@ -1,20 +1,20 @@
 This guide shows you an example about how to apply range-based sharding
-process in an existing unsharded Vitess [keyspace](http://vitess.io/overview/concepts.html#keyspace)
+process in an existing unsharded Vitess [keyspace]({% link overview/concepts.md %}#keyspace)
 in [Kubernetes](http://kubernetes.io/) using the horizontal resharding workflow.
 In this example, we will reshard from 1 shard "0" into 2 shards "-80" and "80-".
 We will follow a process similar to the general
-[Horizontal Sharding guide](http://vitess.io/user-guide/horizontal-sharding-workflow.html)
+[Horizontal Sharding guide]({% link user-guide/horizontal-sharding-workflow.md %})
 except that here we'll give you the commands you'll need in the kubernetes
 environment.
 
 ## Overview
 
 The horizontal resharding process overview can be found
-[here](http://vitess.io/user-guide/horizontal-sharding-workflow.html#overview) 
+[here]({% link user-guide/horizontal-sharding-workflow.md %}#overview) 
 
 ## Prerequisites
 
-You should complete the [Getting Started on Kubernetes](http://vitess.io/getting-started/)
+You should complete the [Getting Started on Kubernetes]({% link getting-started/index.md %})
 guide (please finish all the steps before Try Vitess resharding) and have left
 the cluster running. Then, please follow these steps before running the
 resharding process:
@@ -28,7 +28,7 @@ resharding process:
 
 1.  Bring up tablets for 2 additional shards:  *test_keyspace/-80* and
     *test_keyspace/80-* (you can learn more about sharding key range
-    [here](http://vitess.io/user-guide/sharding.html#key-ranges-and-partitions)):
+    [here]({% link user-guide/sharding.md %}#key-ranges-and-partitions)):
 
     ``` sh
     vitess/examples/kubernetes$ ./sharded-vttablet-up.sh
@@ -73,10 +73,10 @@ resharding process:
 ### Create the Workflow
 
 Using the web vtctld UI to create the workflow is the same with [steps in local
-environment](http://vitess.io/user-guide/horizontal-sharding-workflow.html#create-the-workflow)
+environment]({% link user-guide/horizontal-sharding-workflow.md %}#create-the-workflow)
 except for filling the "vtworker Addresses" slot. You need to get the external
 IP for vtworker service (mentioned in
-[Prerequisites](sharding-kubernetes-workflow.html#prerequisites)) and use
+[Prerequisites](#prerequisites)) and use
 \<EXTERNAL-IP\>:15033 as the vtworker addresses.
 
 Another way to start the workflow is through the vtctlclient command:
@@ -88,17 +88,17 @@ vitess/examples/kubernetes$ ./kvtctl.sh WorkflowCreate -skip_start=false horizon
 ### Approvals of Tasks Execution (Canary feature)
 
 Please check the content in general 
-[Horizontal Sharding guide](http://vitess.io/user-guide/horizontal-sharding-workflow.html#approvals-of-tasks-execution-canary-feature)
+[Horizontal Sharding guide]({% link user-guide/horizontal-sharding-workflow.md %}#approvals-of-tasks-execution-canary-feature)
 
 ### Retry
 
 Please check the content in general 
-[Horizontal Sharding guide](http://vitess.io/user-guide/horizontal-sharding-workflow.html#retry)
+[Horizontal Sharding guide]({% link user-guide/horizontal-sharding-workflow.md %}#retry)
 
 ### Checkpoint and Recovery
 
 Please check the content in general 
-[Horizontal Sharding guide](http://vitess.io/user-guide/horizontal-sharding-workflow.html#checkpoint-and-recovery)
+[Horizontal Sharding guide]({% link user-guide/horizontal-sharding-workflow.md %}#checkpoint-and-recovery)
 
 ## Verify Results and Clean up
 
@@ -111,7 +111,7 @@ then add messages to the guestbook page and inspect again. You can use
 http://\<EXTERNAL-IP\> (EXTERNAL-IP refers to the external IP of the guest book
 service) to visit the guestbook webpage in your browser and choose any random
 page for inserting information. Details can be found
-[here](http://vitess.io/getting-started/#test-your-cluster-with-a-client-app))
+[here]({% link getting-started/index.md %}#test-your-cluster-with-a-client-app))
 You can inspect the database content using the following commands:
 
 ``` sh
@@ -178,7 +178,7 @@ $ gcloud compute firewall-rules delete vtctld guestbook
 
 ## Reference
 
-You can checkout the old version tutorial [here](http://vitess.io/user-guide/sharding-kubernetes.html).
+You can checkout the old version tutorial [here]({% link user-guide/sharding-kubernetes.md %}).
 It walks you through the resharding process by manually executing commands.
 
 For the kubectl command line interface, which helps you interact with the
diff --git a/doc/Troubleshooting.md b/doc/Troubleshooting.md
index eeed569b64f..f418d5724bb 100644
--- a/doc/Troubleshooting.md
+++ b/doc/Troubleshooting.md
@@ -26,19 +26,19 @@ Diagnosis 4: No particular transaction seems to be the culprit. Nothing seems to
 To prevent accidentally accepting writes, our default `my.cnf` settings
 tell MySQL to always start up read-only. If the master MySQL gets restarted,
 it will thus come back read-only until you intervene to confirm that it should
-accept writes. You can use the [SetReadWrite](/reference/vtctl.html#setreadwrite)
+accept writes. You can use the [SetReadWrite]({% link reference/vtctl.md %}#setreadwrite)
 command to do that.
 
 However, usually if something unexpected happens to the master, it's better to
-reparent to a different replica with [EmergencyReparentShard](/reference/vtctl.html#emergencyreparentshard). If you need to do planned maintenance on the master,
-it's best to first reparent to another replica with [PlannedReparentShard](/reference/vtctl.html#plannedreparentshard).
+reparent to a different replica with [EmergencyReparentShard]({% link reference/vtctl.md %}#emergencyreparentshard). If you need to do planned maintenance on the master,
+it's best to first reparent to another replica with [PlannedReparentShard]({% link reference/vtctl.md %}#plannedreparentshard).
 
 ### Vitess sees the wrong tablet as master
 
 If you do a failover manually (not through Vitess), you'll need to tell
 Vitess which tablet corresponds to the new master MySQL. Until then,
 writes will fail since they'll be routed to a read-only replica
-(the old master). Use the [TabletExternallyReparented](/reference/vtctl.html#tabletexternallyreparented)
+(the old master). Use the [TabletExternallyReparented]({% link reference/vtctl.md %}#tabletexternallyreparented)
 command to tell Vitess the new master tablet for a shard.
 
 Tools like [Orchestrator](https://github.com/github/orchestrator)
diff --git a/doc/UpdateStream.md b/doc/UpdateStream.md
index f5e6e21fad5..b90d03c75fe 100644
--- a/doc/UpdateStream.md
+++ b/doc/UpdateStream.md
@@ -11,7 +11,7 @@ The use cases for this service include:
 * Maintain a change record of all the transactions that have been applied to the data.
 
 A good understanding
-of [Vitess Replication](/user-guide/vitess-replication.html) is required to
+of [Vitess Replication]({% link user-guide/vitess-replication.md %}) is required to
 understand this document better. We will go through the use cases in a bit more
 details, then introduce the EventToken notion, and finally explain the service.
 
diff --git a/doc/UserGuideIntroduction.md b/doc/UserGuideIntroduction.md
index b887bfb4455..498843df31f 100644
--- a/doc/UserGuideIntroduction.md
+++ b/doc/UserGuideIntroduction.md
@@ -17,7 +17,7 @@ schema. Vitess supports both primary and secondary indexes.
 
 Vitess supports almost all MySQL scalar data types.
 It also provides full SQL support within a
-[shard](/overview/concepts.html#shard), including JOIN statements.
+[shard]({% link overview/concepts.md %}#shard), including JOIN statements.
 
 Vitess does not currently support encoded protobufs or protocol buffer
 querying. (The latter is also known as cracking.) Protocol buffers can
@@ -44,7 +44,7 @@ check to ensure that the update can be applied to your schema. In
 addition, to avoid reducing the availability of your entire system,
 Vitess rejects changes that exceed a certain scope.
 
-See the [Schema Management](/user-guide/schema-management.html)
+See the [Schema Management]({% link user-guide/schema-management.md %})
 section of this guide for more information.
 
 ## Supported clients
@@ -81,6 +81,6 @@ Backup storage is implemented through a pluggable interface,
 and we currently have plugins available for Google Cloud Storage, Amazon S3,
 and Ceph.
 
-See the [Backing Up Data](/user-guide/backup-and-restore.html) section
+See the [Backing Up Data]({% link user-guide/backup-and-restore.md %}) section
 of this guide for more information about creating and restoring data
 backups with Vitess. 
diff --git a/doc/VSchema.md b/doc/VSchema.md
index 45cd806435c..32b05988d73 100644
--- a/doc/VSchema.md
+++ b/doc/VSchema.md
@@ -138,7 +138,7 @@ Custom vindexes can also be plugged in as needed.
 
 ## Sequences
 
-Auto-increment columns do not work very well for sharded tables. [Vitess sequences](/user-guide/vitess-sequences.html) solve this problem. Sequence tables must be specified in the VSchema, and then tied to table columns. At the time of insert, if no value is specified for such a column, VTGate will generate a number for it using the sequence table.
+Auto-increment columns do not work very well for sharded tables. [Vitess sequences]({% link user-guide/vitess-sequences.md %}) solve this problem. Sequence tables must be specified in the VSchema, and then tied to table columns. At the time of insert, if no value is specified for such a column, VTGate will generate a number for it using the sequence table.
 
 ## VSchema
 
diff --git a/doc/VitessOverview.md b/doc/VitessOverview.md
index 3901f0596c4..b74a814f77b 100644
--- a/doc/VitessOverview.md
+++ b/doc/VitessOverview.md
@@ -134,7 +134,7 @@ The diagram below illustrates Vitess' components:
 
 ### Topology
 
-The [Topology Service](/user-guide/topology-service.html) is a metadata store that contains information about running servers, the sharding scheme, and the replication graph.  The topology is backed by a consistent data store.  You can explore the topology using **vtctl** (command-line) and **vtctld** (web).
+The [Topology Service]({% link user-guide/topology-service.md %}) is a metadata store that contains information about running servers, the sharding scheme, and the replication graph.  The topology is backed by a consistent data store.  You can explore the topology using **vtctl** (command-line) and **vtctld** (web).
 
 In Kubernetes, the data store is [etcd](https://github.com/coreos/etcd).  Vitess source code also ships with [Apache ZooKeeper](http://zookeeper.apache.org/) support.
 
@@ -148,7 +148,7 @@ To route queries, vtgate considers the sharding scheme, required latency, and th
 
 **vttablet** is a proxy server that sits in front of a MySQL database. A Vitess implementation has one vttablet for each MySQL instance.
 
-vttablet performs tasks that attempt to maximize throughput as well as protect MySQL from harmful queries. Its features include connection pooling, query rewriting, and query de-duping. In addition, vttablet executes management tasks that vtctl initiates, and it provides streaming services that are used for [filtered replication](/user-guide/sharding.html#filtered-replication) and data exports.
+vttablet performs tasks that attempt to maximize throughput as well as protect MySQL from harmful queries. Its features include connection pooling, query rewriting, and query de-duping. In addition, vttablet executes management tasks that vtctl initiates, and it provides streaming services that are used for [filtered replication]({% link user-guide/sharding.md %}#filtered-replication) and data exports.
 
 A lightweight Vitess implementation uses vttablet as a smart connection proxy that serves queries for a single MySQL database. By running vttablet in front of your MySQL database and changing your app to use the Vitess client instead of your MySQL driver, your app benefits from vttablet's connection pooling, query rewriting, and query de-duping features.
 
diff --git a/doc/VitessReplication.md b/doc/VitessReplication.md
index 6f95a805656..b69bd5fa9e9 100644
--- a/doc/VitessReplication.md
+++ b/doc/VitessReplication.md
@@ -100,7 +100,7 @@ section below).
 
 Within YouTube, we also use a combination of statement based replication and
 backups to apply long-running schema changes without disrupting ongoing
-operations. See the [schema swap tutorial](/user-guide/schema-swap.html)
+operations. See the [schema swap tutorial]({% link user-guide/schema-swap.md %})
 for a detailed example.
 
 This operation, which is called **schema swap**, works as follows:
@@ -143,7 +143,7 @@ process!), this does not add much more complexity to a running system.
 Since the SBR replication stream also contains comments of which primary key is
 affected by a change, it is possible to look at the replication stream and know
 exactly what objects have changed. This Vitess feature is
-called [Update Stream](/user-guide/update-stream.html).
+called [Update Stream]({% link user-guide/update-stream.md %}).
 
 By subscribing to the Update Stream for a given shard, one can know what values
 change. This stream can be used to create a stream of data changes (export to an
@@ -153,7 +153,7 @@ Note: the Update Stream only reliably contains the primary key values of the
 rows that have changed, not the actual values for all columns. To get these
 values, it is necessary to re-query the database.
 
-We have plans to make this [Update Stream](/user-guide/update-stream.html)
+We have plans to make this [Update Stream]({% link user-guide/update-stream.md %})
 feature more consistent, very resilient, fast, and transparent to sharding.
 
 ## Semi-Sync
@@ -184,7 +184,7 @@ then the following will happen:
 These behaviors combine to give you the property that, in case of master
 failure, there is at least one other *replica* type slave that has every
 transaction that was ever reported to clients as having completed.
-You can then ([manually](http://vitess.io/reference/vtctl.html#emergencyreparentshard),
+You can then ([manually]({% link reference/vtctl.md %}#emergencyreparentshard),
 or with an automated tool like [Orchestrator](https://github.com/github/orchestrator))
 pick the replica that is farthest ahead in GTID position and promote that to be
 the new master.
@@ -213,4 +213,4 @@ master.
 
 We are in the process of adding support for RBR in Vitess.
 
-See [this document](/user-guide/row-based-replication.html)) for more information.
+See [this document]({% link user-guide/row-based-replication.md %})) for more information.
diff --git a/doc/VitessTransportSecurityModel.md b/doc/VitessTransportSecurityModel.md
index 74fa44ec41a..b1fb19d05bb 100644
--- a/doc/VitessTransportSecurityModel.md
+++ b/doc/VitessTransportSecurityModel.md
@@ -9,7 +9,7 @@ features.
 The following diagram represents all the RPCs we use in a Vitess cluster:
 
 <div style="overflow-x: scroll">
-<img src="http://vitess.io/images/VitessTransportSecurityModel.svg" alt="Vitess Transport Security Model Diagram" width="400" height="300"/>
+<img src="{% link images/VitessTransportSecurityModel.svg %}" alt="Vitess Transport Security Model Diagram" width="400" height="300"/>
 </div>
 
 There are two main categories:
diff --git a/doc/VtExplain.md b/doc/VtExplain.md
new file mode 100644
index 00000000000..c619faebc28
--- /dev/null
+++ b/doc/VtExplain.md
@@ -0,0 +1,143 @@
+# VTExplain Tool
+
+The vtexplain tool provides information about how Vitess will execute a statement (the Vitess version of MySQL "EXPLAIN").
+
+## Prerequisites
+
+You'll need to build the `vtexplain` binary in your environment.
+To find instructions on how to build this binary please refer to this [guide](http://vitess.io/getting-started/local-instance.html#manual-build). 
+
+## Explaining a Query
+
+In order to explain a query you will need to first collect a sql schema for the various tables and a vschema json file containing a map of keyspace to the set of vindexes / tables in the vschema.
+
+For example, let's use the following:
+
+Schema:
+
+```SQL
+CREATE TABLE users(
+  user_id bigint,
+  name varchar(128),
+  primary key(user_id)
+);
+
+CREATE TABLE users_name_idx(
+  user_id bigint,
+  name varchar(128),
+  primary key(name, user_id)
+);
+```
+
+VSchema:
+
+```json
+{
+  "mainkeyspace": {
+    "sharded": true,
+    "vindexes": {
+      "hash": {
+        "type": "hash"
+      },
+      "md5": {
+        "type": "unicode_loose_md5",
+        "params": {},
+        "owner": ""
+      },
+      "users_name_idx": {
+        "type": "lookup_hash",
+        "params": {
+          "from": "name",
+          "table": "users_name_idx",
+          "to": "user_id"
+        },
+        "owner": "users"
+      }
+    },
+    "tables": {
+      "users": {
+        "column_vindexes": [
+          {
+            "column": "user_id",
+            "name": "hash"
+          },
+          {
+            "column": "name",
+            "name": "users_name_idx"
+          }
+        ],
+        "auto_increment": null
+      },
+      "users_name_idx": {
+        "type": "",
+        "column_vindexes": [
+          {
+            "column": "name",
+            "name": "md5"
+          }
+        ],
+        "auto_increment": null
+      }
+    }
+  }
+}
+```
+
+These can be passed to vtexplain either on the command line or (more readily) through files.
+
+Then you can use the tool like this:
+
+**Select:**
+
+```bash
+vtexplain -shards 8 -vschema-file /tmp/vschema.json -schema-file /tmp/schema.sql -replication-mode "ROW" -output-mode text -sql "SELECT * from users"
+----------------------------------------------------------------------
+SELECT * from users
+
+[mainkeyspace/c0-]:
+select * from users limit 10001
+
+[mainkeyspace/-40]:
+select * from users limit 10001
+
+[mainkeyspace/40-80]:
+select * from users limit 10001
+
+[mainkeyspace/80-c0]:
+select * from users limit 10001
+
+----------------------------------------------------------------------
+```
+
+**Insert:**
+
+```bash
+vtexplain -shards 1024 -vschema-file /tmp/vschema.json -schema-file /tmp/schema.sql -replication-mode "ROW" -output-mode text -sql "INSERT INTO users (user_id, name) VALUES(1, 'john')"
+
+----------------------------------------------------------------------
+INSERT INTO users (user_id, name) VALUES(1, 'john')
+
+[mainkeyspace/22c0-2300]:
+begin
+insert into users_name_idx(name, user_id) values ('john', 1)
+commit
+
+[mainkeyspace/1640-1680]:
+begin
+insert into users(user_id, name) values (1, 'john')
+commit
+
+----------------------------------------------------------------------
+```
+
+**Configuration Options**
+
+The `--shards` option specifies the number of shards to simulate. vtexplain will always allocate an evenly divided key range to each.
+
+The `--replication-mode` option controls whether to simulate row based or statement based replication.
+
+You can find more usage of `vtexplain` by executing the following command: 
+
+```
+vtexplain --help 
+```
diff --git a/doc/internal/PublishWebsite.md b/doc/internal/PublishWebsite.md
index d0bba7bf602..08cee649b32 100644
--- a/doc/internal/PublishWebsite.md
+++ b/doc/internal/PublishWebsite.md
@@ -66,9 +66,9 @@ The boiler plate markdown files have multiple purposes:
     the file
 *   re-arrange paths on the website e.g.
     [`doc/GitHubWorkFlow.md`](https://github.com/youtube/vitess/blob/master/doc/GitHubWorkflow.md)
-    is actually served as http://vitess.io/contributing/github-workflow.html
+    is actually served as http://vitess.io/contributing/github-workflow/
     because there is the file
-    [`vitess.io/vitess.io/contributing/github-workflow.md`](https://github.com/youtube/vitess/blob/master/vitess.io/contributing/github-workflow.md).
+    [`vitess.io/contributing/github-workflow.md`](https://github.com/youtube/vitess/blob/master/vitess.io/contributing/github-workflow.md).
 
 ### Changing Content
 
@@ -79,6 +79,16 @@ To modify our website, you need to:
     above](#to-publish-the-site))
 *   merge your changes into the master branch e.g. as pull request
 
+### Linking pages
+
+Always use the `{% raw %}{% link ... %}{% endraw %}` template tag to link other pages.
+
+Note that you have to refer to the `.md` file of the page. Example:
+
+```
+[GitHub Workflow page]({% raw %}{% link contributing/github-workflow.md %}{% endraw %})
+```
+
 ### Adding new Pages
 
 If you want to add a new page, you must also:
@@ -97,19 +107,8 @@ part. Example: `doc/Contributing.md` is included by
 `vitess.io/contributing/index.md` and therefore served as
 http://vitess.io/contributing/.
 
-### Links
-
-Please always use absolute paths with a leading `/` e.g. in links to other
-documents or images.
-
-**Right:**
-
-*   `/user-guide/troubleshooting.html`
-
-**Wrong:**
-
-*   `../troubleshooting.html`
-*   `http://vitess.io/user-guide/troubleshooting.html`
+Make sure that you use `{% raw %}{% link ... %}{% endraw %}` to generate the URLs.
+See existing entries for examples.
 
 ### Orphaned doc/ Markdown Files
 
diff --git a/doc/internal/ReleaseInstructions.md b/doc/internal/ReleaseInstructions.md
index c2ea94fbd46..16db290882d 100644
--- a/doc/internal/ReleaseInstructions.md
+++ b/doc/internal/ReleaseInstructions.md
@@ -154,7 +154,7 @@ work with them.
 ### Local Tutorial
 
 We must check that the [local startup
-tutorial](http://vitess.io/getting-started/local-instance.html#start-a-vitess-cluster)
+tutorial]({% link getting-started/local-instance.md %}#start-a-vitess-cluster)
 is not broken.
 
 Instead of going through the steps manually, run the `local_example` test which
@@ -168,7 +168,7 @@ in parallel to shorten the test duration.
 
 ### Kubernetes Tutorial
 
-Follow the [Kubernetes tutorial](http://vitess.io/getting-started/), which will
+Follow the [Kubernetes tutorial]({% link getting-started/index.md %}), which will
 automatically use the latest Docker images you pushed.
 
 TODO(mberlin): Describe how to launch our new cluster tests in `test/cluster`
diff --git a/docker/README.md b/docker/README.md
index ee34089bca7..e55c451b6e9 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -39,7 +39,7 @@ All these Vitess images include a specific MySQL/MariaDB version ("flavor").
   * We provide Dockerfile files for multiple flavors (`Dockerfile.<flavor>`).
   * As of April 2017, the following flavors are supported: `mariadb`, `mysql56`, `mysql57`, `percona`(56), `percona57`
   * On Docker Hub we publish only images with MySQL 5.7 to minimize maintenance overhead and avoid confusion.
-  * If you need an image for a different flavor, it is very easy to build it yourself. See the [Custom Docker Build instructions](http://vitess.io/getting-started/docker-build.html).
+  * If you need an image for a different flavor, it is very easy to build it yourself. See the [Custom Docker Build instructions](http://vitess.io/getting-started/docker-build/).
 
 If you are looking for a stable version of Vitess, use the **lite** image with a fixed version. If you are looking for the latest Vitess code in binary form, use the "latest" tag of the **base** image.
 
diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common
index 708667576d5..9e6d949da21 100644
--- a/docker/bootstrap/Dockerfile.common
+++ b/docker/bootstrap/Dockerfile.common
@@ -1,7 +1,8 @@
-FROM golang:1.8
+FROM golang:1.9
 
 # Install Vitess build dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    # TODO(mberlin): Group these to make it easier to understand which library actually requires them.
     automake \
     bison \
     bzip2 \
@@ -13,28 +14,25 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     libssl-dev \
     libtool \
     make \
-    openjdk-7-jdk \
-    php-pear \
-    php5-cli \
-    php5-dev \
+    openjdk-8-jdk \
     pkg-config \
     python-crypto \
     python-dev \
     python-mysqldb \
+    python-pip \
     ruby \
     ruby-dev \
     software-properties-common \
     virtualenv \
     unzip \
     xvfb \
+    # gRPC PHP requirements \
+    libz-dev \
+    php-pear \
+    php7.0-cli \
+    php7.0-dev \
     && rm -rf /var/lib/apt/lists/*
 
-# Install newer pip
-# We can't use the apt package from jessie because it depends
-# on a version of python-six that's too old for gRPC.
-RUN curl -sL --connect-timeout 10 --retry 3 \
-    https://bootstrap.pypa.io/get-pip.py | python
-
 # Install PHP modules for running tests
 RUN export MAKEFLAGS="-j$(nproc)" && \
     mkdir -p /vt/bin && \
@@ -44,7 +42,7 @@ RUN export MAKEFLAGS="-j$(nproc)" && \
     curl -sL --connect-timeout 10 --retry 3 \
         https://getcomposer.org/installer | php -- --install-dir=/vt/bin --filename=composer && \
     pecl install xdebug && \
-    echo "zend_extension=$(pecl config-get ext_dir default)/xdebug.so" > /etc/php5/cli/conf.d/20-xdebug.ini
+    echo "zend_extension=$(pecl config-get ext_dir default)/xdebug.so" > /etc/php/7.0/cli/conf.d/20-xdebug.ini
 
 # Install Maven 3.1+
 RUN mkdir -p /vt/dist && \
@@ -53,22 +51,6 @@ RUN mkdir -p /vt/dist && \
         http://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz | tar -xz && \
     mv apache-maven-3.3.9 maven
 
-# Install etcd v3.0.15 binaries
-RUN mkdir -p /vt/dist && \
-    cd /vt/dist && \
-    curl -sL --connect-timeout 10 --retry 3 \
-         https://github.com/coreos/etcd/releases/download/v3.0.15/etcd-v3.0.15-linux-amd64.tar.gz | tar -xz && \
-    mv etcd-v3.0.15-linux-amd64 etcd
-
-# Install consul 0.7.2 binaries
-RUN mkdir -p /vt/dist/consul && \
-    cd /vt/dist/consul && \
-    curl -sL --connect-timeout 10 --retry 3 \
-         -o consul_0.7.2_linux_amd64.zip \
-         https://releases.hashicorp.com/consul/0.7.2/consul_0.7.2_linux_amd64.zip && \
-    unzip consul_0.7.2_linux_amd64.zip && \
-    rm -f consul_0.7.2_linux_amd64.zip
-
 # Set up Vitess environment (equivalent to '. dev.env')
 ENV VTTOP /vt/src/github.com/youtube/vitess
 ENV VTROOT /vt
@@ -79,10 +61,9 @@ ENV VTPORTSTART 15000
 ENV PYTHONPATH $VTROOT/dist/py-mock-1.0.1/lib/python2.7/site-packages:$VTROOT/py-vtdb:$VTROOT/dist/selenium/lib/python2.7/site-packages
 ENV GOBIN $VTROOT/bin
 ENV GOPATH $VTROOT
-ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$VTROOT/dist/etcd:$VTROOT/dist/consul:$VTROOT/dist/chromedriver:$PATH
+ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$VTROOT/dist/chromedriver:$PATH
 ENV VT_MYSQL_ROOT /usr
 ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV GO15VENDOREXPERIMENT 1
 
 # Copy files needed for bootstrap
 COPY bootstrap.sh dev.env /vt/src/github.com/youtube/vitess/
@@ -99,16 +80,17 @@ RUN cd /vt/src/github.com/youtube/vitess && \
     govendor sync && \
     rm -rf /vt/.cache
 
-# Install gRPC (and protobuf) as root
+# Install gRPC as root
 RUN export MAKEFLAGS="-j$(nproc)" && \
-    cd /vt/dist && \
-    INSTALL_GRPC_PHP=`php-config --extension-dir` $VTTOP/travis/install_grpc.sh && \
-    echo 'extension=grpc.so' > /etc/php5/cli/conf.d/20-grpc.ini && \
+    $VTTOP/travis/install_grpc.sh && \
     rm -rf /vt/dist/grpc
 
 # Install gRPC PHP dependencies
-RUN cd /vt/src/github.com/youtube/vitess && \
+RUN export MAKEFLAGS="-j$(nproc)" && \
+    pecl install grpc && \
+    cd /vt/src/github.com/youtube/vitess && \
     composer install && \
+    echo 'extension=grpc.so' > /etc/php/7.0/cli/conf.d/20-grpc.ini && \
     find php/vendor/grpc/grpc -mindepth 1 -maxdepth 1 ! -name src | xargs rm -rf && \
     find php/vendor/grpc/grpc/src -mindepth 1 -maxdepth 1 ! -name php | xargs rm -rf
 
diff --git a/docker/bootstrap/Dockerfile.mariadb b/docker/bootstrap/Dockerfile.mariadb
index 6dd52cec783..c7d4f67de7f 100644
--- a/docker/bootstrap/Dockerfile.mariadb
+++ b/docker/bootstrap/Dockerfile.mariadb
@@ -1,11 +1,10 @@
 FROM vitess/bootstrap:common
 
-# Install MariaDB 10.0.x
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db && \
-    add-apt-repository 'deb http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.0/debian jessie main' && \
-    apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server libmariadbclient-dev && \
-    rm -rf /var/lib/apt/lists/*
+# Install MariaDB 10.
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    mariadb-server \
+    libmariadbclient-dev \
+    && rm -rf /var/lib/apt/lists/*
 
 # Bootstrap Vitess
 WORKDIR /vt/src/github.com/youtube/vitess
diff --git a/docker/bootstrap/Dockerfile.mysql56 b/docker/bootstrap/Dockerfile.mysql56
index 9bb8029d46b..665a9a6517a 100644
--- a/docker/bootstrap/Dockerfile.mysql56
+++ b/docker/bootstrap/Dockerfile.mysql56
@@ -2,7 +2,7 @@ FROM vitess/bootstrap:common
 
 # Install MySQL 5.6
 RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && \
-    add-apt-repository 'deb http://repo.mysql.com/apt/debian/ jessie mysql-5.6' && \
+    add-apt-repository 'deb http://repo.mysql.com/apt/debian/ stretch mysql-5.6' && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57
index 9e1f4bc21da..a7ffcdd2871 100644
--- a/docker/bootstrap/Dockerfile.mysql57
+++ b/docker/bootstrap/Dockerfile.mysql57
@@ -2,7 +2,7 @@ FROM vitess/bootstrap:common
 
 # Install MySQL 5.7
 RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && \
-    add-apt-repository 'deb http://repo.mysql.com/apt/debian/ jessie mysql-5.7' && \
+    add-apt-repository 'deb http://repo.mysql.com/apt/debian/ stretch mysql-5.7' && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/bootstrap/Dockerfile.percona b/docker/bootstrap/Dockerfile.percona
index 7519200c013..022d989e039 100644
--- a/docker/bootstrap/Dockerfile.percona
+++ b/docker/bootstrap/Dockerfile.percona
@@ -3,7 +3,7 @@ FROM vitess/bootstrap:common
 # Install Percona 5.6
 RUN apt-key adv --keyserver keys.gnupg.net \
         --recv-keys 8507EFA5 && \
-    add-apt-repository 'deb http://repo.percona.com/apt jessie main' && \
+    add-apt-repository 'deb http://repo.percona.com/apt stretch main' && \
     { \
         echo debconf debconf/frontend select Noninteractive; \
         echo percona-server-server-5.6 percona-server-server/root_password password 'unused'; \
diff --git a/docker/bootstrap/Dockerfile.percona57 b/docker/bootstrap/Dockerfile.percona57
index 226556ee560..00c09bbe7e8 100644
--- a/docker/bootstrap/Dockerfile.percona57
+++ b/docker/bootstrap/Dockerfile.percona57
@@ -3,7 +3,7 @@ FROM vitess/bootstrap:common
 # Install Percona 5.7
 RUN apt-key adv --keyserver keys.gnupg.net \
         --recv-keys 8507EFA5 && \
-    add-apt-repository 'deb http://repo.percona.com/apt jessie main' && \
+    add-apt-repository 'deb http://repo.percona.com/apt stretch main' && \
     { \
         echo debconf debconf/frontend select Noninteractive; \
         echo percona-server-server-5.7 percona-server-server/root_password password 'unused'; \
diff --git a/docker/test/run.sh b/docker/test/run.sh
index 9b775e4e172..7a3c73629f4 100755
--- a/docker/test/run.sh
+++ b/docker/test/run.sh
@@ -14,6 +14,89 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Script to run arbitrary commands within our bootstrap Docker images.
+#
+# NOTE: If your goal is to run a test within an image, please use our test
+#       runner "test.go" in the root directory instead. test.go will
+#       internally use this script to launch the test for you.
+
+# If you still think that you want to use this script, read on.
+#
+# The script has two modes it can run in:
+# - run_test:     Run the test cmd in the given Docker image ("flavor").
+# - create_cache: Create a new Docker image after copying the source and
+#                 running "make build". Such an image can be reused in
+#                 future test invocations via --use_docker_cache <image>.
+#
+# Examples:
+#  a) Start an interactive shell within the Docker image.
+#  $ docker/test/run.sh mysql57 bash
+#
+#  b) Build the code and run a test.
+#  $ docker/test/run.sh mysql57 "make build && ./test/keyrange_test.py -v"
+#
+#  c) Cache the output of the command e.g. cache "make build" as we do for Travis CI.
+#  $ docker/test/run.sh --create_docker_cache vitess/bootstrap:rm_mysql57_test_cache_do_NOT_push mysql57 "make build"
+#
+#  d) Run the test using a cache image.
+#  $ docker/test/run.sh --use_docker_cache vitess/bootstrap:rm_mysql57_test_cache_do_NOT_push mysql57 "./test/keyrange_test.py -v"
+
+
+# Functions.
+# Helper to append additional commands via "&&".
+function append_cmd() {
+  local cmd="$1"
+  local append="$2"
+  if [[ -n "$cmd" ]]; then
+    cmd+=" && "
+  fi
+  cmd+="$append"
+  echo "$cmd"
+}
+
+# Variables.
+# Default to "run_test" mode unless the --create_docker_cache flag is found.
+mode="run_test"
+
+
+# Main.
+# Parse non-positional flags.
+while true ; do
+  case "$1" in
+    --create_docker_cache)
+      case "$2" in
+          "")
+            echo "ERROR: --create_docker_cache requires the name of the image as second parameter"
+            exit 1
+            ;;
+          *)
+            mode="create_cache"
+            cache_image=$2
+            shift 2
+            ;;
+      esac ;;
+    --use_docker_cache)
+        case "$2" in
+            "")
+              echo "ERROR: --use_docker_cache requires the name of the image as second parameter"
+              exit 1
+              ;;
+            *)
+              existing_cache_image=$2
+              shift 2
+              ;;
+        esac ;;
+    -*)
+      echo "ERROR: Unrecognized flag: $1"
+      exit 1
+      ;;
+    *)
+      # No more non-positional flags.
+      break
+      ;;
+  esac
+done
+# Positional flags.
 flavor=$1
 cmd=$2
 args=
@@ -32,6 +115,11 @@ if [[ ! -f bootstrap.sh ]]; then
   exit 1
 fi
 
+image=vitess/bootstrap:$flavor
+if [[ -n "$existing_cache_image" ]]; then
+  image=$existing_cache_image
+fi
+
 # To avoid AUFS permission issues, files must allow access by "other" (permissions rX required).
 # Mirror permissions to "other" from the owning group (for which we assume it has at least rX permissions).
 chmod -R o=g .
@@ -59,29 +147,72 @@ else
 fi
 
 # Run tests
-echo "Running tests in vitess/bootstrap:$flavor image..."
-bashcmd="mv php/vendor /vt/dist/php-vendor && mv vendor /vt/dist/go-vendor && rm -rf * && mkdir php && mv /vt/dist/php-vendor php/vendor && mv /vt/dist/go-vendor vendor && cp -R /tmp/src/* . && rm -rf Godeps/_workspace/pkg && $cmd"
+case "$mode" in
+  "run_test") echo "Running tests in $image image..." ;;
+  "create_cache") echo "Creating cache image $cache_image ..." ;;
+esac
+
+# Construct "cp" command to copy the source code.
+#
+# TODO(mberlin): Copy vendor/vendor.json file such that we can run a diff against the file on the image.
+# Copy the full source tree except:
+# - php/vendor
+# - vendor
+# That's because these directories are already part of the image.
+#
+# Note that we're using the Bash extended Glob support "(!php|vendor)" on
+# purpose here to minimize the size of the cache image: With this trick,
+# we do not move or overwrite the existing files while copying the other
+# directories. Therefore, the existing files do not count as changed and will
+# not be part of the new Docker layer of the cache image.
+copy_src_cmd="cp -R /tmp/src/!(php|vendor) . && cp -R /tmp/src/php/!(vendor) php/"
+# Copy the .git directory because travis/check_make_proto.sh needs a working
+# Git repository.
+copy_src_cmd=$(append_cmd "$copy_src_cmd" "cp -R /tmp/src/.git .")
+
+# Construct the command we will actually run.
+#
+# Uncomment the next line if you need to debug "bashcmd".
+#bashcmd="set -x"
+if [[ -z "$existing_cache_image" ]]; then
+  bashcmd=$(append_cmd "$bashcmd" "$copy_src_cmd")
+fi
+# At last, append the user's command.
+bashcmd=$(append_cmd "$bashcmd" "$cmd")
 
 if tty -s; then
   # interactive shell
-  docker run -ti $args vitess/bootstrap:$flavor bash -c "$bashcmd"
+  # See above why we turn on "extglob" (extended Glob).
+  docker run -ti $args $image bash -O extglob -c "$bashcmd"
   exitcode=$?
 else
   # non-interactive shell (kill child on signal)
   trap 'docker kill $testid &>/dev/null' SIGTERM SIGINT
-  docker run $args vitess/bootstrap:$flavor bash -c "$bashcmd" &
+  docker run $args $image bash -O extglob -c "$bashcmd" &
   wait $!
   exitcode=$?
+  trap - SIGTERM SIGINT
 fi
 
 # Clean up host dir mounted VTDATAROOT
 if [[ -n "$hostdir" ]]; then
   # Use Docker user to clean up first, to avoid permission errors.
-  docker run --name=rm_$testid -v $hostdir:/vt/vtdataroot vitess/bootstrap:$flavor bash -c 'rm -rf /vt/vtdataroot/*'
+  docker run --name=rm_$testid -v $hostdir:/vt/vtdataroot $image bash -c 'rm -rf /vt/vtdataroot/*'
   docker rm -f rm_$testid &>/dev/null
   rm -rf $hostdir
 fi
 
+# If requested, create the cache image.
+if [[ "$mode" == "create_cache" && $exitcode == 0 ]]; then
+  msg="DO NOT PUSH: This is a temporary layer meant to persist e.g. the result of 'make build'. Never push this layer back to our official Docker Hub repository."
+  docker commit -m "$msg" $testid $cache_image
+
+  if [[  $? != 0 ]]; then
+    exitcode=$?
+    echo "ERROR: Failed to create Docker cache. Used command: docker commit -m '$msg' $testid $image"
+  fi
+fi
+
 # Delete the container
 docker rm -f $testid &>/dev/null
 
diff --git a/docs/about/index.html b/docs/about/index.html
deleted file mode 100644
index 3df0d7b717a..00000000000
--- a/docs/about/index.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / About</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / About"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>About</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-  <div id="main" role="main">
-	<article class="wrap" itemscope itemtype="http://schema.org/Article">
-		
-		
-
-		<div class="page-title">
-			<h1>About</h1>
-		</div>
-		<div class="inner-wrap">
-			<nav class="toc"></nav>
-			<div id="content" class="page-content" itemprop="articleBody">
-				<p>This is a work in progress.</p>
-
-				<hr />
-				<footer class="page-footer">
-					
-					
-					
-
-				</footer>
-				<aside>
-					
-				</aside>
-			</div>
-		</div>
-	</article>
-</div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
-</html>
diff --git a/docs/contributing/code-reviews.html b/docs/contributing/code-reviews/index.html
similarity index 68%
rename from docs/contributing/code-reviews.html
rename to docs/contributing/code-reviews/index.html
index e83d306a18c..7e00e48fd62 100644
--- a/docs/contributing/code-reviews.html
+++ b/docs/contributing/code-reviews/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Code Reviews</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Code Reviews"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Code Reviews | Vitess</title>
+<meta property="og:title" content="Code Reviews" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/contributing/code-reviews/" />
+<meta property="og:url" content="http://vitess.io/contributing/code-reviews/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/contributing/code-reviews/","headline":"Code Reviews","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Code Reviews</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
diff --git a/docs/contributing/github-workflow.html b/docs/contributing/github-workflow.html
index df114efa5e5..2285291e039 100644
--- a/docs/contributing/github-workflow.html
+++ b/docs/contributing/github-workflow.html
@@ -1,444 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / GitHub Workflow</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / GitHub Workflow"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>GitHub Workflow</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="github-workflow">GitHub Workflow</h1>
-
-<p>If you are new to Git and GitHub, we recommend to read this page. Otherwise, you may skip it.</p>
-
-<p>Our GitHub workflow is a so called triangular workflow:</p>
-
-<p><img src="https://cloud.githubusercontent.com/assets/1319791/8943755/5dcdcae4-354a-11e5-9f82-915914fad4f7.png" alt="visualization of the GitHub triangular workflow" style="width: 100%;"/></p>
-
-<p><em>Image Source:</em> <a href="https://github.com/blog/2042-git-2-5-including-multiple-worktrees-and-triangular-workflows">https://github.com/blog/2042-git-2-5-including-multiple-worktrees-and-triangular-workflows</a></p>
-
-<p>The Vitess code is hosted on GitHub (<a href="https://github.com/youtube/vitess">https://github.com/youtube/vitess</a>).
-This repository is called <em>upstream</em>.
-You develop and commit your changes in a clone of our upstream repository (shown as <em>local</em> in the image above).
-Then you push your changes to your forked repository (<em>origin</em>) and send us a pull request.
-Eventually, we will merge your pull request back into the <em>upstream</em> repository.</p>
-
-<h2 id="remotes">Remotes</h2>
-
-<p>Since you should have cloned the repository from your fork, the <code class="prettyprint">origin</code> remote
-should look like this:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">$ git remote -v
-origin  git@github.com:&lt;yourname&gt;/vitess.git (fetch)
-origin  git@github.com:&lt;yourname&gt;/vitess.git (push)
-</code></pre></div>
-<p>To help you keep your fork in sync with the main repo, add an <code class="prettyprint">upstream</code> remote:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">$ git remote add upstream git@github.com:youtube/vitess.git
-$ git remote -v
-origin  git@github.com:&lt;yourname&gt;/vitess.git (fetch)
-origin  git@github.com:&lt;yourname&gt;/vitess.git (push)
-upstream        git@github.com:youtube/vitess.git (fetch)
-upstream        git@github.com:youtube/vitess.git (push)
-</code></pre></div>
-<p>Now to sync your local <code class="prettyprint">master</code> branch, do this:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">$ git checkout master
-(master) $ git pull upstream master
-</code></pre></div>
-<p>Note: In the example output above we prefixed the prompt with <code class="prettyprint">(master)</code> to
-stress the fact that the command must be run from the branch <code class="prettyprint">master</code>.</p>
-
-<p>You can omit the <code class="prettyprint">upstream master</code> from the <code class="prettyprint">git pull</code> command when you let your
-<code class="prettyprint">master</code> branch always track the main <code class="prettyprint">youtube/vitess</code> repository. To achieve
-this, run this command once:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">(master) $ git branch --set-upstream-to=upstream/master
-</code></pre></div>
-<p>Now the following command syncs your local <code class="prettyprint">master</code> branch as well:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">(master) $ git pull
-</code></pre></div>
-<h2 id="topic-branches">Topic Branches</h2>
-
-<p>Before you start working on changes, create a topic branch:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">$ git checkout master
-(master) $ git pull
-(master) $ git checkout -b new-feature
-(new-feature) $ # You are now in the new-feature branch.
-</code></pre></div>
-<p>Try to commit small pieces along the way as you finish them, with an explanation
-of the changes in the commit message.
-Please see the <a href="/contributing/code-reviews.html">Code Review page</a> for more guidance.</p>
-
-<p>As you work in a package, you can run just
-the unit tests for that package by running <code class="prettyprint">go test</code> from within that package.</p>
-
-<p>When you&#39;re ready to test the whole system, run the full test suite with <code class="prettyprint">make
-test</code> from the root of the Git tree.
-If you haven&#39;t installed all dependencies for <code class="prettyprint">make test</code>, you can rely on the Travis CI test results as well.
-These results will be linked on your pull request.</p>
-
-<h2 id="sending-pull-requests">Sending Pull Requests</h2>
-
-<p>Push your branch to the repository (and set it to track with <code class="prettyprint">-u</code>):</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">(new-feature) $ git push -u origin new-feature
-</code></pre></div>
-<p>You can omit <code class="prettyprint">origin</code> and <code class="prettyprint">-u new-feature</code> parameters from the <code class="prettyprint">git push</code>
-command with the following two Git configuration changes:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">$ git config remote.pushdefault origin
-$ git config push.default current
-</code></pre></div>
-<p>The first setting saves you from typing <code class="prettyprint">origin</code> every time. And with the second
-setting, Git assumes that the remote branch on the GitHub side will have the
-same name as your local branch.</p>
-
-<p>After this change, you can run <code class="prettyprint">git push</code> without arguments:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">(new-feature) $ git push
-</code></pre></div>
-<p>Then go to the <a href="https://github.com/youtube/vitess">repository page</a> and it
-should prompt you to create a Pull Request from a branch you recently pushed.
-You can also <a href="https://github.com/youtube/vitess/compare">choose a branch manually</a>.</p>
-
-<h2 id="addressing-changes">Addressing Changes</h2>
-
-<p>If you need to make changes in response to the reviewer&#39;s comments, just make
-another commit on your branch and then push it again:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">$ git checkout new-feature
-(new-feature) $ git commit
-(new-feature) $ git push
-</code></pre></div>
-<p>That is because a pull request always mirrors all commits from your topic branch which are not in the master branch.</p>
-
-<p>Once your pull request is merged:</p>
-
-<ul>
-<li> close the GitHub issue (if it wasn&#39;t automatically closed)</li>
-<li> delete your local topic branch (<code class="prettyprint">git branch -d new-feature</code>)</li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/contributing/github-workflow/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/contributing/github-workflow/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/contributing/github-workflow/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/contributing/github-workflow/"</script>
 </html>
diff --git a/docs/contributing/github-workflow/index.html b/docs/contributing/github-workflow/index.html
new file mode 100644
index 00000000000..09a8345c41e
--- /dev/null
+++ b/docs/contributing/github-workflow/index.html
@@ -0,0 +1,453 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>GitHub Workflow | Vitess</title>
+<meta property="og:title" content="GitHub Workflow" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/contributing/github-workflow/" />
+<meta property="og:url" content="http://vitess.io/contributing/github-workflow/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/contributing/github-workflow/","headline":"GitHub Workflow","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>GitHub Workflow</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="github-workflow">GitHub Workflow</h1>
+
+<p>If you are new to Git and GitHub, we recommend to read this page. Otherwise, you may skip it.</p>
+
+<p>Our GitHub workflow is a so called triangular workflow:</p>
+
+<p><img src="https://cloud.githubusercontent.com/assets/1319791/8943755/5dcdcae4-354a-11e5-9f82-915914fad4f7.png" alt="visualization of the GitHub triangular workflow" style="width: 100%;"/></p>
+
+<p><em>Image Source:</em> <a href="https://github.com/blog/2042-git-2-5-including-multiple-worktrees-and-triangular-workflows">https://github.com/blog/2042-git-2-5-including-multiple-worktrees-and-triangular-workflows</a></p>
+
+<p>The Vitess code is hosted on GitHub (<a href="https://github.com/youtube/vitess">https://github.com/youtube/vitess</a>).
+This repository is called <em>upstream</em>.
+You develop and commit your changes in a clone of our upstream repository (shown as <em>local</em> in the image above).
+Then you push your changes to your forked repository (<em>origin</em>) and send us a pull request.
+Eventually, we will merge your pull request back into the <em>upstream</em> repository.</p>
+
+<h2 id="remotes">Remotes</h2>
+
+<p>Since you should have cloned the repository from your fork, the <code class="prettyprint">origin</code> remote
+should look like this:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">$ git remote -v
+origin  git@github.com:&lt;yourname&gt;/vitess.git (fetch)
+origin  git@github.com:&lt;yourname&gt;/vitess.git (push)
+</code></pre></div>
+<p>To help you keep your fork in sync with the main repo, add an <code class="prettyprint">upstream</code> remote:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">$ git remote add upstream git@github.com:youtube/vitess.git
+$ git remote -v
+origin  git@github.com:&lt;yourname&gt;/vitess.git (fetch)
+origin  git@github.com:&lt;yourname&gt;/vitess.git (push)
+upstream        git@github.com:youtube/vitess.git (fetch)
+upstream        git@github.com:youtube/vitess.git (push)
+</code></pre></div>
+<p>Now to sync your local <code class="prettyprint">master</code> branch, do this:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">$ git checkout master
+(master) $ git pull upstream master
+</code></pre></div>
+<p>Note: In the example output above we prefixed the prompt with <code class="prettyprint">(master)</code> to
+stress the fact that the command must be run from the branch <code class="prettyprint">master</code>.</p>
+
+<p>You can omit the <code class="prettyprint">upstream master</code> from the <code class="prettyprint">git pull</code> command when you let your
+<code class="prettyprint">master</code> branch always track the main <code class="prettyprint">youtube/vitess</code> repository. To achieve
+this, run this command once:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">(master) $ git branch --set-upstream-to=upstream/master
+</code></pre></div>
+<p>Now the following command syncs your local <code class="prettyprint">master</code> branch as well:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">(master) $ git pull
+</code></pre></div>
+<h2 id="topic-branches">Topic Branches</h2>
+
+<p>Before you start working on changes, create a topic branch:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">$ git checkout master
+(master) $ git pull
+(master) $ git checkout -b new-feature
+(new-feature) $ # You are now in the new-feature branch.
+</code></pre></div>
+<p>Try to commit small pieces along the way as you finish them, with an explanation
+of the changes in the commit message.
+Please see the <a href="/contributing/code-reviews/">Code Review page</a> for more guidance.</p>
+
+<p>As you work in a package, you can run just
+the unit tests for that package by running <code class="prettyprint">go test</code> from within that package.</p>
+
+<p>When you&#39;re ready to test the whole system, run the full test suite with <code class="prettyprint">make
+test</code> from the root of the Git tree.
+If you haven&#39;t installed all dependencies for <code class="prettyprint">make test</code>, you can rely on the Travis CI test results as well.
+These results will be linked on your pull request.</p>
+
+<h2 id="sending-pull-requests">Sending Pull Requests</h2>
+
+<p>Push your branch to the repository (and set it to track with <code class="prettyprint">-u</code>):</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">(new-feature) $ git push -u origin new-feature
+</code></pre></div>
+<p>You can omit <code class="prettyprint">origin</code> and <code class="prettyprint">-u new-feature</code> parameters from the <code class="prettyprint">git push</code>
+command with the following two Git configuration changes:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">$ git config remote.pushdefault origin
+$ git config push.default current
+</code></pre></div>
+<p>The first setting saves you from typing <code class="prettyprint">origin</code> every time. And with the second
+setting, Git assumes that the remote branch on the GitHub side will have the
+same name as your local branch.</p>
+
+<p>After this change, you can run <code class="prettyprint">git push</code> without arguments:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">(new-feature) $ git push
+</code></pre></div>
+<p>Then go to the <a href="https://github.com/youtube/vitess">repository page</a> and it
+should prompt you to create a Pull Request from a branch you recently pushed.
+You can also <a href="https://github.com/youtube/vitess/compare">choose a branch manually</a>.</p>
+
+<h2 id="addressing-changes">Addressing Changes</h2>
+
+<p>If you need to make changes in response to the reviewer&#39;s comments, just make
+another commit on your branch and then push it again:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">$ git checkout new-feature
+(new-feature) $ git commit
+(new-feature) $ git push
+</code></pre></div>
+<p>That is because a pull request always mirrors all commits from your topic branch which are not in the master branch.</p>
+
+<p>Once your pull request is merged:</p>
+
+<ul>
+<li> close the GitHub issue (if it wasn&#39;t automatically closed)</li>
+<li> delete your local topic branch (<code class="prettyprint">git branch -d new-feature</code>)</li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/contributing/index.html b/docs/contributing/index.html
index deec3d7474f..f599872c0e5 100644
--- a/docs/contributing/index.html
+++ b/docs/contributing/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Contributing to Vitess</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Contributing to Vitess"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Contributing to Vitess | Vitess</title>
+<meta property="og:title" content="Contributing to Vitess" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/contributing/" />
+<meta property="og:url" content="http://vitess.io/contributing/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/contributing/","headline":"Contributing to Vitess","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Contributing to Vitess</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -379,10 +388,10 @@ <h2 id="learning-vitess">Learning Vitess</h2>
 
 <ul>
 <li><p>Read the <a href="/overview/">What is Vitess</a> page, in particular the architecture section.</p></li>
-<li><p>Read the <a href="/overview/concepts.html">Vitess concepts</a> and the <a href="/user-guide/sharding.html">Sharding</a> page.</p>
+<li><p>Read the <a href="/overview/concepts/">Vitess concepts</a> and the <a href="/user-guide/sharding/">Sharding</a> page.</p>
 
 <ul>
-<li>We also recommend to look at our <a href="/resources/presentations.html">latest presentations</a>. They contain many illustrations which help understanding how Vitess works in detail.</li>
+<li>We also recommend to look at our <a href="/resources/presentations/">latest presentations</a>. They contain many illustrations which help understanding how Vitess works in detail.</li>
 <li>After studying the pages, try to answer the following question (click expand to see the answer):
 <details> 
 <summary>
diff --git a/docs/css/main.css b/docs/css/main.css
index 3c6fd7c3e7d..b2dcd7e8bdc 100644
--- a/docs/css/main.css
+++ b/docs/css/main.css
@@ -1,4 +1,4 @@
 .gist div{max-height:75em}.gist table{margin-top:0px}.gist tbody{background-color:white}.gist tbody tr:hover>td,.gist tbody tr:hover>th{background-color:transparent}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}/*!
  *  Font Awesome 4.1.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.1.0");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.1.0") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.1.0") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.1.0") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:.14286em;text-align:center}.fa-li.fa-lg{left:-1.85714em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0);-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-gear:before,.fa-cog:before{content:""}.fa-trash-o:before{content:""}.fa-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-rotate-right:before,.fa-repeat:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before{content:""}.fa-check-circle:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-warning:before,.fa-exclamation-triangle:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-gears:before,.fa-cogs:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook:before{content:""}.fa-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before{content:""}.fa-arrow-circle-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-save:before,.fa-floppy-o:before{content:""}.fa-square:before{content:""}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-unsorted:before,.fa-sort:before{content:""}.fa-sort-down:before,.fa-sort-desc:before{content:""}.fa-sort-up:before,.fa-sort-asc:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-legal:before,.fa-gavel:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-flash:before,.fa-bolt:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-paste:before,.fa-clipboard:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-unlink:before,.fa-chain-broken:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:""}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:""}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:""}.fa-euro:before,.fa-eur:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-rupee:before,.fa-inr:before{content:""}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:""}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:""}.fa-won:before,.fa-krw:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-turkish-lira:before,.fa-try:before{content:""}.fa-plus-square-o:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-institution:before,.fa-bank:before,.fa-university:before{content:""}.fa-mortar-board:before,.fa-graduation-cap:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper-square:before,.fa-pied-piper:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:""}.fa-file-zip-o:before,.fa-file-archive-o:before{content:""}.fa-file-sound-o:before,.fa-file-audio-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before{content:""}.fa-ge:before,.fa-empire:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-send:before,.fa-paper-plane:before{content:""}.fa-send-o:before,.fa-paper-plane-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}*,*:before,*:after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}blockquote{margin:0}img{max-width:100%;width:auto\9;height:auto;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.wrap{max-width:68em;margin-left:auto;margin-right:auto}.wrap:after{content:"";display:table;clear:both}.come-in{-webkit-transform:translateY(20px);-moz-transform:translateY(20px);-ms-transform:translateY(20px);-o-transform:translateY(20px);transform:translateY(20px);-webkit-animation:pop 0.5s ease forwards;-moz-animation:pop 0.5s ease forwards;animation:pop 0.5s ease forwards}.already-visible{-webkit-transform:translateY(0);-moz-transform:translateY(0);-ms-transform:translateY(0);-o-transform:translateY(0);transform:translateY(0);-webkit-animation:none;-moz-animation:none;animation:none}.hidden,.load{display:none}.no-scroll{overflow:hidden}.inline-btn:after{content:"";display:table;clear:both}.inline-btn a,.inline-btn btn{display:inline-block;margin-right:.809em}.inline-btn a:last-child,.inline-btn btn:last-child{margin-right:0}@media screen and (min-width: 48em){.shorten{width:66.66667%}}.center{text-align:center}.image-right{display:block;margin-left:auto;margin-right:auto}@media screen and (min-width: 48em){.image-right{float:right;margin-left:1.618em}}.th-grid{display:block;margin:0;padding:0}.th-grid:after{content:"";display:table;clear:both}.th-grid:after{content:"";display:table;clear:both}.th-grid li{list-style:none;float:left;display:block;margin-right:2.35765%;width:23.23176%;margin-bottom:2.35765%}.th-grid li:last-child{margin-right:0}.th-grid li:nth-child(4n){margin-right:0}.th-grid li:nth-child(4n+1){clear:left}.th-grid a img:hover{-webkit-animation:pop 0.3s 0 linear;-moz-animation:pop 0.3s 0 linear;animation:pop 0.3s 0 linear;box-shadow:0 0 10px rgba(0,0,0,0.2)}.th-grid-full{margin:0;padding:0}.th-grid-full:after{content:"";display:table;clear:both}@media screen and (min-width: 62.5em){.th-grid-full{margin-right:-29em}}.archive-wrap .th-grid-full{margin-right:0}.th-grid-full li{list-style:none;margin-bottom:2.35765%}@media screen and (min-width: 15em) and (max-width: 30em){.th-grid-full li{float:left;display:block;margin-right:2.35765%;width:23.23176%}.th-grid-full li:last-child{margin-right:0}.th-grid-full li:nth-child(4n){margin-right:0}.th-grid-full li:nth-child(4n+1){clear:left}}@media screen and (min-width: 30em) and (max-width: 62.4375em){.th-grid-full li{float:left;display:block;margin-right:2.35765%;width:23.23176%}.th-grid-full li:last-child{margin-right:0}.th-grid-full li:nth-child(4n){margin-right:0}.th-grid-full li:nth-child(4n+1){clear:left}}@media screen and (min-width: 62.5em){.th-grid-full li{float:left;width:6.575em;margin-right:.25em;margin-bottom:.25em}.th-grid-full li:nth-child(9n){margin-right:0}.th-grid-full li:nth-child(9n+1){clear:left}}.th-grid-full a img:hover{-webkit-animation:pop 0.3s 0 linear;-moz-animation:pop 0.3s 0 linear;animation:pop 0.3s 0 linear;box-shadow:0 0 10px rgba(0,0,0,0.2)}.btn,.btn-inverse,.btn-social,.btn-info,.btn-warning,.btn-success,.btn-danger{display:inline-block;padding:8px 20px;font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:24px;margin-bottom:1.5rem;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;background-color:#000;color:#fff;text-decoration:none;border:0 !important;border-radius:30px;-webkit-transition:background 0.2s,border 0.2s;-moz-transition:background 0.2s,border 0.2s;transition:background 0.2s,border 0.2s}.btn:hover,.btn-inverse:hover,.btn-social:hover,.btn-info:hover,.btn-warning:hover,.btn-success:hover,.btn-danger:hover{color:#fff;background-color:#1a1a1a}.btn:active,.btn-inverse:active,.btn-social:active,.btn-info:active,.btn-warning:active,.btn-success:active,.btn-danger:active{-webkit-transform:translateY(1px);-moz-transform:translateY(1px);-ms-transform:translateY(1px);-o-transform:translateY(1px);transform:translateY(1px)}.btn-inverse,.btn-social{background-color:#fff;color:#313130}.btn-inverse:visited,.btn-social:visited,.btn-inverse:active,.btn-social:active{color:#313130}.btn-inverse:hover,.btn-social:hover{color:#fff;background-color:#313130}.btn-info{background-color:#3498db;color:#fff}.btn-info:visited{color:#fff}.btn-info:hover{background-color:#5faee3}.btn-warning{background-color:#f1c40f;color:#fff}.btn-warning:visited{color:#fff}.btn-warning:hover{background-color:#f4d03f}.btn-success{background-color:#2ecc71;color:#fff}.btn-success:visited{color:#fff}.btn-success:hover{background-color:#54d98c}.btn-danger{background-color:#e74c3c;color:#fff}.btn-danger:visited{color:#fff}.btn-danger:hover{background-color:#ed7669}.btn-social{color:#313130 !important;border:1px solid #ddd !important}.btn-social:visited,.btn-social:active{color:#313130}.btn-social i.fa-facebook{color:#3b5998}.btn-social i.fa-flickr{color:#ff0084}.btn-social i.fa-foursquare{color:#0cbadf}.btn-social i.fa-google-plus{color:#dd4b39}.btn-social i.fa-instagram{color:#4e433c}.btn-social i.fa-linkedin{color:#4875b4}.btn-social i.fa-pinterest{color:#cb2027}.btn-social i.fa-rss{color:#fa9b39}.btn-social i.fa-tumblr{color:#2c4762}.btn-social i.fa-twitter{color:#55acee}.btn-social i.fa-vimeo{color:#1ab7ea}.btn-social i.fa-youtube{color:#f33}.btn-social:hover{color:#fff !important}.btn-social.facebook:hover{background:#3b5998;border-color:#3b5998}.btn-social.facebook:hover i.fa-facebook{color:#fff}.btn-social.facebook:hover i.fa-flickr{color:#fff}.btn-social.facebook:hover i.fa-foursquare{color:#fff}.btn-social.facebook:hover i.fa-google-plus{color:#fff}.btn-social.facebook:hover i.fa-instagram{color:#fff}.btn-social.facebook:hover i.fa-linkedin{color:#fff}.btn-social.facebook:hover i.fa-pinterest{color:#fff}.btn-social.facebook:hover i.fa-rss{color:#fff}.btn-social.facebook:hover i.fa-tumblr{color:#fff}.btn-social.facebook:hover i.fa-twitter{color:#fff}.btn-social.facebook:hover i.fa-vimeo{color:#fff}.btn-social.facebook:hover i.fa-youtube{color:#fff}.btn-social.flickr:hover{background:#ff0084;border-color:#ff0084}.btn-social.flickr:hover i.fa-facebook{color:#fff}.btn-social.flickr:hover i.fa-flickr{color:#fff}.btn-social.flickr:hover i.fa-foursquare{color:#fff}.btn-social.flickr:hover i.fa-google-plus{color:#fff}.btn-social.flickr:hover i.fa-instagram{color:#fff}.btn-social.flickr:hover i.fa-linkedin{color:#fff}.btn-social.flickr:hover i.fa-pinterest{color:#fff}.btn-social.flickr:hover i.fa-rss{color:#fff}.btn-social.flickr:hover i.fa-tumblr{color:#fff}.btn-social.flickr:hover i.fa-twitter{color:#fff}.btn-social.flickr:hover i.fa-vimeo{color:#fff}.btn-social.flickr:hover i.fa-youtube{color:#fff}.btn-social.foursquare:hover{background:#0cbadf;border-color:#0cbadf}.btn-social.foursquare:hover i.fa-facebook{color:#fff}.btn-social.foursquare:hover i.fa-flickr{color:#fff}.btn-social.foursquare:hover i.fa-foursquare{color:#fff}.btn-social.foursquare:hover i.fa-google-plus{color:#fff}.btn-social.foursquare:hover i.fa-instagram{color:#fff}.btn-social.foursquare:hover i.fa-linkedin{color:#fff}.btn-social.foursquare:hover i.fa-pinterest{color:#fff}.btn-social.foursquare:hover i.fa-rss{color:#fff}.btn-social.foursquare:hover i.fa-tumblr{color:#fff}.btn-social.foursquare:hover i.fa-twitter{color:#fff}.btn-social.foursquare:hover i.fa-vimeo{color:#fff}.btn-social.foursquare:hover i.fa-youtube{color:#fff}.btn-social.google-plus:hover{background:#dd4b39;border-color:#dd4b39}.btn-social.google-plus:hover i.fa-facebook{color:#fff}.btn-social.google-plus:hover i.fa-flickr{color:#fff}.btn-social.google-plus:hover i.fa-foursquare{color:#fff}.btn-social.google-plus:hover i.fa-google-plus{color:#fff}.btn-social.google-plus:hover i.fa-instagram{color:#fff}.btn-social.google-plus:hover i.fa-linkedin{color:#fff}.btn-social.google-plus:hover i.fa-pinterest{color:#fff}.btn-social.google-plus:hover i.fa-rss{color:#fff}.btn-social.google-plus:hover i.fa-tumblr{color:#fff}.btn-social.google-plus:hover i.fa-twitter{color:#fff}.btn-social.google-plus:hover i.fa-vimeo{color:#fff}.btn-social.google-plus:hover i.fa-youtube{color:#fff}.btn-social.instagram:hover{background:#4e433c;border-color:#4e433c}.btn-social.instagram:hover i.fa-facebook{color:#fff}.btn-social.instagram:hover i.fa-flickr{color:#fff}.btn-social.instagram:hover i.fa-foursquare{color:#fff}.btn-social.instagram:hover i.fa-google-plus{color:#fff}.btn-social.instagram:hover i.fa-instagram{color:#fff}.btn-social.instagram:hover i.fa-linkedin{color:#fff}.btn-social.instagram:hover i.fa-pinterest{color:#fff}.btn-social.instagram:hover i.fa-rss{color:#fff}.btn-social.instagram:hover i.fa-tumblr{color:#fff}.btn-social.instagram:hover i.fa-twitter{color:#fff}.btn-social.instagram:hover i.fa-vimeo{color:#fff}.btn-social.instagram:hover i.fa-youtube{color:#fff}.btn-social.linkedin:hover{background:#4875b4;border-color:#4875b4}.btn-social.linkedin:hover i.fa-facebook{color:#fff}.btn-social.linkedin:hover i.fa-flickr{color:#fff}.btn-social.linkedin:hover i.fa-foursquare{color:#fff}.btn-social.linkedin:hover i.fa-google-plus{color:#fff}.btn-social.linkedin:hover i.fa-instagram{color:#fff}.btn-social.linkedin:hover i.fa-linkedin{color:#fff}.btn-social.linkedin:hover i.fa-pinterest{color:#fff}.btn-social.linkedin:hover i.fa-rss{color:#fff}.btn-social.linkedin:hover i.fa-tumblr{color:#fff}.btn-social.linkedin:hover i.fa-twitter{color:#fff}.btn-social.linkedin:hover i.fa-vimeo{color:#fff}.btn-social.linkedin:hover i.fa-youtube{color:#fff}.btn-social.pinterest:hover{background:#cb2027;border-color:#cb2027}.btn-social.pinterest:hover i.fa-facebook{color:#fff}.btn-social.pinterest:hover i.fa-flickr{color:#fff}.btn-social.pinterest:hover i.fa-foursquare{color:#fff}.btn-social.pinterest:hover i.fa-google-plus{color:#fff}.btn-social.pinterest:hover i.fa-instagram{color:#fff}.btn-social.pinterest:hover i.fa-linkedin{color:#fff}.btn-social.pinterest:hover i.fa-pinterest{color:#fff}.btn-social.pinterest:hover i.fa-rss{color:#fff}.btn-social.pinterest:hover i.fa-tumblr{color:#fff}.btn-social.pinterest:hover i.fa-twitter{color:#fff}.btn-social.pinterest:hover i.fa-vimeo{color:#fff}.btn-social.pinterest:hover i.fa-youtube{color:#fff}.btn-social.rss:hover{background:#fa9b39;border-color:#fa9b39}.btn-social.rss:hover i.fa-facebook{color:#fff}.btn-social.rss:hover i.fa-flickr{color:#fff}.btn-social.rss:hover i.fa-foursquare{color:#fff}.btn-social.rss:hover i.fa-google-plus{color:#fff}.btn-social.rss:hover i.fa-instagram{color:#fff}.btn-social.rss:hover i.fa-linkedin{color:#fff}.btn-social.rss:hover i.fa-pinterest{color:#fff}.btn-social.rss:hover i.fa-rss{color:#fff}.btn-social.rss:hover i.fa-tumblr{color:#fff}.btn-social.rss:hover i.fa-twitter{color:#fff}.btn-social.rss:hover i.fa-vimeo{color:#fff}.btn-social.rss:hover i.fa-youtube{color:#fff}.btn-social.tumblr:hover{background:#2c4762;border-color:#2c4762}.btn-social.tumblr:hover i.fa-facebook{color:#fff}.btn-social.tumblr:hover i.fa-flickr{color:#fff}.btn-social.tumblr:hover i.fa-foursquare{color:#fff}.btn-social.tumblr:hover i.fa-google-plus{color:#fff}.btn-social.tumblr:hover i.fa-instagram{color:#fff}.btn-social.tumblr:hover i.fa-linkedin{color:#fff}.btn-social.tumblr:hover i.fa-pinterest{color:#fff}.btn-social.tumblr:hover i.fa-rss{color:#fff}.btn-social.tumblr:hover i.fa-tumblr{color:#fff}.btn-social.tumblr:hover i.fa-twitter{color:#fff}.btn-social.tumblr:hover i.fa-vimeo{color:#fff}.btn-social.tumblr:hover i.fa-youtube{color:#fff}.btn-social.twitter:hover{background:#55acee;border-color:#55acee}.btn-social.twitter:hover i.fa-facebook{color:#fff}.btn-social.twitter:hover i.fa-flickr{color:#fff}.btn-social.twitter:hover i.fa-foursquare{color:#fff}.btn-social.twitter:hover i.fa-google-plus{color:#fff}.btn-social.twitter:hover i.fa-instagram{color:#fff}.btn-social.twitter:hover i.fa-linkedin{color:#fff}.btn-social.twitter:hover i.fa-pinterest{color:#fff}.btn-social.twitter:hover i.fa-rss{color:#fff}.btn-social.twitter:hover i.fa-tumblr{color:#fff}.btn-social.twitter:hover i.fa-twitter{color:#fff}.btn-social.twitter:hover i.fa-vimeo{color:#fff}.btn-social.twitter:hover i.fa-youtube{color:#fff}.btn-social.vimeo:hover{background:#1ab7ea;border-color:#1ab7ea}.btn-social.vimeo:hover i.fa-facebook{color:#fff}.btn-social.vimeo:hover i.fa-flickr{color:#fff}.btn-social.vimeo:hover i.fa-foursquare{color:#fff}.btn-social.vimeo:hover i.fa-google-plus{color:#fff}.btn-social.vimeo:hover i.fa-instagram{color:#fff}.btn-social.vimeo:hover i.fa-linkedin{color:#fff}.btn-social.vimeo:hover i.fa-pinterest{color:#fff}.btn-social.vimeo:hover i.fa-rss{color:#fff}.btn-social.vimeo:hover i.fa-tumblr{color:#fff}.btn-social.vimeo:hover i.fa-twitter{color:#fff}.btn-social.vimeo:hover i.fa-vimeo{color:#fff}.btn-social.vimeo:hover i.fa-youtube{color:#fff}.btn-social.youtube:hover{background:#f33;border-color:#f33}.btn-social.youtube:hover i.fa-facebook{color:#fff}.btn-social.youtube:hover i.fa-flickr{color:#fff}.btn-social.youtube:hover i.fa-foursquare{color:#fff}.btn-social.youtube:hover i.fa-google-plus{color:#fff}.btn-social.youtube:hover i.fa-instagram{color:#fff}.btn-social.youtube:hover i.fa-linkedin{color:#fff}.btn-social.youtube:hover i.fa-pinterest{color:#fff}.btn-social.youtube:hover i.fa-rss{color:#fff}.btn-social.youtube:hover i.fa-tumblr{color:#fff}.btn-social.youtube:hover i.fa-twitter{color:#fff}.btn-social.youtube:hover i.fa-vimeo{color:#fff}.btn-social.youtube:hover i.fa-youtube{color:#fff}.badge{display:inline-block;background:#000;border-radius:2em;color:#fff;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:12px;font-size:.75rem;line-height:2;margin-bottom:0;font-weight:600;line-height:1;padding:.25em 1em;text-align:center}.badge.inverse{background:#fff;color:#313130}.badge.info{background:#3498db;color:#fff}.badge.danger{background:#e74c3c;color:#fff}.badge.warning{background:#f1c40f;color:#000}.badge.success{background:#2ecc71;color:#000}.bullets{overflow:auto}@media screen and (min-width: 62.5em){.bullets .two-col-bullet{float:left;display:block;margin-right:2.35765%;width:48.82117%}.bullets .two-col-bullet:last-child{margin-right:0}.bullets .two-col-bullet:nth-child(2n){margin-right:0}.bullets .two-col-bullet:nth-child(2n+1){clear:left}}@media screen and (min-width: 62.5em){.bullets .three-col-bullet{float:left;display:block;margin-right:2.35765%;width:31.76157%}.bullets .three-col-bullet:last-child{margin-right:0}.bullets .three-col-bullet:nth-child(3n){margin-right:0}.bullets .three-col-bullet:nth-child(3n+1){clear:left}}@media screen and (min-width: 62.5em){.bullets .four-col-bullet{float:left;display:block;margin-right:2.35765%;width:23.23176%}.bullets .four-col-bullet:last-child{margin-right:0}.bullets .four-col-bullet:nth-child(4n){margin-right:0}.bullets .four-col-bullet:nth-child(4n+1){clear:left}}.bullets .bullet-icon{float:left;background:#343434;padding:1.05895em;border-radius:50%;width:5.29475em;height:5.29475em}.bullets .bullet-content{margin-left:5.93012em;margin-bottom:2em}.bullets h2{margin-top:0;font-size:20px;font-size:1.25rem;line-height:1.2;margin-bottom:0;display:inline-block}.bullets p{font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:24px;margin-bottom:1.5rem}.sliding-menu-button{position:fixed;top:1.618em;right:1.618em;display:block;width:60px;height:60px;background:#000;outline:0;padding:0;border:2.5px solid transparent;cursor:pointer;z-index:5;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transition:right 500ms cubic-bezier(0.645, 0.045, 0.355, 1);-moz-transition:right 500ms cubic-bezier(0.645, 0.045, 0.355, 1);transition:right 500ms cubic-bezier(0.645, 0.045, 0.355, 1)}@media screen and (min-width: 48em){.sliding-menu-button{-webkit-transform:0;-moz-transform:0;-ms-transform:0;-o-transform:0;transform:0}}.sliding-menu-button.slide{-webkit-transition:right 500ms ease-in-out;-moz-transition:right 500ms ease-in-out;transition:right 500ms ease-in-out}@media screen and (min-width: 48em){.sliding-menu-button.slide{right:90%}}.sliding-menu-content{position:fixed;top:0;right:0;padding:1.375em 0;text-align:center;visibility:hidden;height:100%;width:100%;-webkit-transform:translateX(100%);-moz-transform:translateX(100%);-ms-transform:translateX(100%);-o-transform:translateX(100%);transform:translateX(100%);-webkit-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);-moz-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);background:#000;z-index:5;overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch}@media screen and (min-width: 48em){.sliding-menu-content{text-align:left}}@media screen and (min-width: 48em){.sliding-menu-content{height:100%;width:87%}}.sliding-menu-content.is-visible{visibility:visible;-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0);-webkit-transition:500ms ease-in-out;-moz-transition:500ms ease-in-out;transition:500ms ease-in-out}.sliding-menu-content ul{margin:0 10%}.sliding-menu-content ul,.sliding-menu-content li{list-style:none}.sliding-menu-content li{display:block;position:relative;padding:1em 0}.sliding-menu-content .menu-item>li a{color:#fff;text-decoration:none}.sliding-menu-content .menu-item>li .teaser{width:150px;border:2px solid #fff;margin-bottom:.809em}@media screen and (min-width: 48em){.sliding-menu-content .menu-item>li .teaser{position:absolute;top:20px;left:0;margin-bottom:0}}.sliding-menu-content .menu-item>li .title{display:block;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:32px;font-size:2rem;line-height:1.5;margin-bottom:0;font-weight:700}@media screen and (min-width: 48em){.sliding-menu-content .menu-item>li .title{margin-left:170px}}.sliding-menu-content .menu-item>li .excerpt{color:#fff;margin-top:0}@media screen and (min-width: 48em){.sliding-menu-content .menu-item>li .excerpt{margin-left:170px}}.sliding-menu-content .sub-menu-item>li a{display:block;color:#fff;font-style:italic}.sliding-menu-content .menu-item .home a{font-size:32px;font-size:2rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}.menu-screen{position:fixed;top:0px;right:0px;bottom:0px;left:0px;-webkit-transition:all 0.15s ease-out 0s;-moz-transition:all 0.15s ease-out 0s;transition:all 0.15s ease-out 0s;background:#000;opacity:0;visibility:hidden;z-index:4}.menu-screen.is-visible{opacity:.4;visibility:visible}.menu-screen.is-visible:hover{cursor:pointer}.menulines{display:inline-block;width:30px;height:4.28571px;background:#fff;border-radius:2.14286px;transition:.3s;position:relative}.menulines:before,.menulines:after{display:inline-block;width:30px;height:4.28571px;background:#fff;border-radius:2.14286px;transition:.3s;position:absolute;left:0;content:'';-webkit-transform-origin:2.14286px center;transform-origin:2.14286px center}.menulines:before{top:7.5px}.menulines:after{top:-7.5px}.menulines-button:hover .menulines:before{top:8.57143px}.menulines-button:hover .menulines:after{top:-8.57143px}.menulines-button.arrow.close .menulines:before,.menulines-button.arrow.close .menulines:after{top:0;width:16.66667px}.menulines-button.arrow.close .menulines:before{-webkit-transform:rotate3d(0, 0, 1, 40deg);transform:rotate3d(0, 0, 1, 40deg)}.menulines-button.arrow.close .menulines:after{-webkit-transform:rotate3d(0, 0, 1, -40deg);transform:rotate3d(0, 0, 1, -40deg)}.menulines-button.arrow-up.close{-webkit-transform:scale3d(0.8, 0.8, 0.8) rotate3d(0, 0, 1, 90deg);transform:scale3d(0.8, 0.8, 0.8) rotate3d(0, 0, 1, 90deg)}.menulines-button.minus.close .lines:before,.menulines-button.minus.close .lines:after{-webkit-transform:none;transform:none;top:0;width:30px}.menulines-button.x.close .menulines{background:transparent}.menulines-button.x.close .menulines:before,.menulines-button.x.close .menulines:after{-webkit-transform-origin:50% 50%;transform-origin:50% 50%;top:0;width:30px}.menulines-button.x.close .menulines:before{-webkit-transform:rotate3d(0, 0, 1, 45deg);transform:rotate3d(0, 0, 1, 45deg)}.menulines-button.x.close .menulines:after{-webkit-transform:rotate3d(0, 0, 1, -45deg);transform:rotate3d(0, 0, 1, -45deg)}.menulines-button.x2 .menulines{transition:background .3s .5s ease}.menulines-button.x2 .menulines:before,.menulines-button.x2 .menulines:after{-webkit-transform-origin:50% 50%;transform-origin:50% 50%;transition:top .3s .6s ease, -webkit-transform .3s ease;transition:top .3s .6s ease, transform .3s ease}.menulines-button.x2.close .menulines{transition:background .3s 0s ease;background:transparent}.menulines-button.x2.close .menulines:before,.menulines-button.x2.close .menulines:after{transition:top .3s ease, -webkit-transform .3s .5s ease;transition:top .3s ease, transform .3s .5s ease;top:0;width:30px}.menulines-button.x2.close .menulines:before{-webkit-transform:rotate3d(0, 0, 1, 45deg);transform:rotate3d(0, 0, 1, 45deg)}.menulines-button.x2.close .menulines:after{-webkit-transform:rotate3d(0, 0, 1, -45deg);transform:rotate3d(0, 0, 1, -45deg)}.notice{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#000;border-radius:3px}.notice a{color:#fff;border-bottom:1px dotted #fff}.notice-inverse{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#fff;border-radius:3px;color:#313130}.notice-inverse a{color:#fff;border-bottom:1px dotted #fff}.notice-inverse a{color:#313130}.notice-info{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#3498db;border-radius:3px}.notice-info a{color:#fff;border-bottom:1px dotted #fff}.notice-warning{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#f1c40f;border-radius:3px}.notice-warning a{color:#fff;border-bottom:1px dotted #fff}.notice-success{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#2ecc71;border-radius:3px}.notice-success a{color:#fff;border-bottom:1px dotted #fff}.notice-danger{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#e74c3c;border-radius:3px}.notice-danger a{color:#fff;border-bottom:1px dotted #fff}@-webkit-keyframes wiggle{25%, 50%, 75%, 100%{-webkit-transform-origin:top center}25%{-webkit-transform:rotate(8deg)}50%{-webkit-transform:rotate(-4deg)}75%{-webkit-transform:rotate(2deg)}100%{-webkit-transform:rotate(0deg)}}@-moz-keyframes wiggle{25%, 50%, 75%, 100%{-moz-transform-origin:top center}25%{-moz-transform:rotate(8deg)}50%{-moz-transform:rotate(-4deg)}75%{-moz-transform:rotate(2deg)}100%{-moz-transform:rotate(0deg)}}@keyframes wiggle{25%, 50%, 75%, 100%{-webkit-transform-origin:top center;-moz-transform-origin:top center;-ms-transform-origin:top center;-o-transform-origin:top center;transform-origin:top center}25%{-webkit-transform:rotate(8deg);-moz-transform:rotate(8deg);-ms-transform:rotate(8deg);-o-transform:rotate(8deg);transform:rotate(8deg)}50%{-webkit-transform:rotate(-4deg);-moz-transform:rotate(-4deg);-ms-transform:rotate(-4deg);-o-transform:rotate(-4deg);transform:rotate(-4deg)}75%{-webkit-transform:rotate(2deg);-moz-transform:rotate(2deg);-ms-transform:rotate(2deg);-o-transform:rotate(2deg);transform:rotate(2deg)}100%{-webkit-transform:rotate(0deg);-moz-transform:rotate(0deg);-ms-transform:rotate(0deg);-o-transform:rotate(0deg);transform:rotate(0deg)}}@-webkit-keyframes pop{50%{-webkit-transform:scale(1.1)}100%{-webkit-transform:scale(1)}}@-moz-keyframes pop{50%{-moz-transform:scale(1.1)}100%{-moz-transform:scale(1)}}@keyframes pop{50%{-webkit-transform:scale(1.1);-moz-transform:scale(1.1);-ms-transform:scale(1.1);-o-transform:scale(1.1);transform:scale(1.1)}100%{-webkit-transform:scale(1);-moz-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}}@-webkit-keyframes hang{50%{-webkit-transform:translateY(-3px)}100%{-webkit-transform:translateY(-6px)}}@-moz-keyframes hang{50%{-moz-transform:translateY(-3px)}100%{-moz-transform:translateY(-6px)}}@keyframes hang{50%{-webkit-transform:translateY(-3px);-moz-transform:translateY(-3px);-ms-transform:translateY(-3px);-o-transform:translateY(-3px);transform:translateY(-3px)}100%{-webkit-transform:translateY(-6px);-moz-transform:translateY(-6px);-ms-transform:translateY(-6px);-o-transform:translateY(-6px);transform:translateY(-6px)}}.hang{display:inline-block;-webkit-animation-name:hang;-moz-animation-name:hang;animation-name:hang;-webkit-animation-duration:0.5s;-moz-animation-duration:0.5s;animation-duration:0.5s;-webkit-animation-timing-function:linear;-moz-animation-timing-function:linear;animation-timing-function:linear;-webkit-animation-iteration-count:infinite;-moz-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-direction:alternate;-moz-animation-direction:alternate;animation-direction:alternate}#masthead{padding:1.618em;z-index:5;-webkit-transform:translate(0, 0);-moz-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0);-webkit-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);-moz-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1)}#masthead.slide{-webkit-transform:translate(-1600px, 0);-moz-transform:translate(-1600px, 0);-ms-transform:translate(-1600px, 0);-o-transform:translate(-1600px, 0);transform:translate(-1600px, 0)}#masthead .inner-wrap{max-width:68em;margin-left:auto;margin-right:auto}#masthead .inner-wrap:after{content:"";display:table;clear:both}.site-title{display:block;padding:15px 0;height:60px;text-decoration:none;color:#000;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-weight:700;font-size:20px;font-size:1.25rem;line-height:1.2;margin-bottom:0;line-height:30px;text-transform:uppercase}.site-title:after{content:"";display:table;clear:both}@media screen and (min-width: 62.5em){.site-title{float:left;display:block;margin-right:2.35765%;width:31.76157%}.site-title:last-child{margin-right:0}}.menu li{float:left}@media screen and (min-width: 48em){.menu li:last-child a{margin-right:0}}.menu li a{position:relative;display:block;margin-right:1.618em;padding:15px 0 15px;height:60px;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}.menu li a:before,.menu li a:after{content:'';display:block;position:absolute;top:0;left:0;height:2px;-webkit-transition:width 0.3s;-moz-transition:width 0.3s;transition:width 0.3s}.menu li a:before{width:100%;background:transparent}.menu li a:after{width:0;background:#000}.menu li a:active:after,.menu li a:hover:after{width:100%}.top-menu{display:none;position:relative}@media screen and (min-width: 48em){.top-menu{float:left;display:block;margin-right:2.35765%;width:100%}.top-menu:last-child{margin-right:0}}@media screen and (min-width: 62.5em){.top-menu{float:left;display:block;margin-right:2.35765%;width:57.35098%}.top-menu:last-child{margin-right:0}.top-menu ul{position:absolute;right:0}}.top-menu .home,.top-menu .sub-menu-item{display:none}.top-menu li a{font-weight:700;font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:0;line-height:30px;color:#000;text-transform:uppercase}.bottom-menu{font-weight:700}.bottom-menu:after{content:"";display:table;clear:both}.bottom-menu a{color:#999}#page-wrapper{padding:0 1.618em;height:100%;width:100%;-webkit-overflow-scrolling:touch;z-index:2;-webkit-transform:translate(0, 0);-moz-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0);-webkit-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);-moz-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1)}#page-wrapper.slide{-webkit-transform:translate(-60rem, 0);-moz-transform:translate(-60rem, 0);-ms-transform:translate(-60rem, 0);-o-transform:translate(-60rem, 0);transform:translate(-60rem, 0)}.upgrade{text-align:center}.upgrade a{text-decoration:none}@media screen and (min-width: 48em){#main .inner-wrap{float:left;display:block;margin-right:2.35765%;width:100%}#main .inner-wrap:last-child{margin-right:0}}@media screen and (min-width: 48em){#main .toc{display:block}#main .toc:after{content:"";display:table;clear:both}}@media screen and (min-width: 62.5em){#main .toc{float:right;display:block;margin-left:3.16844%;width:19.75788%}#main .toc:last-child{margin-left:0}}#main .page-title{width:100%}@media screen and (min-width: 48em){.page-content{display:block}.page-content:after{content:"";display:table;clear:both}}@media screen and (min-width: 62.5em){.page-content{float:right;display:block;margin-left:3.16844%;width:77.07368%}.page-content:last-child{margin-left:0}}.page-content>p:first-child{font-size:20px;font-size:1.25rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}.page-content a{text-decoration:none}.page-content p>a,.page-content li>a{border-bottom:1px dotted #a2a2a2}.page-content p>a:hover,.page-content li>a:hover{border-bottom-style:solid}.page-content p>a.reversefootnote{border-bottom-width:0}.page-content .page-footer,.page-content .pagination{width:100%}.page-content .page-meta p{font-size:14px;font-size:.875rem;line-height:1.71429;margin-bottom:0;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;color:#999}.archive-wrap{width:100%}.archive-wrap .page-content{width:100%}#main .ads{position:relative;text-align:center;margin-top:1.618em;margin-left:-1.618em;margin-right:-1.618em;padding:10px 0 20px;background:#eaeaea}@media screen and (min-width: 48em){#main .ads{float:left;display:block;margin-right:2.35765%;width:23.23176%;margin-left:0;margin-right:0}#main .ads:last-child{margin-right:0}}#main .ads:after{content:'Advertisement';position:absolute;bottom:0;width:100%;text-align:center;display:block;font-size:9px;font-size:.5625rem;line-height:2.66667;margin-bottom:0;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}#main .ads ins{border-width:0}.page-lead{background-position:center top;background-repeat:no-repeat;background-attachment:fixed;text-align:center;color:#fff}@media screen and (min-width: 62.5em){.page-lead{background-size:cover}}.page-lead-content{padding:1em}@media screen and (min-width: 48em){.page-lead-content{padding:2em}}@media screen and (min-width: 62.5em){.page-lead-content{padding:3em}}.page-lead-content h1{font-size:48px;font-size:3rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem}@media screen and (min-width: 48em){.page-lead-content h1{font-size:60px;font-size:3.75rem;line-height:1.2;margin-bottom:24px;margin-bottom:1.5rem}}@media screen and (min-width: 62.5em){.page-lead-content h1{font-size:72px;font-size:4.5rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem}}.page-lead-content h2{font-size:20px;font-size:1.25rem;line-height:1.2;margin-bottom:24px;margin-bottom:1.5rem}@media screen and (min-width: 48em){.page-lead-content h2{font-size:24px;font-size:1.5rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem}}@media screen and (min-width: 62.5em){.page-lead-content h2{font-size:32px;font-size:2rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}}.page-feature{width:100%}.page-feature img{width:100%}.page-image{position:relative;margin-left:-1.618em;margin-right:-1.618em}.page-image .image-credit{position:absolute;bottom:0;right:0;margin:0 auto;padding:10px 15px;background-color:rgba(0,0,0,0.5);color:#fff;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:12px;font-size:.75rem;line-height:2;margin-bottom:0;text-align:right;z-index:10}.page-image .image-credit a{color:#fff;text-decoration:none}.breadcrumbs{display:block;margin-top:1.618em;font-size:10px;font-size:.625rem;line-height:2.4;margin-bottom:0}.breadcrumbs:after{content:"";display:table;clear:both}.breadcrumbs a{display:inline-block;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-weight:700;text-align:left;text-transform:uppercase}.toc{min-height:1px;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}.toc ul{margin-top:1.618em;border:1px solid #ddd;border-radius:3px}.toc li{font-size:12px;font-size:.75rem;line-height:1.33333;margin-bottom:0;border-bottom:1px solid #ddd}@media screen and (min-width: 15em) and (max-width: 30em){.toc li{font-size:16px;font-size:1rem;line-height:1.125;margin-bottom:0}}@media screen and (min-width: 30em) and (max-width: 47.9375em){.toc li{font-size:16px;font-size:1rem;line-height:1.125;margin-bottom:0}}.toc a{display:block;padding:.4045em .809em;border-left:2px solid transparent}.toc a:hover,.toc a:focus{background:#eaeaea}.tile{max-width:68em;margin-left:auto;margin-right:auto;margin-bottom:1.618em}.tile:after{content:"";display:table;clear:both}@media screen and (min-width: 15em) and (max-width: 30em){.tile{width:100%}}@media screen and (min-width: 30em) and (max-width: 47.9375em){.tile{float:left;display:block;margin-right:2.35765%;width:48.82117%}.tile:last-child{margin-right:0}.tile:nth-child(2n){margin-right:0}.tile:nth-child(2n+1){clear:left}}@media screen and (min-width: 48em){.tile{float:left;display:block;margin-right:2.35765%;width:23.23176%}.tile:last-child{margin-right:0}.tile:nth-child(4n){margin-right:0}.tile:nth-child(4n+1){clear:left}}.tile .entry-date{font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:0;color:#71716f}.tile .post-title{font-size:18px;font-size:1.125rem;line-height:1.33333;margin-bottom:0}.tile .post-excerpt{font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}.tile .post-teaser{position:relative;display:block}.tile .post-teaser:after{content:'';position:absolute;width:100%;height:100%;top:0;left:0;background:rgba(52,52,52,0);pointer-events:none;-webkit-transition:background 0.3s;-moz-transition:background 0.3s;transition:background 0.3s}.tile .post-teaser:hover:after{background:rgba(52,52,52,0.2)}.footnotes{font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}.footnotes p,.footnotes li{font-size:12px;font-size:.75rem;line-height:2;margin-bottom:0}.footnotes:before{content:'Footnotes:';font-weight:700}.page-footer{position:relative}.author-image{position:absolute;left:0}.author-image img{width:80px;height:80px;border-radius:3px}.author-content{word-wrap:break-word;padding-left:100px;min-height:80px}.author-name{font-size:20px;font-size:1.25rem;line-height:1.2;margin-bottom:0}.author-bio{margin-top:0;font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}#scroll-cue{position:fixed;bottom:100px;left:50%;width:60px;height:60px;text-align:center;cursor:pointer;color:#fff;font-size:12px;font-size:.75rem;line-height:2;margin-bottom:24px;margin-bottom:1.5rem;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;text-decoration:none;text-transform:uppercase;text-shadow:0px 0px 10px rgba(0,0,0,0.5);letter-spacing:2px}@media screen and (max-height: 43.75em){#scroll-cue{bottom:0}}#site-footer{max-width:68em;margin-left:auto;margin-right:auto;margin-top:72px;margin-top:4.5rem;padding-bottom:1.618em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}#site-footer:after{content:"";display:table;clear:both}#site-footer .copyright{font-size:12px;font-size:.75rem;line-height:2;margin-bottom:24px;margin-bottom:1.5rem;color:#999}#site-footer .copyright a{color:#999;text-decoration:none}.linenos,.code{padding:0;border-top:0 solid transparent;border-bottom:0 solid transparent}.highlight{overflow-x:auto;font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem;border:1px solid #dedede;border-radius:3px}.highlight pre{position:relative;margin:0;padding:1em}.highlight:hover{border:1px solid #c4c4c4}.highlighttable tr:hover>td,.highlighttable tr:hover>th{background:transparent}.hll{background-color:#ffc}.err{color:#a61717;background-color:#e3d2d2}.k{color:#000000;font-weight:bold}.o{color:#000000;font-weight:bold}.c{color:#999988;font-style:italic}.cm{color:#999988;font-style:italic}.cp{color:#999999;font-weight:bold;font-style:italic}.c1{color:#999988;font-style:italic}.cs{color:#999999;font-weight:bold;font-style:italic}.gd{color:#000000;background-color:#fdd}.ge{color:#000000;font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000000;background-color:#dfd}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:#aaa}.gt{color:#a00}.kc{color:#000000;font-weight:bold}.kd{color:#000000;font-weight:bold}.kn{color:#000000;font-weight:bold}.kp{color:#000000;font-weight:bold}.kr{color:#000000;font-weight:bold}.kt{color:#445588;font-weight:bold}.m{color:#099}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.il{color:#099}.s{color:#d01040}.sb{color:#d01040}.sc{color:#d01040}.sd{color:#d01040}.s2{color:#d01040}.se{color:#d01040}.sh{color:#d01040}.si{color:#d01040}.sx{color:#d01040}.sr{color:#009926}.s1{color:#d01040}.ss{color:#990073}.na{color:teal}.nb{color:#0086B3}.nc{color:#445588;font-weight:bold}.no{color:teal}.nd{color:#3c5d5d;font-weight:bold}.ni{color:purple}.ne{color:#990000;font-weight:bold}.nf{color:#990000;font-weight:bold}.nl{color:#990000;font-weight:bold}.nn{color:#555}.nt{color:navy}.bp{color:#999}.nv{color:teal}.vc{color:teal}.vg{color:teal}.vi{color:teal}.ow{color:#000000;font-weight:bold}.w{color:#bbb}
+ */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.1.0");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.1.0") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.1.0") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.1.0") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.2857142857em;text-align:center}.fa-ul{padding-left:0;margin-left:2.1428571429em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.1428571429em;width:2.1428571429em;top:.1428571429em;text-align:center}.fa-li.fa-lg{left:-1.8571428571em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0);-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-gear:before,.fa-cog:before{content:""}.fa-trash-o:before{content:""}.fa-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-rotate-right:before,.fa-repeat:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before{content:""}.fa-check-circle:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-warning:before,.fa-exclamation-triangle:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-gears:before,.fa-cogs:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook:before{content:""}.fa-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before{content:""}.fa-arrow-circle-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-save:before,.fa-floppy-o:before{content:""}.fa-square:before{content:""}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-unsorted:before,.fa-sort:before{content:""}.fa-sort-down:before,.fa-sort-desc:before{content:""}.fa-sort-up:before,.fa-sort-asc:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-legal:before,.fa-gavel:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-flash:before,.fa-bolt:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-paste:before,.fa-clipboard:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-unlink:before,.fa-chain-broken:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:""}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:""}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:""}.fa-euro:before,.fa-eur:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-rupee:before,.fa-inr:before{content:""}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:""}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:""}.fa-won:before,.fa-krw:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-turkish-lira:before,.fa-try:before{content:""}.fa-plus-square-o:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-institution:before,.fa-bank:before,.fa-university:before{content:""}.fa-mortar-board:before,.fa-graduation-cap:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper-square:before,.fa-pied-piper:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:""}.fa-file-zip-o:before,.fa-file-archive-o:before{content:""}.fa-file-sound-o:before,.fa-file-audio-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before{content:""}.fa-ge:before,.fa-empire:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-send:before,.fa-paper-plane:before{content:""}.fa-send-o:before,.fa-paper-plane-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}*,*:before,*:after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}blockquote{margin:0}img{max-width:100%;width:auto\9;height:auto;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.wrap{max-width:68em;margin-left:auto;margin-right:auto}.wrap:after{content:"";display:table;clear:both}.come-in{-webkit-transform:translateY(20px);-moz-transform:translateY(20px);-ms-transform:translateY(20px);-o-transform:translateY(20px);transform:translateY(20px);-webkit-animation:pop 0.5s ease forwards;-moz-animation:pop 0.5s ease forwards;animation:pop 0.5s ease forwards}.already-visible{-webkit-transform:translateY(0);-moz-transform:translateY(0);-ms-transform:translateY(0);-o-transform:translateY(0);transform:translateY(0);-webkit-animation:none;-moz-animation:none;animation:none}.hidden,.load{display:none}.no-scroll{overflow:hidden}.inline-btn:after{content:"";display:table;clear:both}.inline-btn a,.inline-btn btn{display:inline-block;margin-right:.809em}.inline-btn a:last-child,.inline-btn btn:last-child{margin-right:0}@media screen and (min-width: 48em){.shorten{width:66.6666666667%}}.center{text-align:center}.image-right{display:block;margin-left:auto;margin-right:auto}@media screen and (min-width: 48em){.image-right{float:right;margin-left:1.618em}}.th-grid{display:block;margin:0;padding:0}.th-grid:after{content:"";display:table;clear:both}.th-grid:after{content:"";display:table;clear:both}.th-grid li{list-style:none;float:left;display:block;margin-right:2.3576515979%;width:23.2317613015%;margin-bottom:2.3576515979%}.th-grid li:last-child{margin-right:0}.th-grid li:nth-child(4n){margin-right:0}.th-grid li:nth-child(4n+1){clear:left}.th-grid a img:hover{-webkit-animation:pop 0.3s 0 linear;-moz-animation:pop 0.3s 0 linear;animation:pop 0.3s 0 linear;box-shadow:0 0 10px rgba(0,0,0,0.2)}.th-grid-full{margin:0;padding:0}.th-grid-full:after{content:"";display:table;clear:both}@media screen and (min-width: 62.5em){.th-grid-full{margin-right:-29em}}.archive-wrap .th-grid-full{margin-right:0}.th-grid-full li{list-style:none;margin-bottom:2.3576515979%}@media screen and (min-width: 15em) and (max-width: 30em){.th-grid-full li{float:left;display:block;margin-right:2.3576515979%;width:23.2317613015%}.th-grid-full li:last-child{margin-right:0}.th-grid-full li:nth-child(4n){margin-right:0}.th-grid-full li:nth-child(4n+1){clear:left}}@media screen and (min-width: 30em) and (max-width: 62.4375em){.th-grid-full li{float:left;display:block;margin-right:2.3576515979%;width:23.2317613015%}.th-grid-full li:last-child{margin-right:0}.th-grid-full li:nth-child(4n){margin-right:0}.th-grid-full li:nth-child(4n+1){clear:left}}@media screen and (min-width: 62.5em){.th-grid-full li{float:left;width:6.575em;margin-right:.25em;margin-bottom:.25em}.th-grid-full li:nth-child(9n){margin-right:0}.th-grid-full li:nth-child(9n+1){clear:left}}.th-grid-full a img:hover{-webkit-animation:pop 0.3s 0 linear;-moz-animation:pop 0.3s 0 linear;animation:pop 0.3s 0 linear;box-shadow:0 0 10px rgba(0,0,0,0.2)}.btn,.btn-inverse,.btn-social,.btn-info,.btn-warning,.btn-success,.btn-danger{display:inline-block;padding:8px 20px;font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:24px;margin-bottom:1.5rem;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;background-color:#000;color:#fff;text-decoration:none;border:0 !important;border-radius:30px;-webkit-transition:background 0.2s,border 0.2s;-moz-transition:background 0.2s,border 0.2s;transition:background 0.2s,border 0.2s}.btn:hover,.btn-inverse:hover,.btn-social:hover,.btn-info:hover,.btn-warning:hover,.btn-success:hover,.btn-danger:hover{color:#fff;background-color:#1a1a1a}.btn:active,.btn-inverse:active,.btn-social:active,.btn-info:active,.btn-warning:active,.btn-success:active,.btn-danger:active{-webkit-transform:translateY(1px);-moz-transform:translateY(1px);-ms-transform:translateY(1px);-o-transform:translateY(1px);transform:translateY(1px)}.btn-inverse,.btn-social{background-color:#fff;color:#313130}.btn-inverse:visited,.btn-social:visited,.btn-inverse:active,.btn-social:active{color:#313130}.btn-inverse:hover,.btn-social:hover{color:#fff;background-color:#313130}.btn-info{background-color:#3498db;color:#fff}.btn-info:visited{color:#fff}.btn-info:hover{background-color:#5faee3}.btn-warning{background-color:#f1c40f;color:#fff}.btn-warning:visited{color:#fff}.btn-warning:hover{background-color:#f4d03f}.btn-success{background-color:#2ecc71;color:#fff}.btn-success:visited{color:#fff}.btn-success:hover{background-color:#54d98c}.btn-danger{background-color:#e74c3c;color:#fff}.btn-danger:visited{color:#fff}.btn-danger:hover{background-color:#ed7669}.btn-social{color:#313130 !important;border:1px solid #ddd !important}.btn-social:visited,.btn-social:active{color:#313130}.btn-social i.fa-facebook{color:#3b5998}.btn-social i.fa-flickr{color:#ff0084}.btn-social i.fa-foursquare{color:#0cbadf}.btn-social i.fa-google-plus{color:#dd4b39}.btn-social i.fa-instagram{color:#4e433c}.btn-social i.fa-linkedin{color:#4875b4}.btn-social i.fa-pinterest{color:#cb2027}.btn-social i.fa-rss{color:#fa9b39}.btn-social i.fa-tumblr{color:#2c4762}.btn-social i.fa-twitter{color:#55acee}.btn-social i.fa-vimeo{color:#1ab7ea}.btn-social i.fa-youtube{color:#f33}.btn-social:hover{color:#fff !important}.btn-social.facebook:hover{background:#3b5998;border-color:#3b5998}.btn-social.facebook:hover i.fa-facebook{color:#fff}.btn-social.facebook:hover i.fa-flickr{color:#fff}.btn-social.facebook:hover i.fa-foursquare{color:#fff}.btn-social.facebook:hover i.fa-google-plus{color:#fff}.btn-social.facebook:hover i.fa-instagram{color:#fff}.btn-social.facebook:hover i.fa-linkedin{color:#fff}.btn-social.facebook:hover i.fa-pinterest{color:#fff}.btn-social.facebook:hover i.fa-rss{color:#fff}.btn-social.facebook:hover i.fa-tumblr{color:#fff}.btn-social.facebook:hover i.fa-twitter{color:#fff}.btn-social.facebook:hover i.fa-vimeo{color:#fff}.btn-social.facebook:hover i.fa-youtube{color:#fff}.btn-social.flickr:hover{background:#ff0084;border-color:#ff0084}.btn-social.flickr:hover i.fa-facebook{color:#fff}.btn-social.flickr:hover i.fa-flickr{color:#fff}.btn-social.flickr:hover i.fa-foursquare{color:#fff}.btn-social.flickr:hover i.fa-google-plus{color:#fff}.btn-social.flickr:hover i.fa-instagram{color:#fff}.btn-social.flickr:hover i.fa-linkedin{color:#fff}.btn-social.flickr:hover i.fa-pinterest{color:#fff}.btn-social.flickr:hover i.fa-rss{color:#fff}.btn-social.flickr:hover i.fa-tumblr{color:#fff}.btn-social.flickr:hover i.fa-twitter{color:#fff}.btn-social.flickr:hover i.fa-vimeo{color:#fff}.btn-social.flickr:hover i.fa-youtube{color:#fff}.btn-social.foursquare:hover{background:#0cbadf;border-color:#0cbadf}.btn-social.foursquare:hover i.fa-facebook{color:#fff}.btn-social.foursquare:hover i.fa-flickr{color:#fff}.btn-social.foursquare:hover i.fa-foursquare{color:#fff}.btn-social.foursquare:hover i.fa-google-plus{color:#fff}.btn-social.foursquare:hover i.fa-instagram{color:#fff}.btn-social.foursquare:hover i.fa-linkedin{color:#fff}.btn-social.foursquare:hover i.fa-pinterest{color:#fff}.btn-social.foursquare:hover i.fa-rss{color:#fff}.btn-social.foursquare:hover i.fa-tumblr{color:#fff}.btn-social.foursquare:hover i.fa-twitter{color:#fff}.btn-social.foursquare:hover i.fa-vimeo{color:#fff}.btn-social.foursquare:hover i.fa-youtube{color:#fff}.btn-social.google-plus:hover{background:#dd4b39;border-color:#dd4b39}.btn-social.google-plus:hover i.fa-facebook{color:#fff}.btn-social.google-plus:hover i.fa-flickr{color:#fff}.btn-social.google-plus:hover i.fa-foursquare{color:#fff}.btn-social.google-plus:hover i.fa-google-plus{color:#fff}.btn-social.google-plus:hover i.fa-instagram{color:#fff}.btn-social.google-plus:hover i.fa-linkedin{color:#fff}.btn-social.google-plus:hover i.fa-pinterest{color:#fff}.btn-social.google-plus:hover i.fa-rss{color:#fff}.btn-social.google-plus:hover i.fa-tumblr{color:#fff}.btn-social.google-plus:hover i.fa-twitter{color:#fff}.btn-social.google-plus:hover i.fa-vimeo{color:#fff}.btn-social.google-plus:hover i.fa-youtube{color:#fff}.btn-social.instagram:hover{background:#4e433c;border-color:#4e433c}.btn-social.instagram:hover i.fa-facebook{color:#fff}.btn-social.instagram:hover i.fa-flickr{color:#fff}.btn-social.instagram:hover i.fa-foursquare{color:#fff}.btn-social.instagram:hover i.fa-google-plus{color:#fff}.btn-social.instagram:hover i.fa-instagram{color:#fff}.btn-social.instagram:hover i.fa-linkedin{color:#fff}.btn-social.instagram:hover i.fa-pinterest{color:#fff}.btn-social.instagram:hover i.fa-rss{color:#fff}.btn-social.instagram:hover i.fa-tumblr{color:#fff}.btn-social.instagram:hover i.fa-twitter{color:#fff}.btn-social.instagram:hover i.fa-vimeo{color:#fff}.btn-social.instagram:hover i.fa-youtube{color:#fff}.btn-social.linkedin:hover{background:#4875b4;border-color:#4875b4}.btn-social.linkedin:hover i.fa-facebook{color:#fff}.btn-social.linkedin:hover i.fa-flickr{color:#fff}.btn-social.linkedin:hover i.fa-foursquare{color:#fff}.btn-social.linkedin:hover i.fa-google-plus{color:#fff}.btn-social.linkedin:hover i.fa-instagram{color:#fff}.btn-social.linkedin:hover i.fa-linkedin{color:#fff}.btn-social.linkedin:hover i.fa-pinterest{color:#fff}.btn-social.linkedin:hover i.fa-rss{color:#fff}.btn-social.linkedin:hover i.fa-tumblr{color:#fff}.btn-social.linkedin:hover i.fa-twitter{color:#fff}.btn-social.linkedin:hover i.fa-vimeo{color:#fff}.btn-social.linkedin:hover i.fa-youtube{color:#fff}.btn-social.pinterest:hover{background:#cb2027;border-color:#cb2027}.btn-social.pinterest:hover i.fa-facebook{color:#fff}.btn-social.pinterest:hover i.fa-flickr{color:#fff}.btn-social.pinterest:hover i.fa-foursquare{color:#fff}.btn-social.pinterest:hover i.fa-google-plus{color:#fff}.btn-social.pinterest:hover i.fa-instagram{color:#fff}.btn-social.pinterest:hover i.fa-linkedin{color:#fff}.btn-social.pinterest:hover i.fa-pinterest{color:#fff}.btn-social.pinterest:hover i.fa-rss{color:#fff}.btn-social.pinterest:hover i.fa-tumblr{color:#fff}.btn-social.pinterest:hover i.fa-twitter{color:#fff}.btn-social.pinterest:hover i.fa-vimeo{color:#fff}.btn-social.pinterest:hover i.fa-youtube{color:#fff}.btn-social.rss:hover{background:#fa9b39;border-color:#fa9b39}.btn-social.rss:hover i.fa-facebook{color:#fff}.btn-social.rss:hover i.fa-flickr{color:#fff}.btn-social.rss:hover i.fa-foursquare{color:#fff}.btn-social.rss:hover i.fa-google-plus{color:#fff}.btn-social.rss:hover i.fa-instagram{color:#fff}.btn-social.rss:hover i.fa-linkedin{color:#fff}.btn-social.rss:hover i.fa-pinterest{color:#fff}.btn-social.rss:hover i.fa-rss{color:#fff}.btn-social.rss:hover i.fa-tumblr{color:#fff}.btn-social.rss:hover i.fa-twitter{color:#fff}.btn-social.rss:hover i.fa-vimeo{color:#fff}.btn-social.rss:hover i.fa-youtube{color:#fff}.btn-social.tumblr:hover{background:#2c4762;border-color:#2c4762}.btn-social.tumblr:hover i.fa-facebook{color:#fff}.btn-social.tumblr:hover i.fa-flickr{color:#fff}.btn-social.tumblr:hover i.fa-foursquare{color:#fff}.btn-social.tumblr:hover i.fa-google-plus{color:#fff}.btn-social.tumblr:hover i.fa-instagram{color:#fff}.btn-social.tumblr:hover i.fa-linkedin{color:#fff}.btn-social.tumblr:hover i.fa-pinterest{color:#fff}.btn-social.tumblr:hover i.fa-rss{color:#fff}.btn-social.tumblr:hover i.fa-tumblr{color:#fff}.btn-social.tumblr:hover i.fa-twitter{color:#fff}.btn-social.tumblr:hover i.fa-vimeo{color:#fff}.btn-social.tumblr:hover i.fa-youtube{color:#fff}.btn-social.twitter:hover{background:#55acee;border-color:#55acee}.btn-social.twitter:hover i.fa-facebook{color:#fff}.btn-social.twitter:hover i.fa-flickr{color:#fff}.btn-social.twitter:hover i.fa-foursquare{color:#fff}.btn-social.twitter:hover i.fa-google-plus{color:#fff}.btn-social.twitter:hover i.fa-instagram{color:#fff}.btn-social.twitter:hover i.fa-linkedin{color:#fff}.btn-social.twitter:hover i.fa-pinterest{color:#fff}.btn-social.twitter:hover i.fa-rss{color:#fff}.btn-social.twitter:hover i.fa-tumblr{color:#fff}.btn-social.twitter:hover i.fa-twitter{color:#fff}.btn-social.twitter:hover i.fa-vimeo{color:#fff}.btn-social.twitter:hover i.fa-youtube{color:#fff}.btn-social.vimeo:hover{background:#1ab7ea;border-color:#1ab7ea}.btn-social.vimeo:hover i.fa-facebook{color:#fff}.btn-social.vimeo:hover i.fa-flickr{color:#fff}.btn-social.vimeo:hover i.fa-foursquare{color:#fff}.btn-social.vimeo:hover i.fa-google-plus{color:#fff}.btn-social.vimeo:hover i.fa-instagram{color:#fff}.btn-social.vimeo:hover i.fa-linkedin{color:#fff}.btn-social.vimeo:hover i.fa-pinterest{color:#fff}.btn-social.vimeo:hover i.fa-rss{color:#fff}.btn-social.vimeo:hover i.fa-tumblr{color:#fff}.btn-social.vimeo:hover i.fa-twitter{color:#fff}.btn-social.vimeo:hover i.fa-vimeo{color:#fff}.btn-social.vimeo:hover i.fa-youtube{color:#fff}.btn-social.youtube:hover{background:#f33;border-color:#f33}.btn-social.youtube:hover i.fa-facebook{color:#fff}.btn-social.youtube:hover i.fa-flickr{color:#fff}.btn-social.youtube:hover i.fa-foursquare{color:#fff}.btn-social.youtube:hover i.fa-google-plus{color:#fff}.btn-social.youtube:hover i.fa-instagram{color:#fff}.btn-social.youtube:hover i.fa-linkedin{color:#fff}.btn-social.youtube:hover i.fa-pinterest{color:#fff}.btn-social.youtube:hover i.fa-rss{color:#fff}.btn-social.youtube:hover i.fa-tumblr{color:#fff}.btn-social.youtube:hover i.fa-twitter{color:#fff}.btn-social.youtube:hover i.fa-vimeo{color:#fff}.btn-social.youtube:hover i.fa-youtube{color:#fff}.badge{display:inline-block;background:#000;border-radius:2em;color:#fff;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:12px;font-size:.75rem;line-height:2;margin-bottom:0;font-weight:600;line-height:1;padding:.25em 1em;text-align:center}.badge.inverse{background:#fff;color:#313130}.badge.info{background:#3498db;color:#fff}.badge.danger{background:#e74c3c;color:#fff}.badge.warning{background:#f1c40f;color:#000}.badge.success{background:#2ecc71;color:#000}.bullets{overflow:auto}@media screen and (min-width: 62.5em){.bullets .two-col-bullet{float:left;display:block;margin-right:2.3576515979%;width:48.821174201%}.bullets .two-col-bullet:last-child{margin-right:0}.bullets .two-col-bullet:nth-child(2n){margin-right:0}.bullets .two-col-bullet:nth-child(2n+1){clear:left}}@media screen and (min-width: 62.5em){.bullets .three-col-bullet{float:left;display:block;margin-right:2.3576515979%;width:31.7615656014%}.bullets .three-col-bullet:last-child{margin-right:0}.bullets .three-col-bullet:nth-child(3n){margin-right:0}.bullets .three-col-bullet:nth-child(3n+1){clear:left}}@media screen and (min-width: 62.5em){.bullets .four-col-bullet{float:left;display:block;margin-right:2.3576515979%;width:23.2317613015%}.bullets .four-col-bullet:last-child{margin-right:0}.bullets .four-col-bullet:nth-child(4n){margin-right:0}.bullets .four-col-bullet:nth-child(4n+1){clear:left}}.bullets .bullet-icon{float:left;background:#343434;padding:1.058950258em;border-radius:50%;width:5.29475129em;height:5.29475129em}.bullets .bullet-content{margin-left:5.9301214448em;margin-bottom:2em}.bullets h2{margin-top:0;font-size:20px;font-size:1.25rem;line-height:1.2;margin-bottom:0;display:inline-block}.bullets p{font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:24px;margin-bottom:1.5rem}.sliding-menu-button{position:fixed;top:1.618em;right:1.618em;display:block;width:60px;height:60px;background:#000;outline:0;padding:0;border:2.5px solid transparent;cursor:pointer;z-index:5;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transition:right 500ms cubic-bezier(0.645, 0.045, 0.355, 1);-moz-transition:right 500ms cubic-bezier(0.645, 0.045, 0.355, 1);transition:right 500ms cubic-bezier(0.645, 0.045, 0.355, 1)}@media screen and (min-width: 48em){.sliding-menu-button{-webkit-transform:0;-moz-transform:0;-ms-transform:0;-o-transform:0;transform:0}}.sliding-menu-button.slide{-webkit-transition:right 500ms ease-in-out;-moz-transition:right 500ms ease-in-out;transition:right 500ms ease-in-out}@media screen and (min-width: 48em){.sliding-menu-button.slide{right:90%}}.sliding-menu-content{position:fixed;top:0;right:0;padding:1.375em 0;text-align:center;visibility:hidden;height:100%;width:100%;-webkit-transform:translateX(100%);-moz-transform:translateX(100%);-ms-transform:translateX(100%);-o-transform:translateX(100%);transform:translateX(100%);-webkit-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);-moz-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);background:#000;z-index:5;overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch}@media screen and (min-width: 48em){.sliding-menu-content{text-align:left}}@media screen and (min-width: 48em){.sliding-menu-content{height:100%;width:87%}}.sliding-menu-content.is-visible{visibility:visible;-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0);-webkit-transition:500ms ease-in-out;-moz-transition:500ms ease-in-out;transition:500ms ease-in-out}.sliding-menu-content ul{margin:0 10%}.sliding-menu-content ul,.sliding-menu-content li{list-style:none}.sliding-menu-content li{display:block;position:relative;padding:1em 0}.sliding-menu-content .menu-item>li a{color:#fff;text-decoration:none}.sliding-menu-content .menu-item>li .teaser{width:150px;border:2px solid #fff;margin-bottom:.809em}@media screen and (min-width: 48em){.sliding-menu-content .menu-item>li .teaser{position:absolute;top:20px;left:0;margin-bottom:0}}.sliding-menu-content .menu-item>li .title{display:block;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:32px;font-size:2rem;line-height:1.5;margin-bottom:0;font-weight:700}@media screen and (min-width: 48em){.sliding-menu-content .menu-item>li .title{margin-left:170px}}.sliding-menu-content .menu-item>li .excerpt{color:#fff;margin-top:0}@media screen and (min-width: 48em){.sliding-menu-content .menu-item>li .excerpt{margin-left:170px}}.sliding-menu-content .sub-menu-item>li a{display:block;color:#fff;font-style:italic}.sliding-menu-content .menu-item .home a{font-size:32px;font-size:2rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}.menu-screen{position:fixed;top:0px;right:0px;bottom:0px;left:0px;-webkit-transition:all 0.15s ease-out 0s;-moz-transition:all 0.15s ease-out 0s;transition:all 0.15s ease-out 0s;background:#000;opacity:0;visibility:hidden;z-index:4}.menu-screen.is-visible{opacity:.4;visibility:visible}.menu-screen.is-visible:hover{cursor:pointer}.menulines{display:inline-block;width:30px;height:4.2857142857px;background:#fff;border-radius:2.1428571429px;transition:.3s;position:relative}.menulines:before,.menulines:after{display:inline-block;width:30px;height:4.2857142857px;background:#fff;border-radius:2.1428571429px;transition:.3s;position:absolute;left:0;content:'';-webkit-transform-origin:2.1428571429px center;transform-origin:2.1428571429px center}.menulines:before{top:7.5px}.menulines:after{top:-7.5px}.menulines-button:hover .menulines:before{top:8.5714285714px}.menulines-button:hover .menulines:after{top:-8.5714285714px}.menulines-button.arrow.close .menulines:before,.menulines-button.arrow.close .menulines:after{top:0;width:16.6666666667px}.menulines-button.arrow.close .menulines:before{-webkit-transform:rotate3d(0, 0, 1, 40deg);transform:rotate3d(0, 0, 1, 40deg)}.menulines-button.arrow.close .menulines:after{-webkit-transform:rotate3d(0, 0, 1, -40deg);transform:rotate3d(0, 0, 1, -40deg)}.menulines-button.arrow-up.close{-webkit-transform:scale3d(0.8, 0.8, 0.8) rotate3d(0, 0, 1, 90deg);transform:scale3d(0.8, 0.8, 0.8) rotate3d(0, 0, 1, 90deg)}.menulines-button.minus.close .lines:before,.menulines-button.minus.close .lines:after{-webkit-transform:none;transform:none;top:0;width:30px}.menulines-button.x.close .menulines{background:transparent}.menulines-button.x.close .menulines:before,.menulines-button.x.close .menulines:after{-webkit-transform-origin:50% 50%;transform-origin:50% 50%;top:0;width:30px}.menulines-button.x.close .menulines:before{-webkit-transform:rotate3d(0, 0, 1, 45deg);transform:rotate3d(0, 0, 1, 45deg)}.menulines-button.x.close .menulines:after{-webkit-transform:rotate3d(0, 0, 1, -45deg);transform:rotate3d(0, 0, 1, -45deg)}.menulines-button.x2 .menulines{transition:background .3s .5s ease}.menulines-button.x2 .menulines:before,.menulines-button.x2 .menulines:after{-webkit-transform-origin:50% 50%;transform-origin:50% 50%;transition:top .3s .6s ease, -webkit-transform .3s ease;transition:top .3s .6s ease, transform .3s ease}.menulines-button.x2.close .menulines{transition:background .3s 0s ease;background:transparent}.menulines-button.x2.close .menulines:before,.menulines-button.x2.close .menulines:after{transition:top .3s ease, -webkit-transform .3s .5s ease;transition:top .3s ease, transform .3s .5s ease;top:0;width:30px}.menulines-button.x2.close .menulines:before{-webkit-transform:rotate3d(0, 0, 1, 45deg);transform:rotate3d(0, 0, 1, 45deg)}.menulines-button.x2.close .menulines:after{-webkit-transform:rotate3d(0, 0, 1, -45deg);transform:rotate3d(0, 0, 1, -45deg)}.notice{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#000;border-radius:3px}.notice a{color:#fff;border-bottom:1px dotted #fff}.notice-inverse{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#fff;border-radius:3px;color:#313130}.notice-inverse a{color:#fff;border-bottom:1px dotted #fff}.notice-inverse a{color:#313130}.notice-info{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#3498db;border-radius:3px}.notice-info a{color:#fff;border-bottom:1px dotted #fff}.notice-warning{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#f1c40f;border-radius:3px}.notice-warning a{color:#fff;border-bottom:1px dotted #fff}.notice-success{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#2ecc71;border-radius:3px}.notice-success a{color:#fff;border-bottom:1px dotted #fff}.notice-danger{position:relative;padding:1.5em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:39px;margin-bottom:2.4375rem;color:#fff;background-color:#e74c3c;border-radius:3px}.notice-danger a{color:#fff;border-bottom:1px dotted #fff}@-webkit-keyframes wiggle{25%, 50%, 75%, 100%{-webkit-transform-origin:top center}25%{-webkit-transform:rotate(8deg)}50%{-webkit-transform:rotate(-4deg)}75%{-webkit-transform:rotate(2deg)}100%{-webkit-transform:rotate(0deg)}}@-moz-keyframes wiggle{25%, 50%, 75%, 100%{-moz-transform-origin:top center}25%{-moz-transform:rotate(8deg)}50%{-moz-transform:rotate(-4deg)}75%{-moz-transform:rotate(2deg)}100%{-moz-transform:rotate(0deg)}}@keyframes wiggle{25%, 50%, 75%, 100%{-webkit-transform-origin:top center;-moz-transform-origin:top center;-ms-transform-origin:top center;-o-transform-origin:top center;transform-origin:top center}25%{-webkit-transform:rotate(8deg);-moz-transform:rotate(8deg);-ms-transform:rotate(8deg);-o-transform:rotate(8deg);transform:rotate(8deg)}50%{-webkit-transform:rotate(-4deg);-moz-transform:rotate(-4deg);-ms-transform:rotate(-4deg);-o-transform:rotate(-4deg);transform:rotate(-4deg)}75%{-webkit-transform:rotate(2deg);-moz-transform:rotate(2deg);-ms-transform:rotate(2deg);-o-transform:rotate(2deg);transform:rotate(2deg)}100%{-webkit-transform:rotate(0deg);-moz-transform:rotate(0deg);-ms-transform:rotate(0deg);-o-transform:rotate(0deg);transform:rotate(0deg)}}@-webkit-keyframes pop{50%{-webkit-transform:scale(1.1)}100%{-webkit-transform:scale(1)}}@-moz-keyframes pop{50%{-moz-transform:scale(1.1)}100%{-moz-transform:scale(1)}}@keyframes pop{50%{-webkit-transform:scale(1.1);-moz-transform:scale(1.1);-ms-transform:scale(1.1);-o-transform:scale(1.1);transform:scale(1.1)}100%{-webkit-transform:scale(1);-moz-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}}@-webkit-keyframes hang{50%{-webkit-transform:translateY(-3px)}100%{-webkit-transform:translateY(-6px)}}@-moz-keyframes hang{50%{-moz-transform:translateY(-3px)}100%{-moz-transform:translateY(-6px)}}@keyframes hang{50%{-webkit-transform:translateY(-3px);-moz-transform:translateY(-3px);-ms-transform:translateY(-3px);-o-transform:translateY(-3px);transform:translateY(-3px)}100%{-webkit-transform:translateY(-6px);-moz-transform:translateY(-6px);-ms-transform:translateY(-6px);-o-transform:translateY(-6px);transform:translateY(-6px)}}.hang{display:inline-block;-webkit-animation-name:hang;-moz-animation-name:hang;animation-name:hang;-webkit-animation-duration:0.5s;-moz-animation-duration:0.5s;animation-duration:0.5s;-webkit-animation-timing-function:linear;-moz-animation-timing-function:linear;animation-timing-function:linear;-webkit-animation-iteration-count:infinite;-moz-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-direction:alternate;-moz-animation-direction:alternate;animation-direction:alternate}#masthead{padding:1.618em;z-index:5;-webkit-transform:translate(0, 0);-moz-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0);-webkit-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);-moz-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1)}#masthead.slide{-webkit-transform:translate(-1600px, 0);-moz-transform:translate(-1600px, 0);-ms-transform:translate(-1600px, 0);-o-transform:translate(-1600px, 0);transform:translate(-1600px, 0)}#masthead .inner-wrap{max-width:68em;margin-left:auto;margin-right:auto}#masthead .inner-wrap:after{content:"";display:table;clear:both}.site-title{display:block;padding:15px 0;height:60px;text-decoration:none;color:#000;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-weight:700;font-size:20px;font-size:1.25rem;line-height:1.2;margin-bottom:0;line-height:30px;text-transform:uppercase}.site-title:after{content:"";display:table;clear:both}@media screen and (min-width: 62.5em){.site-title{float:left;display:block;margin-right:2.3576515979%;width:31.7615656014%}.site-title:last-child{margin-right:0}}.menu li{float:left}@media screen and (min-width: 48em){.menu li:last-child a{margin-right:0}}.menu li a{position:relative;display:block;margin-right:1.618em;padding:15px 0 15px;height:60px;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}.menu li a:before,.menu li a:after{content:'';display:block;position:absolute;top:0;left:0;height:2px;-webkit-transition:width 0.3s;-moz-transition:width 0.3s;transition:width 0.3s}.menu li a:before{width:100%;background:transparent}.menu li a:after{width:0;background:#000}.menu li a:active:after,.menu li a:hover:after{width:100%}.top-menu{display:none;position:relative}@media screen and (min-width: 48em){.top-menu{float:left;display:block;margin-right:2.3576515979%;width:100%}.top-menu:last-child{margin-right:0}}@media screen and (min-width: 62.5em){.top-menu{float:left;display:block;margin-right:2.3576515979%;width:57.3509785009%}.top-menu:last-child{margin-right:0}.top-menu ul{position:absolute;right:0}}.top-menu .home,.top-menu .sub-menu-item{display:none}.top-menu li a{font-weight:700;font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:0;line-height:30px;color:#000;text-transform:uppercase}.bottom-menu{font-weight:700}.bottom-menu:after{content:"";display:table;clear:both}.bottom-menu a{color:#999}#page-wrapper{padding:0 1.618em;height:100%;width:100%;-webkit-overflow-scrolling:touch;z-index:2;-webkit-transform:translate(0, 0);-moz-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0);-webkit-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);-moz-transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1);transition:500ms cubic-bezier(0.645, 0.045, 0.355, 1)}#page-wrapper.slide{-webkit-transform:translate(-60rem, 0);-moz-transform:translate(-60rem, 0);-ms-transform:translate(-60rem, 0);-o-transform:translate(-60rem, 0);transform:translate(-60rem, 0)}.upgrade{text-align:center}.upgrade a{text-decoration:none}@media screen and (min-width: 48em){#main .inner-wrap{float:left;display:block;margin-right:2.3576515979%;width:100%}#main .inner-wrap:last-child{margin-right:0}}@media screen and (min-width: 48em){#main .toc{display:block}#main .toc:after{content:"";display:table;clear:both}}@media screen and (min-width: 62.5em){#main .toc{float:right;display:block;margin-left:3.1684356888%;width:19.7578833532%}#main .toc:last-child{margin-left:0}}#main .page-title{width:100%}@media screen and (min-width: 48em){.page-content{display:block}.page-content:after{content:"";display:table;clear:both}}@media screen and (min-width: 62.5em){.page-content{float:right;display:block;margin-left:3.1684356888%;width:77.073680958%}.page-content:last-child{margin-left:0}}.page-content>p:first-child{font-size:20px;font-size:1.25rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}.page-content a{text-decoration:none}.page-content p>a,.page-content li>a{border-bottom:1px dotted #a2a2a2}.page-content p>a:hover,.page-content li>a:hover{border-bottom-style:solid}.page-content p>a.reversefootnote{border-bottom-width:0}.page-content .page-footer,.page-content .pagination{width:100%}.page-content .page-meta p{font-size:14px;font-size:.875rem;line-height:1.7142857143;margin-bottom:0;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;color:#999}.archive-wrap{width:100%}.archive-wrap .page-content{width:100%}#main .ads{position:relative;text-align:center;margin-top:1.618em;margin-left:-1.618em;margin-right:-1.618em;padding:10px 0 20px;background:#eaeaea}@media screen and (min-width: 48em){#main .ads{float:left;display:block;margin-right:2.3576515979%;width:23.2317613015%;margin-left:0;margin-right:0}#main .ads:last-child{margin-right:0}}#main .ads:after{content:'Advertisement';position:absolute;bottom:0;width:100%;text-align:center;display:block;font-size:9px;font-size:.5625rem;line-height:2.6666666667;margin-bottom:0;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}#main .ads ins{border-width:0}.page-lead{background-position:center top;background-repeat:no-repeat;background-attachment:fixed;text-align:center;color:#fff}@media screen and (min-width: 62.5em){.page-lead{background-size:cover}}.page-lead-content{padding:1em}@media screen and (min-width: 48em){.page-lead-content{padding:2em}}@media screen and (min-width: 62.5em){.page-lead-content{padding:3em}}.page-lead-content h1{font-size:48px;font-size:3rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem}@media screen and (min-width: 48em){.page-lead-content h1{font-size:60px;font-size:3.75rem;line-height:1.2;margin-bottom:24px;margin-bottom:1.5rem}}@media screen and (min-width: 62.5em){.page-lead-content h1{font-size:72px;font-size:4.5rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem}}.page-lead-content h2{font-size:20px;font-size:1.25rem;line-height:1.2;margin-bottom:24px;margin-bottom:1.5rem}@media screen and (min-width: 48em){.page-lead-content h2{font-size:24px;font-size:1.5rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem}}@media screen and (min-width: 62.5em){.page-lead-content h2{font-size:32px;font-size:2rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}}.page-feature{width:100%}.page-feature img{width:100%}.page-image{position:relative;margin-left:-1.618em;margin-right:-1.618em}.page-image .image-credit{position:absolute;bottom:0;right:0;margin:0 auto;padding:10px 15px;background-color:rgba(0,0,0,0.5);color:#fff;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-size:12px;font-size:.75rem;line-height:2;margin-bottom:0;text-align:right;z-index:10}.page-image .image-credit a{color:#fff;text-decoration:none}.breadcrumbs{display:block;margin-top:1.618em;font-size:10px;font-size:.625rem;line-height:2.4;margin-bottom:0}.breadcrumbs:after{content:"";display:table;clear:both}.breadcrumbs a{display:inline-block;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;font-weight:700;text-align:left;text-transform:uppercase}.toc{min-height:1px;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}.toc ul{margin-top:1.618em;border:1px solid #ddd;border-radius:3px}.toc li{font-size:12px;font-size:.75rem;line-height:1.3333333333;margin-bottom:0;border-bottom:1px solid #ddd}@media screen and (min-width: 15em) and (max-width: 30em){.toc li{font-size:16px;font-size:1rem;line-height:1.125;margin-bottom:0}}@media screen and (min-width: 30em) and (max-width: 47.9375em){.toc li{font-size:16px;font-size:1rem;line-height:1.125;margin-bottom:0}}.toc a{display:block;padding:.4045em .809em;border-left:2px solid transparent}.toc a:hover,.toc a:focus{background:#eaeaea}.tile{max-width:68em;margin-left:auto;margin-right:auto;margin-bottom:1.618em}.tile:after{content:"";display:table;clear:both}@media screen and (min-width: 15em) and (max-width: 30em){.tile{width:100%}}@media screen and (min-width: 30em) and (max-width: 47.9375em){.tile{float:left;display:block;margin-right:2.3576515979%;width:48.821174201%}.tile:last-child{margin-right:0}.tile:nth-child(2n){margin-right:0}.tile:nth-child(2n+1){clear:left}}@media screen and (min-width: 48em){.tile{float:left;display:block;margin-right:2.3576515979%;width:23.2317613015%}.tile:last-child{margin-right:0}.tile:nth-child(4n){margin-right:0}.tile:nth-child(4n+1){clear:left}}.tile .entry-date{font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:0;color:#71716f}.tile .post-title{font-size:18px;font-size:1.125rem;line-height:1.3333333333;margin-bottom:0}.tile .post-excerpt{font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}.tile .post-teaser{position:relative;display:block}.tile .post-teaser:after{content:'';position:absolute;width:100%;height:100%;top:0;left:0;background:rgba(52,52,52,0);pointer-events:none;-webkit-transition:background 0.3s;-moz-transition:background 0.3s;transition:background 0.3s}.tile .post-teaser:hover:after{background:rgba(52,52,52,0.2)}.footnotes{font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}.footnotes p,.footnotes li{font-size:12px;font-size:.75rem;line-height:2;margin-bottom:0}.footnotes:before{content:'Footnotes:';font-weight:700}.page-footer{position:relative}.author-image{position:absolute;left:0}.author-image img{width:80px;height:80px;border-radius:3px}.author-content{word-wrap:break-word;padding-left:100px;min-height:80px}.author-name{font-size:20px;font-size:1.25rem;line-height:1.2;margin-bottom:0}.author-bio{margin-top:0;font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem}#scroll-cue{position:fixed;bottom:100px;left:50%;width:60px;height:60px;text-align:center;cursor:pointer;color:#fff;font-size:12px;font-size:.75rem;line-height:2;margin-bottom:24px;margin-bottom:1.5rem;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif;text-decoration:none;text-transform:uppercase;text-shadow:0px 0px 10px rgba(0,0,0,0.5);letter-spacing:2px}@media screen and (max-height: 43.75em){#scroll-cue{bottom:0}}#site-footer{max-width:68em;margin-left:auto;margin-right:auto;margin-top:72px;margin-top:4.5rem;padding-bottom:1.618em;font-family:"Helvetica Neue","Segoe UI",Arial,sans-serif}#site-footer:after{content:"";display:table;clear:both}#site-footer .copyright{font-size:12px;font-size:.75rem;line-height:2;margin-bottom:24px;margin-bottom:1.5rem;color:#999}#site-footer .copyright a{color:#999;text-decoration:none}.linenos,.code{padding:0;border-top:0 solid transparent;border-bottom:0 solid transparent}.highlight{overflow-x:auto;font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:24px;margin-bottom:1.5rem;border:1px solid #dedede;border-radius:3px}.highlight pre{position:relative;margin:0;padding:1em}.highlight:hover{border:1px solid #c4c4c4}.highlighttable tr:hover>td,.highlighttable tr:hover>th{background:transparent}.hll{background-color:#ffc}.err{color:#a61717;background-color:#e3d2d2}.k{color:#000000;font-weight:bold}.o{color:#000000;font-weight:bold}.c{color:#999988;font-style:italic}.cm{color:#999988;font-style:italic}.cp{color:#999999;font-weight:bold;font-style:italic}.c1{color:#999988;font-style:italic}.cs{color:#999999;font-weight:bold;font-style:italic}.gd{color:#000000;background-color:#fdd}.ge{color:#000000;font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000000;background-color:#dfd}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:#aaa}.gt{color:#a00}.kc{color:#000000;font-weight:bold}.kd{color:#000000;font-weight:bold}.kn{color:#000000;font-weight:bold}.kp{color:#000000;font-weight:bold}.kr{color:#000000;font-weight:bold}.kt{color:#445588;font-weight:bold}.m{color:#099}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.il{color:#099}.s{color:#d01040}.sb{color:#d01040}.sc{color:#d01040}.sd{color:#d01040}.s2{color:#d01040}.se{color:#d01040}.sh{color:#d01040}.si{color:#d01040}.sx{color:#d01040}.sr{color:#009926}.s1{color:#d01040}.ss{color:#990073}.na{color:teal}.nb{color:#0086B3}.nc{color:#445588;font-weight:bold}.no{color:teal}.nd{color:#3c5d5d;font-weight:bold}.ni{color:purple}.ne{color:#990000;font-weight:bold}.nf{color:#990000;font-weight:bold}.nl{color:#990000;font-weight:bold}.nn{color:#555}.nt{color:navy}.bp{color:#999}.nv{color:teal}.vc{color:teal}.vg{color:teal}.vi{color:teal}.ow{color:#000000;font-weight:bold}.w{color:#bbb}
diff --git a/docs/css/site.css b/docs/css/site.css
index 32b7f61ebe7..80c7cc42fc4 100644
--- a/docs/css/site.css
+++ b/docs/css/site.css
@@ -1 +1 @@
-@import url("https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.css");body{color:#616161;font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;padding-top:50px}a{color:#3F51B5}a:hover,a:focus{color:#283593}a.disabled{color:#616161}a.external:after{content:'➚'}p{line-height:22px;margin:0 0 1em}footer{text-align:center}h1,h2,h3,h4,h5,h6{color:#000;opacity:0.54}h2,h3,h4,h5{margin-bottom:0.8em}#centerTextCol h2,#centerTextCol h3,#centerTextCol h4,#centerTextCol h5,#centerTextCol h6{padding-top:50px;margin-top:-16px}code{color:#283593;background-color:transparent;font-size:14px;padding:0}pre,pre.prettyprint{background-color:#E8EAF6;color:#000;border:none !important;font-size:14px !important;margin:0 0 1.2em;padding:9.5px !important}aside.note,div.note,p.note{background:#757575;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.note ::before,div.note ::before,p.note ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-note.svg");float:left;height:24px;margin-left:-48px;width:24px}aside.caution,div.caution,p.caution{background:#F4B400;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.caution ::before,div.caution ::before,p.caution ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-caution.svg");float:left;height:24px;margin-left:-48px;width:24px}aside.warning,div.warning,p.warning{background:#DD2C00;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.warning ::before,div.warning ::before,p.warning ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-warning.svg");float:left;height:24px;margin-left:-48px;width:24px}aside.special,div.special,p.special{background:#039BE5;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.special ::before,div.special ::before,p.special ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-special.svg");float:left;height:24px;margin-left:-48px;width:24px}aside.success,div.success,p.success{background:#0F9D58;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.success ::before,div.success ::before,p.success ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-success.svg");float:left;height:24px;margin-left:-48px;width:24px}.compare-no,.compare-yes{font-weight:bold}.compare-no::before{background:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/compare-no.svg")}.compare-yes::before{background:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/compare-yes.svg")}.compare-no::before,.compare-yes::before{content:'';display:inline-block;height:24px;margin:-4px 4px 0 0;overflow:hidden;vertical-align:middle;width:24px}#common-nav{margin-bottom:0px;background-color:#283593}#common-nav .logo{height:34px}#common-nav>div{max-width:100%}.inverse{background-color:#3F51B5;color:white}.inverse a{color:#E8EAF6}.inverse a:hover,.inverse a:focus{color:#283593}.inverse .inverse-light{background-color:#E8EAF6}.navbar-toggle .icon-bar{background-color:#E8EAF6}#home h2{color:#757575;opacity:1}#home h2 a{color:#757575;text-decoration:none}#home h2 a:hover{color:#3F51B5}#home>div.container{max-width:100%}.home-full-width{width:100%;padding-left:0;padding-right:0}.container .jumbotron{background:#283593;border-radius:0px 0px 6px 6px;color:#E8EAF6;text-align:center;width:100%}.page-title-bar{background-color:#E8EAF6;margin:50px 0px 0px;padding-bottom:10px;padding-top:15px}.page-title-bar h1,.page-title-bar h2,.page-title-bar h3,.page-title-bar h4,.page-title-bar h5,.page-title-bar h6{color:#3F51B5}.page-spacer{height:2em}#home-page-logo{margin:40px;max-width:calc(100% - 80px);text-align:center;height:228px}#home-page-text-only-logo{font-family:"Kavoon",serif;font-size:96px}.navbar-brand-text-only{line-height:50px}.navbar-brand-text-only .text-only-logo{font-family:"Kavoon",serif;font-size:24px}.navbar-brand-text-only :hover{color:#E8EAF6}.kavoon{font-family:"Kavoon",serif}.docs-side-nav{margin-top:40px}table{background:none repeat scroll 0 0 #FFF;border:1px solid #D0D0D0;border-bottom:1px solid #D0D0D0;border-collapse:collapse;border-spacing:0;text-align:left;width:100%;margin-bottom:2.125em}table thead{background:#757575}table thead tr th{color:#FFF;font-weight:500;text-align:left}table tr th{color:#FFF;font-weight:500;text-align:left}table tbody td{vertical-align:top}table tr td,table tr th{padding:0.625em}table tfoot,table tr:nth-of-type(2n){background:none repeat scroll 0 0 #F6F6F6}table tbody{background:none repeat scroll 0 0 #FFF}tbody th,tbody td{border-right:1px solid #E0E0E0}table.responsive tr:not(.alt) td td:first-child,table.responsive td tr:not(.alt) td:first-child{vertical-align:top}table.responsive table.responsive{margin:0}table.responsive tr:first-child{border-top:0}table.responsive td tr:first-child td{padding-top:0}table.responsive td tr:last-child td{padding-bottom:0}table.responsive td td:first-child{padding-left:0}table.responsive th:not(:first-child){display:none}#api-method-summary tr td.api-method-summary-group{background:#F6F6F6}#api-method-summary tr{background:#FFF}br.bigbreak{line-height:2em}div.indent-details{padding-left:1.6250em}#toc{border-left:solid 3px #3F51B5;padding-left:12px}#toc ol,#toc ul{font-size:13px;list-style:none;margin:0;padding-left:0;padding-right:0}#toc ol ol,#toc ol ul,#toc ul ol,#toc ul ul{padding-left:25px;list-style:circle}#toc li{margin-bottom:0}#toc-contents-header{font-size:13px}ol ol,ol ul,ul ol,ul ul{margin:0.8em 0em}ol ol li,ol ul li,ul ol li,ul ul li{margin:0}li{line-height:22px;margin-bottom:0.5em}.icon-bar{background-color:#FFF}#left-nav{overflow-x:hidden;overflow-y:auto}#sidebar>li>h4.no-top-margin{margin-top:0}#sidebar>li>h4{font-size:16px;margin-top:0.8em}.nav>li>h4.no-top-margin{margin-top:0}#sidebar>li>a{padding:6px 15px 6px 0px}#sidebar li a{font-size:13px}#sidebar li ul li,#sidebar li ol li{padding-bottom:5px}#sidebar li.submenu ul{display:none}#sidebar li.submenu ul li.submenu-parent{padding-bottom:0}#sidebar li.submenu ul li.submenu-parent ul{display:block;list-style-type:none;margin:0.4em 0 0 0}#sidebar.affix-top{max-height:calc(100vh - 172px)}#sidebar.affix,#sidebar.affix-top{max-width:170px}@media (min-width: 992px){#sidebar.affix,#sidebar.affix-top{width:228px}}@media (min-width: 1200px){#sidebar.affix,#tocSidebar.affix{position:fixed;top:70px;bottom:0px;overflow-x:hidden;overflow-y:auto}}@media (min-width: 992px){#sidebar.affix,#tocSidebar.affix{position:fixed;top:70px;bottom:0px;overflow-x:hidden;overflow-y:auto}}h4.arrow-d,h4.arrow-r{cursor:pointer}h4.arrow-r::before{content:"+ ";font-family:monospace;font-weight:bold}h4.arrow-d::before{content:"- ";font-family:monospace;font-weight:bold}#search-form{padding:4px 6px;width:100%}#masthead{background-color:#E8EAF6;margin-bottom:40px;min-height:105px}#masthead h1{color:#3F51B5;font-size:36px;opacity:1;padding:18px}@media (min-width: 768px){#masthead h1{font-size:40px}}.navbar-brand{padding:7px 15px}.nav>li{margin-bottom:0}.nav li.active-item{font-weight:bold;text-decoration:none}.nav li.active-item ul,.nav li.active-item ol{font-weight:normal}.nav-stacked>li+li{margin-top:0}.nav ol,.nav ul{list-style:none;padding-left:1.5em}.affix-top,.affix{position:static}@media (min-width: 1200px){body .home-full-width{max-width:100%}#toc>ul>li>a{display:inline-block;padding-left:10px;text-indent:-10px}}@media (min-width: 992px){#sidebar.affix-top,#tocSidebar.affix-top{position:static}}@media (min-width: 768px){body .home-full-width{width:100%;margin:0px}#sidebar.affix{position:fixed;top:70px;bottom:0px;overflow-x:hidden;overflow-y:auto}}#leftCol{float:left;overflow-x:hidden;overflow-y:auto}@media screen and (max-width: 991px){#leftCol{max-width:200px}}@media screen and (max-width: 767px){#leftCol{display:none}}@media screen and (max-width: 1199px){#centerCol{z-index:1}}@media screen and (max-width: 991px){#centerCol{margin-left:calc(25% + 15px);z-index:1}}@media screen and (max-width: 767px){#centerCol{margin-left:0}}#rightCol{float:right;overflow-x:hidden;overflow-y:auto;padding-right:0px;position:static;z-index:10000}#rightCol li.active>a{color:#6A1B9A;font-weight:bold}@media (min-width: 1200px){#rightCol #tocSidebar.affix,#rightCol #tocSidebar.affix-top{max-width:210px}}@media screen and (max-width: 1199px){#rightCol{margin:0}}@media screen and (max-width: 991px){#rightCol{float:none;margin:12px 0 30px calc(25% + 15px);max-width:255px}}@media screen and (max-width: 767px){#rightCol{margin:12px 0 30px}}main .fa{color:#3F51B5}#mobile-left-nav-menu-button{display:none;background-color:transparent;background-image:url("/images/left-nav-menu-expander.svg");border:0;height:24px;margin-left:10px;min-width:24px}@media screen and (max-width: 767px){#mobile-left-nav-menu-button{display:block}}#collapsed-left-menu{display:none}#collapsed-left-menu h4{color:#E8EAF6}#collapsed-left-menu #collapsed-left-menu-repo-link{font-size:18px;margin-left:0.25em}@media screen and (max-width: 767px){#collapsed-left-menu{display:block;margin-top:1em}}@media screen and (max-width: 991px){.main-site-content{padding:0 24px}}@media screen and (max-width: 767px){.main-site-content{padding:0 16px}}@media screen and (max-width: 1199px){#toc-content-row{position:relative;z-index:1}}@media screen and (max-width: 991px){table.responsive,table.responsive thead,table.responsive tbody,table.responsive tr,table.responsive th,table.responsive td{display:block}}@media screen and (max-width: 767px){#standard-menu-links{display:none}}.reset-box-sizing,.reset-box-sizing *,.reset-box-sizing *:before,.reset-box-sizing *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;border:none;margin:0px;padding:0px}.gsc-table-result td{padding-left:8px}
+@import url("https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.css");body{color:#616161;font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;padding-top:50px}a{color:#296589}a:hover,a:focus{color:#183B4F}a.disabled{color:#616161}a.external:after{content:'➚'}p{line-height:22px;margin:0 0 1em}footer{text-align:center}h1,h2,h3,h4,h5,h6{color:#000;opacity:0.54}h2,h3,h4,h5{margin-bottom:0.8em}#centerTextCol h2,#centerTextCol h3,#centerTextCol h4,#centerTextCol h5,#centerTextCol h6{padding-top:50px;margin-top:-16px}code{color:#183B4F;background-color:transparent;font-size:14px;padding:0}pre,pre.prettyprint{background-color:#E0F7FA;color:#000;border:none !important;font-size:14px !important;margin:0 0 1.2em;padding:9.5px !important}aside.note,div.note,p.note{background:#757575;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.note ::before,div.note ::before,p.note ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-note.svg");float:left;height:24px;margin-left:-48px;width:24px}aside.caution,div.caution,p.caution{background:#F4B400;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.caution ::before,div.caution ::before,p.caution ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-caution.svg");float:left;height:24px;margin-left:-48px;width:24px}aside.warning,div.warning,p.warning{background:#DD2C00;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.warning ::before,div.warning ::before,p.warning ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-warning.svg");float:left;height:24px;margin-left:-48px;width:24px}aside.special,div.special,p.special{background:#039BE5;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.special ::before,div.special ::before,p.special ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-special.svg");float:left;height:24px;margin-left:-48px;width:24px}aside.success,div.success,p.success{background:#0F9D58;color:#FFF;display:block;margin:16px 0;padding:24px 24px 24px 72px}aside.success ::before,div.success ::before,p.success ::before{content:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/aside-success.svg");float:left;height:24px;margin-left:-48px;width:24px}.compare-no,.compare-yes{font-weight:bold}.compare-no::before{background:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/compare-no.svg")}.compare-yes::before{background:url("https://developers.google.com/_static/d0cc006813/images/redesign-14/compare-yes.svg")}.compare-no::before,.compare-yes::before{content:'';display:inline-block;height:24px;margin:-4px 4px 0 0;overflow:hidden;vertical-align:middle;width:24px}#common-nav{margin-bottom:0px;background-color:#183B4F}#common-nav .logo{height:34px}#common-nav>div{max-width:100%}.inverse{background-color:#296589;color:white}.inverse a{color:#E0F7FA}.inverse a:hover,.inverse a:focus{color:#183B4F}.inverse .inverse-light{background-color:#E0F7FA}.navbar-toggle .icon-bar{background-color:#E0F7FA}#home h2{color:#757575;opacity:1}#home h2 a{color:#757575;text-decoration:none}#home h2 a:hover{color:#296589}#home>div.container{max-width:100%}.home-full-width{width:100%;padding-left:0;padding-right:0}.container .jumbotron{background:#183B4F;border-radius:0px 0px 6px 6px;color:#E0F7FA;text-align:center;width:100%}.page-title-bar{background-color:#E0F7FA;margin:50px 0px 0px;padding-bottom:10px;padding-top:15px}.page-title-bar h1,.page-title-bar h2,.page-title-bar h3,.page-title-bar h4,.page-title-bar h5,.page-title-bar h6{color:#296589}.page-spacer{height:2em}#home-page-logo{margin:40px;max-width:calc(100% - 80px);text-align:center;height:228px}#home-page-text-only-logo{font-family:"Kavoon",serif;font-size:96px}.navbar-brand-text-only{line-height:50px}.navbar-brand-text-only .text-only-logo{font-family:"Kavoon",serif;font-size:24px}.navbar-brand-text-only :hover{color:#E0F7FA}.kavoon{font-family:"Kavoon",serif}.docs-side-nav{margin-top:40px}.logo-row{margin-top:10px;text-align:center}table{background:none repeat scroll 0 0 #FFF;border:1px solid #D0D0D0;border-bottom:1px solid #D0D0D0;border-collapse:collapse;border-spacing:0;text-align:left;width:100%;margin-bottom:2.125em}table thead{background:#757575}table thead tr th{color:#FFF;font-weight:500;text-align:left}table tr th{color:#FFF;font-weight:500;text-align:left}table tbody td{vertical-align:top}table tr td,table tr th{padding:0.625em}table tfoot,table tr:nth-of-type(2n){background:none repeat scroll 0 0 #F6F6F6}table tbody{background:none repeat scroll 0 0 #FFF}tbody th,tbody td{border-right:1px solid #E0E0E0}table.responsive tr:not(.alt) td td:first-child,table.responsive td tr:not(.alt) td:first-child{vertical-align:top}table.responsive table.responsive{margin:0}table.responsive tr:first-child{border-top:0}table.responsive td tr:first-child td{padding-top:0}table.responsive td tr:last-child td{padding-bottom:0}table.responsive td td:first-child{padding-left:0}table.responsive th:not(:first-child){display:none}#api-method-summary tr td.api-method-summary-group{background:#F6F6F6}#api-method-summary tr{background:#FFF}br.bigbreak{line-height:2em}div.indent-details{padding-left:1.6250em}#toc{border-left:solid 3px #296589;padding-left:12px}#toc ol,#toc ul{font-size:13px;list-style:none;margin:0;padding-left:0;padding-right:0}#toc ol ol,#toc ol ul,#toc ul ol,#toc ul ul{padding-left:25px;list-style:circle}#toc li{margin-bottom:0}#toc-contents-header{font-size:13px}ol ol,ol ul,ul ol,ul ul{margin:0.8em 0em}ol ol li,ol ul li,ul ol li,ul ul li{margin:0}li{line-height:22px;margin-bottom:0.5em}.icon-bar{background-color:#FFF}#left-nav{overflow-x:hidden;overflow-y:auto}#sidebar>li>h4.no-top-margin{margin-top:0}#sidebar>li>h4{font-size:16px;margin-top:0.8em}.nav>li>h4.no-top-margin{margin-top:0}#sidebar>li>a{padding:6px 15px 6px 0px}#sidebar li a{font-size:13px}#sidebar li ul li,#sidebar li ol li{padding-bottom:5px}#sidebar li.submenu ul{display:none}#sidebar li.submenu ul li.submenu-parent{padding-bottom:0}#sidebar li.submenu ul li.submenu-parent ul{display:block;list-style-type:none;margin:0.4em 0 0 0}#sidebar.affix-top{max-height:calc(100vh - 172px)}#sidebar.affix,#sidebar.affix-top{max-width:170px}@media (min-width: 992px){#sidebar.affix,#sidebar.affix-top{width:228px}}@media (min-width: 1200px){#sidebar.affix,#tocSidebar.affix{position:fixed;top:70px;bottom:0px;overflow-x:hidden;overflow-y:auto}}@media (min-width: 992px){#sidebar.affix,#tocSidebar.affix{position:fixed;top:70px;bottom:0px;overflow-x:hidden;overflow-y:auto}}h4.arrow-d,h4.arrow-r{cursor:pointer}h4.arrow-r::before{content:"+ ";font-family:monospace;font-weight:bold}h4.arrow-d::before{content:"- ";font-family:monospace;font-weight:bold}#search-form{padding:4px 6px;width:100%}#masthead{background-color:#E0F7FA;margin-bottom:40px;min-height:105px}#masthead h1{color:#296589;font-size:36px;opacity:1;padding:18px}@media (min-width: 768px){#masthead h1{font-size:40px}}.navbar-brand{padding:7px 15px}.nav>li{margin-bottom:0}.nav li.active-item{font-weight:bold;text-decoration:none}.nav li.active-item ul,.nav li.active-item ol{font-weight:normal}.nav-stacked>li+li{margin-top:0}.nav ol,.nav ul{list-style:none;padding-left:1.5em}.affix-top,.affix{position:static}@media (min-width: 1200px){body .home-full-width{max-width:100%}#toc>ul>li>a{display:inline-block;padding-left:10px;text-indent:-10px}}@media (min-width: 992px){#sidebar.affix-top,#tocSidebar.affix-top{position:static}}@media (min-width: 768px){body .home-full-width{width:100%;margin:0px}#sidebar.affix{position:fixed;top:70px;bottom:0px;overflow-x:hidden;overflow-y:auto}}#leftCol{float:left;overflow-x:hidden;overflow-y:auto}@media screen and (max-width: 991px){#leftCol{max-width:200px}}@media screen and (max-width: 767px){#leftCol{display:none}}@media screen and (max-width: 1199px){#centerCol{z-index:1}}@media screen and (max-width: 991px){#centerCol{margin-left:calc(25% + 15px);z-index:1}}@media screen and (max-width: 767px){#centerCol{margin-left:0}}#rightCol{float:right;overflow-x:hidden;overflow-y:auto;padding-right:0px;position:static;z-index:10000}#rightCol li.active>a{color:#6A1B9A;font-weight:bold}@media (min-width: 1200px){#rightCol #tocSidebar.affix,#rightCol #tocSidebar.affix-top{max-width:210px}}@media screen and (max-width: 1199px){#rightCol{margin:0}}@media screen and (max-width: 991px){#rightCol{float:none;margin:12px 0 30px calc(25% + 15px);max-width:255px}}@media screen and (max-width: 767px){#rightCol{margin:12px 0 30px}}main .fa{color:#296589}#mobile-left-nav-menu-button{display:none;background-color:transparent;background-image:url("/images/left-nav-menu-expander.svg");border:0;height:24px;margin-left:10px;min-width:24px}@media screen and (max-width: 767px){#mobile-left-nav-menu-button{display:block}}#collapsed-left-menu{display:none}#collapsed-left-menu h4{color:#E0F7FA}#collapsed-left-menu #collapsed-left-menu-repo-link{font-size:18px;margin-left:0.25em}@media screen and (max-width: 767px){#collapsed-left-menu{display:block;margin-top:1em}}@media screen and (max-width: 991px){.main-site-content{padding:0 24px}}@media screen and (max-width: 767px){.main-site-content{padding:0 16px}}@media screen and (max-width: 1199px){#toc-content-row{position:relative;z-index:1}}@media screen and (max-width: 991px){table.responsive,table.responsive thead,table.responsive tbody,table.responsive tr,table.responsive th,table.responsive td{display:block}}@media screen and (max-width: 767px){#standard-menu-links{display:none}}.reset-box-sizing,.reset-box-sizing *,.reset-box-sizing *:before,.reset-box-sizing *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;border:none;margin:0px;padding:0px}.gsc-table-result td{padding-left:8px}
diff --git a/docs/getting-started/docker-build.html b/docs/getting-started/docker-build.html
index 5ce6b92fa68..547ed6ca21e 100644
--- a/docs/getting-started/docker-build.html
+++ b/docs/getting-started/docker-build.html
@@ -1,420 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Custom Docker Build</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Custom Docker Build"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Custom Docker Build</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>By default, the <a href="https://github.com/youtube/vitess/tree/master/examples/kubernetes">Kubernetes configs</a>
-point to the <code class="prettyprint">vitess/lite</code> image on <a href="https://hub.docker.com/u/vitess/">Docker Hub</a>.</p>
-
-<p>We created the <code class="prettyprint">lite</code> image as a stripped down version of our main image <code class="prettyprint">base</code> such that Kubernetes pods can start faster.
-The <code class="prettyprint">lite</code> image does not change very often and is updated manually by the Vitess team with every release.
-In contrast, the <code class="prettyprint">base</code> image is updated automatically after every push to the GitHub master branch.
-For more information on the different images we provide, please read the <a href="https://github.com/youtube/vitess/tree/master/docker"><code class="prettyprint">docker/README.md</code> file</a>.</p>
-
-<p>If your goal is run the latest Vitess code, the simplest solution is to use the bigger <code class="prettyprint">base</code> image instead of <code class="prettyprint">lite</code>.</p>
-
-<p>Another alternative is to customize our Docker images and build them yourselves.
-This is described below and involves building the <code class="prettyprint">base</code> image first.
-Then you can run our build script for the <code class="prettyprint">lite</code> image which extracts the Vitess binaries from the built <code class="prettyprint">base</code> image.</p>
-
-<ol>
-<li><p>Install <a href="https://www.docker.com/">Docker</a> on your workstation.</p>
-
-<p>Our scripts also assume you can run the <code class="prettyprint">docker</code> command without <code class="prettyprint">sudo</code>,
-which you can do by <a href="https://docs.docker.com/engine/installation/linux/ubuntulinux/#create-a-docker-group">setting up a docker group</a>.</p></li>
-<li><p>Create an account on <a href="https://docs.docker.com/docker-hub/">Docker Hub</a> and
-then <code class="prettyprint">docker login</code> to it.</p></li>
-<li><p>Go to your <code class="prettyprint">github.com/youtube/vitess</code> directory.</p></li>
-<li><p>Usually, you won&#39;t need to <a href="https://github.com/youtube/vitess/blob/master/docker/bootstrap/README.md">build your own bootstrap image</a>
-unless you edit <a href="https://github.com/youtube/vitess/blob/master/bootstrap.sh">bootstrap.sh</a>
-or <a href="https://github.com/youtube/vitess/blob/master/vendor/vendor.json">vendor.json</a>,
-for example to add new dependencies. If you do need it then build the
-bootstrap image, otherwise pull the image using one of the following
-commands depending on the MySQL flavor you want:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess<span class="nv">$ </span>docker pull vitess/bootstrap:mysql57   <span class="c"># MySQL Community Edition 5.7</span>
-vitess<span class="nv">$ </span>docker pull vitess/bootstrap:mysql56   <span class="c"># MySQL Community Edition 5.6</span>
-vitess<span class="nv">$ </span>docker pull vitess/bootstrap:percona57 <span class="c"># Percona Server 5.7</span>
-vitess<span class="nv">$ </span>docker pull vitess/bootstrap:percona   <span class="c"># Percona Server</span>
-vitess<span class="nv">$ </span>docker pull vitess/bootstrap:mariadb   <span class="c"># MariaDB</span>
-</code></pre></div>
-<p><strong>Note:</strong> If you have already downloaded the <code class="prettyprint">vitess/bootstrap:&lt;flavor&gt;</code>
-image on your machine before then it could be old, which may cause build
-failures. So it would be a good idea to always execute this step.</p></li>
-<li><p>Build the <code class="prettyprint">vitess/base[:&lt;flavor&gt;]</code> image.
-It will include the compiled the Vitess binaries.
-(<code class="prettyprint">vitess/base</code> also contains the source code and tests i.e. everything needed for development work.)</p>
-
-<p>Choose one of the following commands (the command without suffix builds
-the default image containing MySQL 5.7):</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess<span class="nv">$ </span>make docker_base
-vitess<span class="nv">$ </span>make docker_base_mysql56
-vitess<span class="nv">$ </span>make docker_base_percona57
-vitess<span class="nv">$ </span>make docker_base_percona
-vitess<span class="nv">$ </span>make docker_base_mariadb
-</code></pre></div></li>
-<li><p>Build the <code class="prettyprint">vitess/lite[:&lt;flavor&gt;]</code> image.
-This will run a script that extracts from <code class="prettyprint">vitess/base</code> only the files
-needed to run Vitess.</p>
-
-<p>Choose one of the following commands (the command without suffix builds
-the default image containing MySQL 5.7):</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess<span class="nv">$ </span>make docker_lite
-vitess<span class="nv">$ </span>make docker_lite_mysql56
-vitess<span class="nv">$ </span>make docker_lite_percona57
-vitess<span class="nv">$ </span>make docker_lite_percona
-vitess<span class="nv">$ </span>make docker_lite_mariadb
-</code></pre></div></li>
-<li><p>Re-tag the image under your personal repository, then upload it.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess<span class="nv">$ </span>docker tag -f vitess/lite yourname/vitess
-vitess<span class="nv">$ </span>docker push yourname/vitess
-</code></pre></div>
-<p><strong>Note:</strong> If you chose a non-default flavor above, then change <code class="prettyprint">vitess/lite</code> in
-the above command to <code class="prettyprint">vitess/lite:&lt;flavor&gt;</code>.</p></li>
-<li><p>Change the Kubernetes configs to point to your personal repository:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>sed -i -e <span class="s1">&#39;s,image: vitess/lite,image: yourname/vitess:latest,&#39;</span> *.yaml
-</code></pre></div>
-<p>Adding the <code class="prettyprint">:latest</code> label at the end of the image name tells Kubernetes
-to check for a newer image every time a pod is launched.
-When you push a new version of your image, any new pods will use it
-automatically without you having to clear the Kubernetes image cache.</p>
-
-<p>Once you&#39;ve stabilized your image, you&#39;ll probably want to replace <code class="prettyprint">:latest</code>
-with a specific label that you change each time you make a new build,
-so you can control when pods update.</p></li>
-<li><p>Launch <a href="http://vitess.io/getting-started/">Vitess on Kubernetes</a> as usual.</p></li>
-</ol>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/getting-started/docker-build/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/getting-started/docker-build/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/getting-started/docker-build/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/getting-started/docker-build/"</script>
 </html>
diff --git a/docs/getting-started/docker-build/index.html b/docs/getting-started/docker-build/index.html
new file mode 100644
index 00000000000..bf9b31f6896
--- /dev/null
+++ b/docs/getting-started/docker-build/index.html
@@ -0,0 +1,429 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Custom Docker Build | Vitess</title>
+<meta property="og:title" content="Custom Docker Build" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Build a custom Docker image for Vitess." />
+<meta property="og:description" content="Build a custom Docker image for Vitess." />
+<link rel="canonical" href="http://vitess.io/getting-started/docker-build/" />
+<meta property="og:url" content="http://vitess.io/getting-started/docker-build/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Build a custom Docker image for Vitess.","url":"http://vitess.io/getting-started/docker-build/","headline":"Custom Docker Build","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Custom Docker Build</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>By default, the <a href="https://github.com/youtube/vitess/tree/master/examples/kubernetes">Kubernetes configs</a>
+point to the <code class="prettyprint">vitess/lite</code> image on <a href="https://hub.docker.com/u/vitess/">Docker Hub</a>.</p>
+
+<p>We created the <code class="prettyprint">lite</code> image as a stripped down version of our main image <code class="prettyprint">base</code> such that Kubernetes pods can start faster.
+The <code class="prettyprint">lite</code> image does not change very often and is updated manually by the Vitess team with every release.
+In contrast, the <code class="prettyprint">base</code> image is updated automatically after every push to the GitHub master branch.
+For more information on the different images we provide, please read the <a href="https://github.com/youtube/vitess/tree/master/docker"><code class="prettyprint">docker/README.md</code> file</a>.</p>
+
+<p>If your goal is run the latest Vitess code, the simplest solution is to use the bigger <code class="prettyprint">base</code> image instead of <code class="prettyprint">lite</code>.</p>
+
+<p>Another alternative is to customize our Docker images and build them yourselves.
+This is described below and involves building the <code class="prettyprint">base</code> image first.
+Then you can run our build script for the <code class="prettyprint">lite</code> image which extracts the Vitess binaries from the built <code class="prettyprint">base</code> image.</p>
+
+<ol>
+<li><p>Install <a href="https://www.docker.com/">Docker</a> on your workstation.</p>
+
+<p>Our scripts also assume you can run the <code class="prettyprint">docker</code> command without <code class="prettyprint">sudo</code>,
+which you can do by <a href="https://docs.docker.com/engine/installation/linux/ubuntulinux/#create-a-docker-group">setting up a docker group</a>.</p></li>
+<li><p>Create an account on <a href="https://docs.docker.com/docker-hub/">Docker Hub</a> and
+then <code class="prettyprint">docker login</code> to it.</p></li>
+<li><p>Go to your <code class="prettyprint">github.com/youtube/vitess</code> directory.</p></li>
+<li><p>Usually, you won&#39;t need to <a href="https://github.com/youtube/vitess/blob/master/docker/bootstrap/README.md">build your own bootstrap image</a>
+unless you edit <a href="https://github.com/youtube/vitess/blob/master/bootstrap.sh">bootstrap.sh</a>
+or <a href="https://github.com/youtube/vitess/blob/master/vendor/vendor.json">vendor.json</a>,
+for example to add new dependencies. If you do need it then build the
+bootstrap image, otherwise pull the image using one of the following
+commands depending on the MySQL flavor you want:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess<span class="nv">$ </span>docker pull vitess/bootstrap:mysql57   <span class="c"># MySQL Community Edition 5.7</span>
+vitess<span class="nv">$ </span>docker pull vitess/bootstrap:mysql56   <span class="c"># MySQL Community Edition 5.6</span>
+vitess<span class="nv">$ </span>docker pull vitess/bootstrap:percona57 <span class="c"># Percona Server 5.7</span>
+vitess<span class="nv">$ </span>docker pull vitess/bootstrap:percona   <span class="c"># Percona Server</span>
+vitess<span class="nv">$ </span>docker pull vitess/bootstrap:mariadb   <span class="c"># MariaDB</span>
+</code></pre></div>
+<p><strong>Note:</strong> If you have already downloaded the <code class="prettyprint">vitess/bootstrap:&lt;flavor&gt;</code>
+image on your machine before then it could be old, which may cause build
+failures. So it would be a good idea to always execute this step.</p></li>
+<li><p>Build the <code class="prettyprint">vitess/base[:&lt;flavor&gt;]</code> image.
+It will include the compiled the Vitess binaries.
+(<code class="prettyprint">vitess/base</code> also contains the source code and tests i.e. everything needed for development work.)</p>
+
+<p>Choose one of the following commands (the command without suffix builds
+the default image containing MySQL 5.7):</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess<span class="nv">$ </span>make docker_base
+vitess<span class="nv">$ </span>make docker_base_mysql56
+vitess<span class="nv">$ </span>make docker_base_percona57
+vitess<span class="nv">$ </span>make docker_base_percona
+vitess<span class="nv">$ </span>make docker_base_mariadb
+</code></pre></div></li>
+<li><p>Build the <code class="prettyprint">vitess/lite[:&lt;flavor&gt;]</code> image.
+This will run a script that extracts from <code class="prettyprint">vitess/base</code> only the files
+needed to run Vitess.</p>
+
+<p>Choose one of the following commands (the command without suffix builds
+the default image containing MySQL 5.7):</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess<span class="nv">$ </span>make docker_lite
+vitess<span class="nv">$ </span>make docker_lite_mysql56
+vitess<span class="nv">$ </span>make docker_lite_percona57
+vitess<span class="nv">$ </span>make docker_lite_percona
+vitess<span class="nv">$ </span>make docker_lite_mariadb
+</code></pre></div></li>
+<li><p>Re-tag the image under your personal repository, then upload it.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess<span class="nv">$ </span>docker tag -f vitess/lite yourname/vitess
+vitess<span class="nv">$ </span>docker push yourname/vitess
+</code></pre></div>
+<p><strong>Note:</strong> If you chose a non-default flavor above, then change <code class="prettyprint">vitess/lite</code> in
+the above command to <code class="prettyprint">vitess/lite:&lt;flavor&gt;</code>.</p></li>
+<li><p>Change the Kubernetes configs to point to your personal repository:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>sed -i -e <span class="s1">&#39;s,image: vitess/lite,image: yourname/vitess:latest,&#39;</span> *.yaml
+</code></pre></div>
+<p>Adding the <code class="prettyprint">:latest</code> label at the end of the image name tells Kubernetes
+to check for a newer image every time a pod is launched.
+When you push a new version of your image, any new pods will use it
+automatically without you having to clear the Kubernetes image cache.</p>
+
+<p>Once you&#39;ve stabilized your image, you&#39;ll probably want to replace <code class="prettyprint">:latest</code>
+with a specific label that you change each time you make a new build,
+so you can control when pods update.</p></li>
+<li><p>Launch <a href="/getting-started/">Vitess on Kubernetes</a> as usual.</p></li>
+</ol>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/getting-started/index.html b/docs/getting-started/index.html
index 20b7be8fb7a..c07239d08b7 100644
--- a/docs/getting-started/index.html
+++ b/docs/getting-started/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Running Vitess on Kubernetes</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Running Vitess on Kubernetes"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Running Vitess on Kubernetes | Vitess</title>
+<meta property="og:title" content="Running Vitess on Kubernetes" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess runs best in a containerized environment like Kubernetes, which manages a cluster of Linux containers as a single system." />
+<meta property="og:description" content="Vitess runs best in a containerized environment like Kubernetes, which manages a cluster of Linux containers as a single system." />
+<link rel="canonical" href="http://vitess.io/getting-started/" />
+<meta property="og:url" content="http://vitess.io/getting-started/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess runs best in a containerized environment like Kubernetes, which manages a cluster of Linux containers as a single system.","url":"http://vitess.io/getting-started/","headline":"Running Vitess on Kubernetes","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Running Vitess on Kubernetes</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -319,13 +328,13 @@ <h4 class="arrow-r">Internal</h4>
 
 <h2 id="prerequisites">Prerequisites</h2>
 
-<p>To complete the exercise in this guide, you must locally install Go 1.8+,
+<p>To complete the exercise in this guide, you must locally install Go 1.9+,
 Vitess&#39; <code class="prettyprint">vtctlclient</code> tool, and Google Cloud SDK. The
 following sections explain how to set these up in your environment.</p>
 
-<h3 id="install-go-1-8">Install Go 1.8+</h3>
+<h3 id="install-go-1-9">Install Go 1.9+</h3>
 
-<p>You need to install <a href="http://golang.org/doc/install">Go 1.8+</a> to build the
+<p>You need to install <a href="http://golang.org/doc/install">Go 1.9+</a> to build the
 <code class="prettyprint">vtctlclient</code> tool, which issues commands to Vitess.</p>
 
 <p>After installing Go, make sure your <code class="prettyprint">GOPATH</code> environment
@@ -430,7 +439,7 @@ <h2 id="start-a-container-engine-cluster">Start a Container Engine cluster</h2>
 <span class="c"># kubeconfig entry generated for example.</span>
 </code></pre></div>
 <p><strong>Note:</strong> The <code class="prettyprint">--scopes storage-rw</code> argument is necessary to allow
-<a href="http://vitess.io/user-guide/backup-and-restore.html">built-in backup/restore</a>
+<a href="/user-guide/backup-and-restore/">built-in backup/restore</a>
 to access <a href="https://cloud.google.com/storage/">Google Cloud Storage</a>.</p></li>
 <li><p>Create a Cloud Storage bucket:</p>
 
@@ -458,7 +467,7 @@ <h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
 used to customize your cluster settings.</p>
 
 <p>Currently, we have out-of-the-box support for storing
-<a href="http://vitess.io/user-guide/backup-and-restore.html">backups</a> in
+<a href="/user-guide/backup-and-restore/">backups</a> in
 <a href="https://cloud.google.com/storage/">Google Cloud Storage</a>. If you&#39;re using
 GCS, fill in the fields requested by the configure script, including the
 name of the bucket you created above.</p>
@@ -481,7 +490,7 @@ <h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
 if you have any specific plugin requests.</p></li>
 <li><p><strong>Start an etcd cluster</strong></p>
 
-<p>The Vitess <a href="http://vitess.io/overview/concepts.html#topology-service">topology service</a>
+<p>The Vitess <a href="/overview/concepts/#topology-service">topology service</a>
 stores coordination data for all the servers in a Vitess cluster.
 It can store this data in one of several consistent storage systems.
 In this example, we&#39;ll use <a href="https://github.com/coreos/etcd">etcd</a>.
@@ -497,9 +506,9 @@ <h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
 <span class="c"># ...</span>
 </code></pre></div>
 <p>This command creates two clusters. One is for the
-<a href="/user-guide/topology-service.html#global-vs-local">global cell</a>,
+<a href="/user-guide/topology-service/#global-vs-local">global cell</a>,
 and the other is for a
-<a href="http://vitess.io/overview/concepts.html#cell-data-center">local cell</a>
+<a href="/overview/concepts/#cell-data-center">local cell</a>
 called <em>test</em>. You can check the status of the
 <a href="http://kubernetes.io/v1.1/docs/user-guide/pods.html">pods</a>
 in the cluster by running:</p>
@@ -583,11 +592,11 @@ <h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
 <p>You can also use the <code class="prettyprint">help</code> command to get more details about each command:</p>
 <div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh <span class="nb">help </span>ListAllTablets
 </code></pre></div>
-<p>See the <a href="http://vitess.io/reference/vtctl.html">vtctl reference</a> for a
+<p>See the <a href="/reference/vtctl/">vtctl reference</a> for a
 web-formatted version of the <code class="prettyprint">vtctl help</code> output.</p></li>
 <li><p><strong>Start vttablets</strong></p>
 
-<p>A Vitess <a href="http://vitess.io/overview/concepts.html#tablet">tablet</a> is the
+<p>A Vitess <a href="/overview/concepts/#tablet">tablet</a> is the
 unit of scaling for the database. A tablet consists of the
 <code class="prettyprint">vttablet</code> and <code class="prettyprint">mysqld</code> processes, running on the same
 host. We enforce this coupling in Kubernetes by putting the respective
@@ -611,8 +620,8 @@ <h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
 <span class="c"># pod &quot;vttablet-104&quot; created</span>
 </code></pre></div>
 <p>In the vtctld web UI, you should soon see a
-<a href="http://vitess.io/overview/concepts.html#keyspace">keyspace</a> named <code class="prettyprint">test_keyspace</code>
-with a single <a href="http://vitess.io/overview/concepts.html#shard">shard</a> named <code class="prettyprint">0</code>.
+<a href="/overview/concepts/#keyspace">keyspace</a> named <code class="prettyprint">test_keyspace</code>
+with a single <a href="/overview/concepts/#shard">shard</a> named <code class="prettyprint">0</code>.
 Click on the shard name to see the list of tablets. When all 5 tablets
 show up on the shard status page, you&#39;re ready to continue. Note that it&#39;s
 normal for the tablets to be unhealthy at this point, since you haven&#39;t
@@ -663,7 +672,7 @@ <h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
 </code></pre></div>
 <p>The <strong>replica</strong> tablets are used for serving live web traffic, while the
 <strong>rdonly</strong> tablets are used for offline processing, such as batch jobs and backups.
-The amount of each <a href="http://vitess.io/overview/concepts.html#tablet">tablet type</a>
+The amount of each <a href="/overview/concepts/#tablet">tablet type</a>
 that you launch can be configured in the <code class="prettyprint">vttablet-up.sh</code> script.</p></li>
 <li><p><strong>Create a table</strong></p>
 
@@ -702,7 +711,7 @@ <h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
 <li><p><strong>Take a backup</strong></p>
 
 <p>Now that the initial schema is applied, it&#39;s a good time to take the first
-<a href="http://vitess.io/user-guide/backup-and-restore.html">backup</a>. This backup
+<a href="/user-guide/backup-and-restore/">backup</a>. This backup
 will be used to automatically restore any additional replicas that you run,
 before they connect themselves to the master and catch up on replication.
 If an existing tablet goes down and comes back up without its data, it will
@@ -728,7 +737,7 @@ <h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
 <p>(As it works, this command will not display any output.)</p></li>
 <li><p><strong>Start vtgate</strong></p>
 
-<p>Vitess uses <a href="http://vitess.io/overview/#vtgate">vtgate</a> to route each client
+<p>Vitess uses <a href="/overview/#vtgate">vtgate</a> to route each client
 query to the correct <code class="prettyprint">vttablet</code>. In Kubernetes, a <code class="prettyprint">vtgate</code> service
 distributes connections to a pool of <code class="prettyprint">vtgate</code> pods. The pods are curated by
 a <a href="http://kubernetes.io/v1.1/docs/user-guide/replication-controller.html">replication controller</a>.</p>
@@ -807,10 +816,10 @@ <h2 id="test-your-cluster-with-a-client-app">Test your cluster with a client app
 <h2 id="try-vitess-resharding">Try Vitess resharding</h2>
 
 <p>Now that you have a full Vitess stack running, you may want to go on to the
-<a href="http://vitess.io/user-guide/sharding-kubernetes.html">Sharding in Kubernetes workflow guide</a>
-or <a href="http://vitess.io/user-guide/sharding-kubernetes.html">Sharding in Kubernetes codelab</a>
+<a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes workflow guide</a>
+or <a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes codelab</a>
 (if you prefer to run each step manually through commands) to try out
-<a href="http://vitess.io/user-guide/sharding.html#resharding">dynamic resharding</a>.</p>
+<a href="/user-guide/sharding/#resharding">dynamic resharding</a>.</p>
 
 <p>If so, you can skip the tear-down since the sharding guide picks up right here.
 If not, continue to the clean-up steps below.</p>
diff --git a/docs/getting-started/local-instance.html b/docs/getting-started/local-instance.html
index d29512af3e2..08e88d371d4 100644
--- a/docs/getting-started/local-instance.html
+++ b/docs/getting-started/local-instance.html
@@ -1,877 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Running Vitess on a Local Server</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Running Vitess on a Local Server"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Running Vitess on a Local Server</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>You can build Vitess using either <a href="#docker-build">Docker</a> or a
-<a href="#manual-build">manual</a> build process.</p>
-
-<p>If you run into issues or have questions, please post on our
-<a href="https://groups.google.com/forum/#!forum/vitess">forum</a>.</p>
-
-<h2 id="docker-build">Docker Build</h2>
-
-<p>To run Vitess in Docker, you can either use our pre-built images on <a href="https://hub.docker.com/u/vitess/">Docker Hub</a>, or build them yourself.</p>
-
-<h3 id="docker-hub-images">Docker Hub Images</h3>
-
-<ul>
-<li><p>The <a href="https://hub.docker.com/r/vitess/base/">vitess/base</a> image contains a full
-development environment, capable of building Vitess and running integration tests.</p></li>
-<li><p>The <a href="https://hub.docker.com/r/vitess/lite/">vitess/lite</a> image contains only
-the compiled Vitess binaries, excluding ZooKeeper. It can run Vitess, but
-lacks the environment needed to build Vitess or run tests. It&#39;s primarily used
-for the <a href="http://vitess.io/getting-started/">Vitess on Kubernetes</a> guide.</p></li>
-</ul>
-
-<p>For example, you can directly run <code class="prettyprint">vitess/base</code>, and Docker will download the
-image for you:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>sudo docker run -ti vitess/base bash
-vitess@32f187ef9351:/vt/src/github.com/youtube/vitess<span class="nv">$ </span>make build
-</code></pre></div>
-<p>Now you can proceed to <a href="#start-a-vitess-cluster">start a Vitess cluster</a> inside
-the Docker container you just started. Note that if you want to access the
-servers from outside the container, you&#39;ll need to expose the ports as described
-in the <a href="https://docs.docker.com/engine/reference/run/#/expose-incoming-ports">Docker Engine Reference Guide</a>.</p>
-
-<p>For local testing, you can also access the servers on the local IP address
-created for the container by Docker:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>docker inspect 32f187ef9351 <span class="p">|</span> grep IPAddress
-<span class="c">### example output:</span>
-<span class="c">#    &quot;IPAddress&quot;: &quot;172.17.3.1&quot;,</span>
-</code></pre></div>
-<h3 id="custom-docker-image">Custom Docker Image</h3>
-
-<p>You can also build Vitess Docker images yourself to include your
-own patches or configuration data. The
-<a href="https://github.com/youtube/vitess/blob/master/Dockerfile">Dockerfile</a>
-in the root of the Vitess tree builds the <code class="prettyprint">vitess/base</code> image.
-The <a href="https://github.com/youtube/vitess/tree/master/docker">docker</a>
-subdirectory contains scripts for building other images, such as <code class="prettyprint">vitess/lite</code>.</p>
-
-<p>Our <code class="prettyprint">Makefile</code> also contains rules to build the images. For example:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Create vitess/bootstrap, which prepares everything up to ./bootstrap.sh</span>
-vitess<span class="nv">$ </span>make docker_bootstrap
-<span class="c"># Create vitess/base from vitess/bootstrap by copying in your local working directory.</span>
-vitess<span class="nv">$ </span>make docker_base
-</code></pre></div>
-<h2 id="manual-build">Manual Build</h2>
-
-<p>The following sections explain the process for manually building
-Vitess without Docker.</p>
-
-<h3 id="install-dependencies">Install Dependencies</h3>
-
-<p>We currently test Vitess regularly on Ubuntu 14.04 (Trusty) and Debian 8 (Jessie).
-OS X 10.11 (El Capitan) should work as well, the installation instructions are below.</p>
-
-<h4 id="ubuntu-and-debian">Ubuntu and Debian</h4>
-
-<p>In addition, Vitess requires the software and libraries listed below.</p>
-
-<ol>
-<li><p><a href="http://golang.org/doc/install">Install Go 1.8+</a>.</p></li>
-<li><p>Install <a href="https://downloads.mariadb.org/">MariaDB 10.0</a> or
-<a href="http://dev.mysql.com/downloads/mysql">MySQL 5.6</a>. You can use any
-installation method (src/bin/rpm/deb), but be sure to include the client
-development headers (<code class="prettyprint">libmariadbclient-dev</code> or <code class="prettyprint">libmysqlclient-dev</code>).</p>
-
-<p>The Vitess development team currently tests against MariaDB 10.0.21
-and MySQL 5.6.27.</p>
-
-<p>If you are installing MariaDB, note that you must install version 10.0 or
-higher. If you are using <code class="prettyprint">apt-get</code>, confirm that your repository
-offers an option to install that version. You can also download the source
-directly from <a href="https://downloads.mariadb.org/mariadb/">mariadb.org</a>.</p>
-
-<p>If you are using Ubuntu 14.04 with MySQL 5.6, the default install may be
-missing a file too, <code class="prettyprint">/usr/share/mysql/my-default.cnf</code>. It would show as an
-error like <code class="prettyprint">Could not find my-default.cnf</code>. If you run into this, just add
-it with the following contents:</p>
-<div class="highlight"><pre><code class="language-ini" data-lang="ini"><span class="k">[mysqld]</span>
-<span class="na">sql_mode</span><span class="o">=</span><span class="s">NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES</span>
-</code></pre></div></li>
-<li><p>Select a lock service from the options listed below. It is technically
-possible to use another lock server, but plugins currently exist only
-for ZooKeeper and etcd.</p>
-
-<ul>
-<li>ZooKeeper 3.3.5 is included by default. </li>
-<li><a href="https://github.com/coreos/etcd/releases">Install etcd v3.0+</a>.
-If you use etcd, remember to include the <code class="prettyprint">etcd</code> command
-on your path.</li>
-</ul></li>
-<li><p>Install the following other tools needed to build and run Vitess:</p>
-
-<ul>
-<li>make</li>
-<li>automake</li>
-<li>libtool</li>
-<li>python-dev</li>
-<li>python-virtualenv</li>
-<li>python-mysqldb</li>
-<li>libssl-dev</li>
-<li>g++</li>
-<li>git</li>
-<li>pkg-config</li>
-<li>bison</li>
-<li>curl</li>
-<li>unzip</li>
-</ul>
-
-<p>These can be installed with the following apt-get command:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>sudo apt-get install make automake libtool python-dev python-virtualenv python-mysqldb libssl-dev g++ git pkg-config bison curl unzip
-</code></pre></div></li>
-<li><p>If you decided to use ZooKeeper in step 3, you also need to install a
-Java Runtime, such as OpenJDK.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>sudo apt-get install openjdk-7-jre
-</code></pre></div></li>
-</ol>
-
-<h4 id="os-x">OS X</h4>
-
-<ol>
-<li><p><a href="http://brew.sh/">Install Homebrew</a>. If your /usr/local directory is not empty and you never used Homebrew before,
-it will be 
-<a href="https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/El_Capitan_and_Homebrew.md">mandatory</a> 
-to run the following command:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">sudo chown -R <span class="k">$(</span>whoami<span class="k">)</span>:admin /usr/local
-</code></pre></div></li>
-<li><p>On OS X, MySQL 5.6 has to be used, MariaDB doesn&#39;t work for some reason yet. It should be installed from Homebrew
-(install steps are below).</p></li>
-<li><p>If Xcode is installed (with Console tools, which should be bundled automatically since the 7.1 version), all 
-the dev dependencies should be satisfied in this step. If no Xcode is present, it is necessery to install pkg-config.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">brew install pkg-config
-</code></pre></div></li>
-<li><p>ZooKeeper is used as lock service.</p></li>
-<li><p>Run the following commands:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">brew install go automake libtool python git bison curl wget homebrew/versions/mysql56
-pip install --upgrade pip setuptools
-pip install virtualenv
-pip install MySQL-python
-pip install tox
-</code></pre></div></li>
-<li><p>Install Java runtime from this URL: <a href="https://support.apple.com/kb/dl1572?locale=en_US">https://support.apple.com/kb/dl1572?locale=en_US</a>
-Apple only supports Java 6. If you need to install a newer version, this link might be helpful:
-<a href="http://osxdaily.com/2015/10/17/how-to-install-java-in-os-x-el-capitan/">http://osxdaily.com/2015/10/17/how-to-install-java-in-os-x-el-capitan/</a></p></li>
-<li><p>The Vitess bootstrap script makes some checks for the go runtime, so it is recommended to have the following
-commands in your ~/.profile or ~/.bashrc or ~/.zshrc:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">PATH</span><span class="o">=</span>/usr/local/opt/go/libexec/bin:<span class="nv">$PATH</span>
-<span class="nb">export </span><span class="nv">GOROOT</span><span class="o">=</span>/usr/local/opt/go/libexec
-</code></pre></div></li>
-<li><p>There is a problem with installing the enum34 Python package using pip, so the following file has to be edited:
-<code class="prettyprint">
-/usr/local/opt/python/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/distutils.cfg
-</code></p>
-
-<p>and this line:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">prefix=/usr/local
-</code></pre></div>
-<p>has to be commented out:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text"># prefix=/usr/local
-</code></pre></div>
-<p>After running the ./bootstrap.sh script from the next step, you can revert the change.</p></li>
-<li><p>For the Vitess hostname resolving functions to work correctly, a new entry has to be added into the /etc/hosts file
-with the current LAN IP address of the computer (preferably IPv4) and the current hostname, which you get by
-typing the &#39;hostname&#39; command in the terminal.</p>
-
-<p>It is also a good idea to put the following line to <a href="https://golang.org/doc/go1.5#net">force the Go DNS resolver</a> 
-in your ~/.profile or ~/.bashrc or ~/.zshrc:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">export GODEBUG=netdns=go
-</code></pre></div></li>
-</ol>
-
-<h3 id="build-vitess">Build Vitess</h3>
-
-<ol>
-<li><p>Navigate to the directory where you want to download the Vitess
-source code and clone the Vitess Github repo. After doing so,
-navigate to the <code class="prettyprint">src/github.com/youtube/vitess</code> directory.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">cd</span> <span class="nv">$WORKSPACE</span>
-git clone https://github.com/youtube/vitess.git <span class="se">\</span>
-    src/github.com/youtube/vitess
-<span class="nb">cd </span>src/github.com/youtube/vitess
-</code></pre></div></li>
-<li><p>Set the <code class="prettyprint">MYSQL_FLAVOR</code> environment variable. Choose the appropriate
-value for your database. This value is case-sensitive.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">MYSQL_FLAVOR</span><span class="o">=</span>MariaDB
-<span class="c"># or (mandatory for OS X)</span>
-<span class="c"># export MYSQL_FLAVOR=MySQL56</span>
-</code></pre></div></li>
-<li><p>If your selected database installed in a location other than <code class="prettyprint">/usr/bin</code>,
-set the <code class="prettyprint">VT_MYSQL_ROOT</code> variable to the root directory of your
-MariaDB installation. For example, if MariaDB is installed in
-<code class="prettyprint">/usr/local/mysql</code>, run the following command.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">VT_MYSQL_ROOT</span><span class="o">=</span>/usr/local/mysql
-
-<span class="c"># on OS X, this is the correct value:</span>
-<span class="c"># export VT_MYSQL_ROOT=/usr/local/opt/mysql56</span>
-</code></pre></div>
-<p>Note that the command indicates that the <code class="prettyprint">mysql</code> executable should
-be found at <code class="prettyprint">/usr/local/mysql/bin/mysql</code>.</p></li>
-<li><p>Run <code class="prettyprint">mysql_config --version</code> and confirm that you
-are running the correct version of MariaDB or MySQL. The value should
-be 10 or higher for MariaDB and 5.6.x for MySQL.</p></li>
-<li><p>Build Vitess using the commands below. Note that the
-<code class="prettyprint">bootstrap.sh</code> script needs to download some dependencies.
-If your machine requires a proxy to access the Internet, you will need
-to set the usual environment variables (e.g. <code class="prettyprint">http_proxy</code>,
-<code class="prettyprint">https_proxy</code>, <code class="prettyprint">no_proxy</code>).</p>
-
-<p>Run the boostrap.sh script:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">./bootstrap.sh
-<span class="c">### example output:</span>
-<span class="c"># skipping zookeeper build</span>
-<span class="c"># go install golang.org/x/tools/cmd/cover ...</span>
-<span class="c"># Found MariaDB installation in ...</span>
-<span class="c"># creating git pre-commit hooks</span>
-<span class="c">#</span>
-<span class="c"># source dev.env in your shell before building</span>
-</code></pre></div><div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Remaining commands to build Vitess</span>
-. ./dev.env
-make build
-</code></pre></div></li>
-</ol>
-
-<h3 id="run-tests">Run Tests</h3>
-
-<p><strong>Note:</strong> If you are using etcd, set the following environment variable:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">VT_TEST_FLAGS</span><span class="o">=</span><span class="s1">&#39;--topo-server-flavor=etcd&#39;</span>
-</code></pre></div>
-<p>The default targets when running <code class="prettyprint">make</code> or <code class="prettyprint">make test</code> contain a full set of
-tests intended to help Vitess developers to verify code changes. Those tests
-simulate a small Vitess cluster by launching many servers on the local
-machine. To do so, they require a lot of resources; a minimum of 8GB RAM
-and SSD is recommended to run the tests.</p>
-
-<p>If you want only to check that Vitess is working in your environment,
-you can run a lighter set of tests:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">make site_test
-</code></pre></div>
-<h4 id="common-test-issues">Common Test Issues</h4>
-
-<p>Attempts to run the full developer test suite (<code class="prettyprint">make</code> or <code class="prettyprint">make test</code>)
-on an underpowered machine often results in failure. If you still see
-the same failures when running the lighter set of tests (<code class="prettyprint">make site_test</code>),
-please let the development team know in the
-<a href="https://groups.google.com/forum/#!forum/vitess">vitess@googlegroups.com</a>
-discussion forum.</p>
-
-<h5 id="node-already-exists-port-in-use-etc">Node already exists, port in use, etc.</h5>
-
-<p>A failed test can leave orphaned processes. If you use the default
-settings, you can use the following commands to identify and kill
-those processes:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">pgrep -f -l <span class="s1">&#39;(vtdataroot|VTDATAROOT)&#39;</span> <span class="c"># list Vitess processes</span>
-pkill -f <span class="s1">&#39;(vtdataroot|VTDATAROOT)&#39;</span> <span class="c"># kill Vitess processes</span>
-</code></pre></div>
-<h5 id="too-many-connections-to-mysql-or-other-timeouts">Too many connections to MySQL, or other timeouts</h5>
-
-<p>This error often means your disk is too slow. If you don&#39;t have access
-to an SSD, you can try <a href="https://github.com/youtube/vitess/blob/master/doc/TestingOnARamDisk.md">testing against a
-ramdisk</a>.</p>
-
-<h5 id="connection-refused-to-tablet-mysql-socket-not-found-etc">Connection refused to tablet, MySQL socket not found, etc.</h5>
-
-<p>These errors might indicate that the machine ran out of RAM and a server
-crashed when trying to allocate more RAM. Some of the heavier tests
-require up to 8GB RAM.</p>
-
-<h5 id="connection-refused-in-zkctl-test">Connection refused in zkctl test</h5>
-
-<p>This error might indicate that the machine does not have a Java Runtime
-installed, which is a requirement if you are using ZooKeeper as the lock server.</p>
-
-<h5 id="running-out-of-disk-space">Running out of disk space</h5>
-
-<p>Some of the larger tests use up to 4GB of temporary space on disk.</p>
-
-<h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
-
-<p>After completing the instructions above to <a href="#build-vitess">build Vitess</a>,
-you can use the example scripts in the Github repo to bring up a Vitess
-cluster on your local machine. These scripts use ZooKeeper as the
-lock service. ZooKeeper is included in the Vitess distribution.</p>
-
-<ol>
-<li><p><strong>Check system settings</strong></p>
-
-<p>Some Linux distributions ship with default file descriptor limits
-that are too low for database servers. This issue could show up
-as the database crashing with the message &quot;too many open files&quot;.</p>
-
-<p>Check the system-wide <code class="prettyprint">file-max</code> setting as well as user-specific
-<code class="prettyprint">ulimit</code> values. We recommend setting them above 100K to be safe.
-The exact <a href="http://www.cyberciti.biz/faq/linux-increase-the-maximum-number-of-open-files/">procedure</a>
- may vary depending on your Linux distribution.</p></li>
-<li><p><strong>Configure environment variables</strong></p>
-
-<p>If you are still in the same terminal window that
-you used to run the build commands, you can skip to the next
-step since the environment variables will already be set.</p>
-
-<p>If you&#39;re adapting this example to your own deployment, the only environment
-variables required before running the scripts are <code class="prettyprint">VTROOT</code> and <code class="prettyprint">VTDATAROOT</code>.</p>
-
-<p>Set <code class="prettyprint">VTROOT</code> to the parent of the Vitess source tree. For example, if you
-ran <code class="prettyprint">make build</code> while in <code class="prettyprint">$HOME/vt/src/github.com/youtube/vitess</code>,
-then you should set:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">VTROOT</span><span class="o">=</span><span class="nv">$HOME</span>/vt
-</code></pre></div>
-<p>Set <code class="prettyprint">VTDATAROOT</code> to the directory where you want data files and logs to
-be stored. For example:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">VTDATAROOT</span><span class="o">=</span><span class="nv">$HOME</span>/vtdataroot
-</code></pre></div></li>
-<li><p><strong>Start ZooKeeper</strong></p>
-
-<p>Servers in a Vitess cluster find each other by looking for
-dynamic configuration data stored in a distributed lock
-service. The following script creates a small ZooKeeper cluster:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span><span class="nb">cd</span> <span class="nv">$VTROOT</span>/src/github.com/youtube/vitess/examples/local
-vitess/examples/local<span class="nv">$ </span>./zk-up.sh
-<span class="c">### example output:</span>
-<span class="c"># Starting zk servers...</span>
-<span class="c"># Waiting for zk servers to be ready...</span>
-</code></pre></div>
-<p>After the ZooKeeper cluster is running, we only need to tell each
-Vitess process how to connect to ZooKeeper. Then, each process can
-find all of the other Vitess processes by coordinating via ZooKeeper.</p>
-
-<p>Each of our scripts automatically uses the <code class="prettyprint">TOPOLOGY_FLAGS</code> environment
-variable to point to the global ZooKeeper instance. The global instance in
-turn is configured to point to the local instance. In our sample scripts,
-they are both hosted in the same ZooKeeper service.</p></li>
-<li><p><strong>Start vtctld</strong></p>
-
-<p>The <em>vtctld</em> server provides a web interface that
-displays all of the coordination information stored in ZooKeeper.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./vtctld-up.sh
-<span class="c"># Starting vtctld</span>
-<span class="c"># Access vtctld web UI at http://localhost:15000</span>
-<span class="c"># Send commands with: vtctlclient -server localhost:15999 ...</span>
-</code></pre></div>
-<p>Open <code class="prettyprint">http://localhost:15000</code> to verify that
-<em>vtctld</em> is running. There won&#39;t be any information
-there yet, but the menu should come up, which indicates that
-<em>vtctld</em> is running.</p>
-
-<p>The <em>vtctld</em> server also accepts commands from the <code class="prettyprint">vtctlclient</code> tool,
-which is used to administer the cluster. Note that the port for RPCs
-(in this case <code class="prettyprint">15999</code>) is different from the web UI port (<code class="prettyprint">15000</code>).
-These ports can be configured with command-line flags, as demonstrated
-in <code class="prettyprint">vtctld-up.sh</code>.</p>
-
-<p>For convenience, we&#39;ll use the <code class="prettyprint">lvtctl.sh</code> script in example commands,
-to avoid having to type the <em>vtctld</em> address every time.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># List available commands</span>
-vitess/examples/local<span class="nv">$ </span>./lvtctl.sh <span class="nb">help</span>
-</code></pre></div></li>
-<li><p><strong>Start vttablets</strong></p>
-
-<p>The <code class="prettyprint">vttablet-up.sh</code> script brings up three vttablets, and assigns them to
-a <a href="http://vitess.io/overview/concepts.html#keyspace">keyspace</a> and <a href="http://vitess.io/overview/concepts.html#shard">shard</a> according to the variables
-set at the top of the script file.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./vttablet-up.sh
-<span class="c"># Output from vttablet-up.sh is below</span>
-<span class="c"># Starting MySQL for tablet test-0000000100...</span>
-<span class="c"># Starting vttablet for test-0000000100...</span>
-<span class="c"># Access tablet test-0000000100 at http://localhost:15100/debug/status</span>
-<span class="c"># Starting MySQL for tablet test-0000000101...</span>
-<span class="c"># Starting vttablet for test-0000000101...</span>
-<span class="c"># Access tablet test-0000000101 at http://localhost:15101/debug/status</span>
-<span class="c"># Starting MySQL for tablet test-0000000102...</span>
-<span class="c"># Starting vttablet for test-0000000102...</span>
-<span class="c"># Access tablet test-0000000102 at http://localhost:15102/debug/status</span>
-</code></pre></div>
-<p>After this command completes, refresh the <em>vtctld</em> web UI, and you should
-see a keyspace named <code class="prettyprint">test_keyspace</code> with a single shard named <code class="prettyprint">0</code>.
-This is what an unsharded keyspace looks like.</p>
-
-<p>If you click on the shard box, you&#39;ll see a list of <a href="http://vitess.io/overview/concepts.html#tablet">tablets</a> in that shard.
-Note that it&#39;s normal for the tablets to be unhealthy at this point, since
-you haven&#39;t initialized them yet.</p>
-
-<p>You can also click the <strong>STATUS</strong> link on each tablet to be taken to its
-status page, showing more details on its operation. Every Vitess server has
-a status page served at <code class="prettyprint">/debug/status</code> on its web port.</p></li>
-<li><p><strong>Initialize MySQL databases</strong></p>
-
-<p>Next, designate one of the tablets to be the initial master.
-Vitess will automatically connect the other slaves&#39; mysqld instances so
-that they start replicating from the master&#39;s mysqld.
-This is also when the default database is created. Since our keyspace is
-named <code class="prettyprint">test_keyspace</code>, the MySQL database will be named <code class="prettyprint">vt_test_keyspace</code>.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh InitShardMaster -force test_keyspace/0 <span class="nb">test</span>-100
-<span class="c">### example output:</span>
-<span class="c"># master-elect tablet test-0000000100 is not the shard master, proceeding anyway as -force was used</span>
-<span class="c"># master-elect tablet test-0000000100 is not a master in the shard, proceeding anyway as -force was used</span>
-</code></pre></div>
-<p><strong>Note:</strong> Since this is the first time the shard has been started,
-the tablets are not already doing any replication, and there is no
-existing master. The <code class="prettyprint">InitShardMaster</code> command above uses the <code class="prettyprint">-force</code> flag
-to bypass the usual sanity checks that would apply if this wasn&#39;t a
-brand new shard.</p>
-
-<p>After running this command, go back to the <strong>Shard Status</strong> page
-in the <em>vtctld</em> web interface. When you refresh the
-page, you should see that one <em>vttablet</em> is the master
-and the other two are replicas.</p>
-
-<p>You can also see this on the command line:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh ListAllTablets <span class="nb">test</span>
-<span class="c">### example output:</span>
-<span class="c"># test-0000000100 test_keyspace 0 master localhost:15100 localhost:33100 []</span>
-<span class="c"># test-0000000101 test_keyspace 0 replica localhost:15101 localhost:33101 []</span>
-<span class="c"># test-0000000102 test_keyspace 0 replica localhost:15102 localhost:33102 []</span>
-</code></pre></div></li>
-<li><p><strong>Create a table</strong></p>
-
-<p>The <code class="prettyprint">vtctlclient</code> tool can be used to apply the database schema across all
-tablets in a keyspace. The following command creates the table defined in
-the <code class="prettyprint">create_test_table.sql</code> file:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Make sure to run this from the examples/local dir, so it finds the file.</span>
-vitess/examples/local<span class="nv">$ </span>./lvtctl.sh ApplySchema -sql <span class="s2">&quot;$(cat create_test_table.sql)&quot;</span> test_keyspace
-</code></pre></div>
-<p>The SQL to create the table is shown below:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="k">CREATE</span> <span class="k">TABLE</span> <span class="n">messages</span> <span class="p">(</span>
-  <span class="n">page</span> <span class="nb">BIGINT</span><span class="p">(</span><span class="mi">20</span><span class="p">)</span> <span class="n">UNSIGNED</span><span class="p">,</span>
-  <span class="n">time_created_ns</span> <span class="nb">BIGINT</span><span class="p">(</span><span class="mi">20</span><span class="p">)</span> <span class="n">UNSIGNED</span><span class="p">,</span>
-  <span class="n">message</span> <span class="nb">VARCHAR</span><span class="p">(</span><span class="mi">10000</span><span class="p">),</span>
-  <span class="k">PRIMARY</span> <span class="k">KEY</span> <span class="p">(</span><span class="n">page</span><span class="p">,</span> <span class="n">time_created_ns</span><span class="p">)</span>
-<span class="p">)</span> <span class="n">ENGINE</span><span class="o">=</span><span class="n">InnoDB</span>
-</code></pre></div></li>
-<li><p><strong>Take a backup</strong></p>
-
-<p>Now that the initial schema is applied, it&#39;s a good time to take the first
-<a href="http://vitess.io/user-guide/backup-and-restore.html">backup</a>. This backup
-will be used to automatically restore any additional replicas that you run,
-before they connect themselves to the master and catch up on replication.
-If an existing tablet goes down and comes back up without its data, it will
-also automatically restore from the latest backup and then resume replication.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh Backup <span class="nb">test</span>-0000000102
-</code></pre></div>
-<p>After the backup completes, you can list available backups for the shard:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh ListBackups test_keyspace/0
-<span class="c">### example output:</span>
-<span class="c"># 2016-05-06.072724.test-0000000102</span>
-</code></pre></div>
-<p><strong>Note:</strong> In this single-server example setup, backups are stored at
-<code class="prettyprint">$VTDATAROOT/backups</code>. In a multi-server deployment, you would usually mount
-an NFS directory there. You can also change the location by setting the
-<code class="prettyprint">-file_backup_storage_root</code> flag on <em>vtctld</em> and <em>vttablet</em>, as demonstrated
-in <code class="prettyprint">vtctld-up.sh</code> and <code class="prettyprint">vttablet-up.sh</code>.</p></li>
-<li><p><strong>Initialize Vitess Routing Schema</strong></p>
-
-<p>In the examples, we are just using a single database with no specific
-configuration. So we just need to make that (empty) configuration visible
-for serving. This is done by running the following command:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh RebuildVSchemaGraph
-</code></pre></div>
-<p>(As it works, this command will not display any output.)</p></li>
-<li><p><strong>Start vtgate</strong></p>
-
-<p>Vitess uses <em>vtgate</em> to route each client query to
-the correct <em>vttablet</em>. This local example runs a
-single <em>vtgate</em> instance, though a real deployment
-would likely run multiple <em>vtgate</em> instances to share
-the load.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./vtgate-up.sh
-</code></pre></div></li>
-</ol>
-
-<h3 id="run-a-client-application">Run a Client Application</h3>
-
-<p>The <code class="prettyprint">client.py</code> file is a simple sample application
-that connects to <em>vtgate</em> and executes some queries.
-To run it, you need to either:</p>
-
-<ul>
-<li><p>Add the Vitess Python packages to your <code class="prettyprint">PYTHONPATH</code>.</p>
-
-<p>or</p></li>
-<li><p>Use the <code class="prettyprint">client.sh</code> wrapper script, which temporarily
-sets up the environment and then runs <code class="prettyprint">client.py</code>.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./client.sh
-<span class="c">### example output:</span>
-<span class="c"># Inserting into master...</span>
-<span class="c"># Reading from master...</span>
-<span class="c"># (5L, 1462510331910124032L, &#39;V is for speed&#39;)</span>
-<span class="c"># (15L, 1462519383758071808L, &#39;V is for speed&#39;)</span>
-<span class="c"># (42L, 1462510369213753088L, &#39;V is for speed&#39;)</span>
-<span class="c"># ...</span>
-</code></pre></div></li>
-</ul>
-
-<p>There are also sample clients in the same directory for Java, PHP, and Go.
-See the comments at the top of each sample file for usage instructions.</p>
-
-<h3 id="try-vitess-resharding">Try Vitess resharding</h3>
-
-<p>Now that you have a full Vitess stack running, you may want to go on to the
-<a href="http://vitess.io/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding workflow guide</a>
-or <a href="http://vitess.io/user-guide/horizontal-sharding.html">Horizontal Sharding codelab</a>
-(if you prefer to run each step manually through commands) to try out
-<a href="http://vitess.io/user-guide/sharding.html#resharding">dynamic resharding</a>.</p>
-
-<p>If so, you can skip the tear-down since the sharding guide picks up right here.
-If not, continue to the clean-up steps below.</p>
-
-<h3 id="tear-down-the-cluster">Tear down the cluster</h3>
-
-<p>Each <code class="prettyprint">-up.sh</code> script has a corresponding <code class="prettyprint">-down.sh</code> script to stop the servers.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./vtgate-down.sh
-vitess/examples/local<span class="nv">$ </span>./vttablet-down.sh
-vitess/examples/local<span class="nv">$ </span>./vtctld-down.sh
-vitess/examples/local<span class="nv">$ </span>./zk-down.sh
-</code></pre></div>
-<p>Note that the <code class="prettyprint">-down.sh</code> scripts will leave behind any data files created.
-If you&#39;re done with this example data, you can clear out the contents of <code class="prettyprint">VTDATAROOT</code>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span><span class="nb">cd</span> <span class="nv">$VTDATAROOT</span>
-/path/to/vtdataroot<span class="nv">$ </span>rm -rf *
-</code></pre></div>
-<h2 id="troubleshooting">Troubleshooting</h2>
-
-<p>If anything goes wrong, check the logs in your <code class="prettyprint">$VTDATAROOT/tmp</code> directory
-for error messages. There are also some tablet-specific logs, as well as
-MySQL logs in the various <code class="prettyprint">$VTDATAROOT/vt_*</code> directories.</p>
-
-<p>If you need help diagnosing a problem, send a message to our
-<a href="https://groups.google.com/forum/#!forum/vitess">mailing list</a>.
-In addition to any errors you see at the command-line, it would also help to
-upload an archive of your <code class="prettyprint">VTDATAROOT</code> directory to a file sharing service
-and provide a link to it.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/getting-started/local-instance/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/getting-started/local-instance/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/getting-started/local-instance/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/getting-started/local-instance/"</script>
 </html>
diff --git a/docs/getting-started/local-instance/index.html b/docs/getting-started/local-instance/index.html
new file mode 100644
index 00000000000..49c16618066
--- /dev/null
+++ b/docs/getting-started/local-instance/index.html
@@ -0,0 +1,888 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Running Vitess on a Local Server | Vitess</title>
+<meta property="og:title" content="Running Vitess on a Local Server" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Learn how to build Vitess on a local server." />
+<meta property="og:description" content="Learn how to build Vitess on a local server." />
+<link rel="canonical" href="http://vitess.io/getting-started/local-instance/" />
+<meta property="og:url" content="http://vitess.io/getting-started/local-instance/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Learn how to build Vitess on a local server.","url":"http://vitess.io/getting-started/local-instance/","headline":"Running Vitess on a Local Server","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Running Vitess on a Local Server</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>You can build Vitess using either <a href="#docker-build">Docker</a> or a
+<a href="#manual-build">manual</a> build process.</p>
+
+<p>If you run into issues or have questions, please post on our
+<a href="https://groups.google.com/forum/#!forum/vitess">forum</a>.</p>
+
+<h2 id="docker-build">Docker Build</h2>
+
+<p>To run Vitess in Docker, you can either use our pre-built images on <a href="https://hub.docker.com/u/vitess/">Docker Hub</a>, or build them yourself.</p>
+
+<h3 id="docker-hub-images">Docker Hub Images</h3>
+
+<ul>
+<li><p>The <a href="https://hub.docker.com/r/vitess/base/">vitess/base</a> image contains a full
+development environment, capable of building Vitess and running integration tests.</p></li>
+<li><p>The <a href="https://hub.docker.com/r/vitess/lite/">vitess/lite</a> image contains only
+the compiled Vitess binaries, excluding ZooKeeper. It can run Vitess, but
+lacks the environment needed to build Vitess or run tests. It&#39;s primarily used
+for the <a href="/getting-started/">Vitess on Kubernetes</a> guide.</p></li>
+</ul>
+
+<p>For example, you can directly run <code class="prettyprint">vitess/base</code>, and Docker will download the
+image for you:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>sudo docker run -ti vitess/base bash
+vitess@32f187ef9351:/vt/src/github.com/youtube/vitess<span class="nv">$ </span>make build
+</code></pre></div>
+<p>Now you can proceed to <a href="#start-a-vitess-cluster">start a Vitess cluster</a> inside
+the Docker container you just started. Note that if you want to access the
+servers from outside the container, you&#39;ll need to expose the ports as described
+in the <a href="https://docs.docker.com/engine/reference/run/#/expose-incoming-ports">Docker Engine Reference Guide</a>.</p>
+
+<p>For local testing, you can also access the servers on the local IP address
+created for the container by Docker:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>docker inspect 32f187ef9351 <span class="p">|</span> grep IPAddress
+<span class="c">### example output:</span>
+<span class="c">#    &quot;IPAddress&quot;: &quot;172.17.3.1&quot;,</span>
+</code></pre></div>
+<h3 id="custom-docker-image">Custom Docker Image</h3>
+
+<p>You can also build Vitess Docker images yourself to include your
+own patches or configuration data. The
+<a href="https://github.com/youtube/vitess/blob/master/Dockerfile">Dockerfile</a>
+in the root of the Vitess tree builds the <code class="prettyprint">vitess/base</code> image.
+The <a href="https://github.com/youtube/vitess/tree/master/docker">docker</a>
+subdirectory contains scripts for building other images, such as <code class="prettyprint">vitess/lite</code>.</p>
+
+<p>Our <code class="prettyprint">Makefile</code> also contains rules to build the images. For example:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Create vitess/bootstrap, which prepares everything up to ./bootstrap.sh</span>
+vitess<span class="nv">$ </span>make docker_bootstrap
+<span class="c"># Create vitess/base from vitess/bootstrap by copying in your local working directory.</span>
+vitess<span class="nv">$ </span>make docker_base
+</code></pre></div>
+<h2 id="manual-build">Manual Build</h2>
+
+<p>The following sections explain the process for manually building
+Vitess without Docker.</p>
+
+<h3 id="install-dependencies">Install Dependencies</h3>
+
+<p>We currently test Vitess regularly on Ubuntu 14.04 (Trusty) and Debian 8 (Jessie).
+OS X 10.11 (El Capitan) should work as well, the installation instructions are below.</p>
+
+<h4 id="ubuntu-and-debian">Ubuntu and Debian</h4>
+
+<p>In addition, Vitess requires the software and libraries listed below.</p>
+
+<ol>
+<li><p><a href="http://golang.org/doc/install">Install Go 1.9+</a>.</p></li>
+<li><p>Install <a href="https://downloads.mariadb.org/">MariaDB 10.0</a> or
+<a href="http://dev.mysql.com/downloads/mysql">MySQL 5.6</a>. You can use any
+installation method (src/bin/rpm/deb), but be sure to include the client
+development headers (<code class="prettyprint">libmariadbclient-dev</code> or <code class="prettyprint">libmysqlclient-dev</code>).</p>
+
+<p>The Vitess development team currently tests against MariaDB 10.0.21
+and MySQL 5.6.27.</p>
+
+<p>If you are installing MariaDB, note that you must install version 10.0 or
+higher. If you are using <code class="prettyprint">apt-get</code>, confirm that your repository
+offers an option to install that version. You can also download the source
+directly from <a href="https://downloads.mariadb.org/mariadb/">mariadb.org</a>.</p>
+
+<p>If you are using Ubuntu 14.04 with MySQL 5.6, the default install may be
+missing a file too, <code class="prettyprint">/usr/share/mysql/my-default.cnf</code>. It would show as an
+error like <code class="prettyprint">Could not find my-default.cnf</code>. If you run into this, just add
+it with the following contents:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">[mysqld]
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+</code></pre></div></li>
+<li><p>Select a lock service from the options listed below. It is technically
+possible to use another lock server, but plugins currently exist only
+for ZooKeeper and etcd.</p>
+
+<ul>
+<li>ZooKeeper 3.3.5 is included by default. </li>
+<li><a href="https://github.com/coreos/etcd/releases">Install etcd v3.0+</a>.
+If you use etcd, remember to include the <code class="prettyprint">etcd</code> command
+on your path.</li>
+</ul></li>
+<li><p>Install the following other tools needed to build and run Vitess:</p>
+
+<ul>
+<li>make</li>
+<li>automake</li>
+<li>libtool</li>
+<li>python-dev</li>
+<li>python-virtualenv</li>
+<li>python-mysqldb</li>
+<li>libssl-dev</li>
+<li>g++</li>
+<li>git</li>
+<li>pkg-config</li>
+<li>bison</li>
+<li>curl</li>
+<li>unzip</li>
+</ul>
+
+<p>These can be installed with the following apt-get command:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>sudo apt-get install make automake libtool python-dev python-virtualenv python-mysqldb libssl-dev g++ git pkg-config bison curl unzip
+</code></pre></div></li>
+<li><p>If you decided to use ZooKeeper in step 3, you also need to install a
+Java Runtime, such as OpenJDK.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>sudo apt-get install openjdk-7-jre
+</code></pre></div></li>
+</ol>
+
+<h4 id="os-x">OS X</h4>
+
+<ol>
+<li><p><a href="http://brew.sh/">Install Homebrew</a>. If your /usr/local directory is not empty and you never used Homebrew before,
+it will be 
+<a href="https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/El_Capitan_and_Homebrew.md">mandatory</a> 
+to run the following command:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">sudo chown -R <span class="k">$(</span>whoami<span class="k">)</span>:admin /usr/local
+</code></pre></div></li>
+<li><p>On OS X, MySQL 5.6 has to be used, MariaDB doesn&#39;t work for some reason yet. It should be installed from Homebrew
+(install steps are below).</p></li>
+<li><p>If Xcode is installed (with Console tools, which should be bundled automatically since the 7.1 version), all 
+the dev dependencies should be satisfied in this step. If no Xcode is present, it is necessery to install pkg-config.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">brew install pkg-config
+</code></pre></div></li>
+<li><p>ZooKeeper is used as lock service.</p></li>
+<li><p>Run the following commands:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">brew install go automake libtool python git bison curl wget homebrew/versions/mysql56
+pip install --upgrade pip setuptools
+pip install virtualenv
+pip install MySQL-python
+pip install tox
+</code></pre></div></li>
+<li><p>Install Java runtime from this URL: <a href="https://support.apple.com/kb/dl1572?locale=en_US">https://support.apple.com/kb/dl1572?locale=en_US</a>
+Apple only supports Java 6. If you need to install a newer version, this link might be helpful:
+<a href="http://osxdaily.com/2015/10/17/how-to-install-java-in-os-x-el-capitan/">http://osxdaily.com/2015/10/17/how-to-install-java-in-os-x-el-capitan/</a></p></li>
+<li><p>The Vitess bootstrap script makes some checks for the go runtime, so it is recommended to have the following
+commands in your ~/.profile or ~/.bashrc or ~/.zshrc:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">PATH</span><span class="o">=</span>/usr/local/opt/go/libexec/bin:<span class="nv">$PATH</span>
+<span class="nb">export </span><span class="nv">GOROOT</span><span class="o">=</span>/usr/local/opt/go/libexec
+</code></pre></div></li>
+<li><p>There is a problem with installing the enum34 Python package using pip, so the following file has to be edited:
+<code class="prettyprint">
+/usr/local/opt/python/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/distutils.cfg
+</code></p>
+
+<p>and this line:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">prefix=/usr/local
+</code></pre></div>
+<p>has to be commented out:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text"># prefix=/usr/local
+</code></pre></div>
+<p>After running the ./bootstrap.sh script from the next step, you can revert the change.</p></li>
+<li><p>For the Vitess hostname resolving functions to work correctly, a new entry has to be added into the /etc/hosts file
+with the current LAN IP address of the computer (preferably IPv4) and the current hostname, which you get by
+typing the &#39;hostname&#39; command in the terminal.</p>
+
+<p>It is also a good idea to put the following line to <a href="https://golang.org/doc/go1.5#net">force the Go DNS resolver</a> 
+in your ~/.profile or ~/.bashrc or ~/.zshrc:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">export GODEBUG=netdns=go
+</code></pre></div></li>
+</ol>
+
+<h3 id="build-vitess">Build Vitess</h3>
+
+<ol>
+<li><p>Navigate to the directory where you want to download the Vitess
+source code and clone the Vitess Github repo. After doing so,
+navigate to the <code class="prettyprint">src/github.com/youtube/vitess</code> directory.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">cd</span> <span class="nv">$WORKSPACE</span>
+git clone https://github.com/youtube/vitess.git <span class="se">\</span>
+    src/github.com/youtube/vitess
+<span class="nb">cd </span>src/github.com/youtube/vitess
+</code></pre></div></li>
+<li><p>Set the <code class="prettyprint">MYSQL_FLAVOR</code> environment variable. Choose the appropriate
+value for your database. This value is case-sensitive.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">MYSQL_FLAVOR</span><span class="o">=</span>MariaDB
+<span class="c"># or (mandatory for OS X)</span>
+<span class="c"># export MYSQL_FLAVOR=MySQL56</span>
+</code></pre></div></li>
+<li><p>If your selected database installed in a location other than <code class="prettyprint">/usr/bin</code>,
+set the <code class="prettyprint">VT_MYSQL_ROOT</code> variable to the root directory of your
+MariaDB installation. For example, if MariaDB is installed in
+<code class="prettyprint">/usr/local/mysql</code>, run the following command.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">VT_MYSQL_ROOT</span><span class="o">=</span>/usr/local/mysql
+
+<span class="c"># on OS X, this is the correct value:</span>
+<span class="c"># export VT_MYSQL_ROOT=/usr/local/opt/mysql56</span>
+</code></pre></div>
+<p>Note that the command indicates that the <code class="prettyprint">mysql</code> executable should
+be found at <code class="prettyprint">/usr/local/mysql/bin/mysql</code>.</p></li>
+<li><p>Run <code class="prettyprint">mysql_config --version</code> and confirm that you
+are running the correct version of MariaDB or MySQL. The value should
+be 10 or higher for MariaDB and 5.6.x for MySQL.</p></li>
+<li><p>Build Vitess using the commands below. Note that the
+<code class="prettyprint">bootstrap.sh</code> script needs to download some dependencies.
+If your machine requires a proxy to access the Internet, you will need
+to set the usual environment variables (e.g. <code class="prettyprint">http_proxy</code>,
+<code class="prettyprint">https_proxy</code>, <code class="prettyprint">no_proxy</code>).</p>
+
+<p>Run the boostrap.sh script:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">./bootstrap.sh
+<span class="c">### example output:</span>
+<span class="c"># skipping zookeeper build</span>
+<span class="c"># go install golang.org/x/tools/cmd/cover ...</span>
+<span class="c"># Found MariaDB installation in ...</span>
+<span class="c"># creating git pre-commit hooks</span>
+<span class="c">#</span>
+<span class="c"># source dev.env in your shell before building</span>
+</code></pre></div><div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Remaining commands to build Vitess</span>
+. ./dev.env
+make build
+</code></pre></div></li>
+</ol>
+
+<h3 id="run-tests">Run Tests</h3>
+
+<p><strong>Note:</strong> If you are using etcd, set the following environment variable:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">VT_TEST_FLAGS</span><span class="o">=</span><span class="s1">&#39;--topo-server-flavor=etcd&#39;</span>
+</code></pre></div>
+<p>The default targets when running <code class="prettyprint">make test</code> contain a full set of
+tests intended to help Vitess developers to verify code changes. Those tests
+simulate a small Vitess cluster by launching many servers on the local
+machine. To do so, they require a lot of resources; a minimum of 8GB RAM
+and SSD is recommended to run the tests.</p>
+
+<p>If you want only to check that Vitess is working in your environment,
+you can run a lighter set of tests:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">make site_test
+</code></pre></div>
+<h4 id="common-test-issues">Common Test Issues</h4>
+
+<p>Attempts to run the full developer test suite (<code class="prettyprint">make test</code>)
+on an underpowered machine often results in failure. If you still see
+the same failures when running the lighter set of tests (<code class="prettyprint">make site_test</code>),
+please let the development team know in the
+<a href="https://groups.google.com/forum/#!forum/vitess">vitess@googlegroups.com</a>
+discussion forum.</p>
+
+<h5 id="node-already-exists-port-in-use-etc">Node already exists, port in use, etc.</h5>
+
+<p>A failed test can leave orphaned processes. If you use the default
+settings, you can use the following commands to identify and kill
+those processes:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">pgrep -f -l <span class="s1">&#39;(vtdataroot|VTDATAROOT)&#39;</span> <span class="c"># list Vitess processes</span>
+pkill -f <span class="s1">&#39;(vtdataroot|VTDATAROOT)&#39;</span> <span class="c"># kill Vitess processes</span>
+</code></pre></div>
+<h5 id="too-many-connections-to-mysql-or-other-timeouts">Too many connections to MySQL, or other timeouts</h5>
+
+<p>This error often means your disk is too slow. If you don&#39;t have access
+to an SSD, you can try <a href="https://github.com/youtube/vitess/blob/master/doc/TestingOnARamDisk.md">testing against a
+ramdisk</a>.</p>
+
+<h5 id="connection-refused-to-tablet-mysql-socket-not-found-etc">Connection refused to tablet, MySQL socket not found, etc.</h5>
+
+<p>These errors might indicate that the machine ran out of RAM and a server
+crashed when trying to allocate more RAM. Some of the heavier tests
+require up to 8GB RAM.</p>
+
+<h5 id="connection-refused-in-zkctl-test">Connection refused in zkctl test</h5>
+
+<p>This error might indicate that the machine does not have a Java Runtime
+installed, which is a requirement if you are using ZooKeeper as the lock server.</p>
+
+<h5 id="running-out-of-disk-space">Running out of disk space</h5>
+
+<p>Some of the larger tests use up to 4GB of temporary space on disk.</p>
+
+<h2 id="start-a-vitess-cluster">Start a Vitess cluster</h2>
+
+<p>After completing the instructions above to <a href="#build-vitess">build Vitess</a>,
+you can use the example scripts in the Github repo to bring up a Vitess
+cluster on your local machine. These scripts use ZooKeeper as the
+lock service. ZooKeeper is included in the Vitess distribution.</p>
+
+<ol>
+<li><p><strong>Check system settings</strong></p>
+
+<p>Some Linux distributions ship with default file descriptor limits
+that are too low for database servers. This issue could show up
+as the database crashing with the message &quot;too many open files&quot;.</p>
+
+<p>Check the system-wide <code class="prettyprint">file-max</code> setting as well as user-specific
+<code class="prettyprint">ulimit</code> values. We recommend setting them above 100K to be safe.
+The exact <a href="http://www.cyberciti.biz/faq/linux-increase-the-maximum-number-of-open-files/">procedure</a>
+ may vary depending on your Linux distribution.</p></li>
+<li><p><strong>Configure environment variables</strong></p>
+
+<p>If you are still in the same terminal window that
+you used to run the build commands, you can skip to the next
+step since the environment variables will already be set.</p>
+
+<p>If you&#39;re adapting this example to your own deployment, the only environment
+variables required before running the scripts are <code class="prettyprint">VTROOT</code> and <code class="prettyprint">VTDATAROOT</code>.</p>
+
+<p>Set <code class="prettyprint">VTROOT</code> to the parent of the Vitess source tree. For example, if you
+ran <code class="prettyprint">make build</code> while in <code class="prettyprint">$HOME/vt/src/github.com/youtube/vitess</code>,
+then you should set:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">VTROOT</span><span class="o">=</span><span class="nv">$HOME</span>/vt
+</code></pre></div>
+<p>Set <code class="prettyprint">VTDATAROOT</code> to the directory where you want data files and logs to
+be stored. For example:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nb">export </span><span class="nv">VTDATAROOT</span><span class="o">=</span><span class="nv">$HOME</span>/vtdataroot
+</code></pre></div></li>
+<li><p><strong>Start ZooKeeper</strong></p>
+
+<p>Servers in a Vitess cluster find each other by looking for
+dynamic configuration data stored in a distributed lock
+service. The following script creates a small ZooKeeper cluster:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span><span class="nb">cd</span> <span class="nv">$VTROOT</span>/src/github.com/youtube/vitess/examples/local
+vitess/examples/local<span class="nv">$ </span>./zk-up.sh
+<span class="c">### example output:</span>
+<span class="c"># Starting zk servers...</span>
+<span class="c"># Waiting for zk servers to be ready...</span>
+</code></pre></div>
+<p>After the ZooKeeper cluster is running, we only need to tell each
+Vitess process how to connect to ZooKeeper. Then, each process can
+find all of the other Vitess processes by coordinating via ZooKeeper.</p>
+
+<p>Each of our scripts automatically uses the <code class="prettyprint">TOPOLOGY_FLAGS</code> environment
+variable to point to the global ZooKeeper instance. The global instance in
+turn is configured to point to the local instance. In our sample scripts,
+they are both hosted in the same ZooKeeper service.</p></li>
+<li><p><strong>Start vtctld</strong></p>
+
+<p>The <em>vtctld</em> server provides a web interface that
+displays all of the coordination information stored in ZooKeeper.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./vtctld-up.sh
+<span class="c"># Starting vtctld</span>
+<span class="c"># Access vtctld web UI at http://localhost:15000</span>
+<span class="c"># Send commands with: vtctlclient -server localhost:15999 ...</span>
+</code></pre></div>
+<p>Open <code class="prettyprint">http://localhost:15000</code> to verify that
+<em>vtctld</em> is running. There won&#39;t be any information
+there yet, but the menu should come up, which indicates that
+<em>vtctld</em> is running.</p>
+
+<p>The <em>vtctld</em> server also accepts commands from the <code class="prettyprint">vtctlclient</code> tool,
+which is used to administer the cluster. Note that the port for RPCs
+(in this case <code class="prettyprint">15999</code>) is different from the web UI port (<code class="prettyprint">15000</code>).
+These ports can be configured with command-line flags, as demonstrated
+in <code class="prettyprint">vtctld-up.sh</code>.</p>
+
+<p>For convenience, we&#39;ll use the <code class="prettyprint">lvtctl.sh</code> script in example commands,
+to avoid having to type the <em>vtctld</em> address every time.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># List available commands</span>
+vitess/examples/local<span class="nv">$ </span>./lvtctl.sh <span class="nb">help</span>
+</code></pre></div></li>
+<li><p><strong>Start vttablets</strong></p>
+
+<p>The <code class="prettyprint">vttablet-up.sh</code> script brings up three vttablets, and assigns them to
+a <a href="/overview/concepts/#keyspace">keyspace</a> and <a href="/overview/concepts/#shard">shard</a> according to the variables
+set at the top of the script file.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./vttablet-up.sh
+<span class="c"># Output from vttablet-up.sh is below</span>
+<span class="c"># Starting MySQL for tablet test-0000000100...</span>
+<span class="c"># Starting vttablet for test-0000000100...</span>
+<span class="c"># Access tablet test-0000000100 at http://localhost:15100/debug/status</span>
+<span class="c"># Starting MySQL for tablet test-0000000101...</span>
+<span class="c"># Starting vttablet for test-0000000101...</span>
+<span class="c"># Access tablet test-0000000101 at http://localhost:15101/debug/status</span>
+<span class="c"># Starting MySQL for tablet test-0000000102...</span>
+<span class="c"># Starting vttablet for test-0000000102...</span>
+<span class="c"># Access tablet test-0000000102 at http://localhost:15102/debug/status</span>
+</code></pre></div>
+<p>After this command completes, refresh the <em>vtctld</em> web UI, and you should
+see a keyspace named <code class="prettyprint">test_keyspace</code> with a single shard named <code class="prettyprint">0</code>.
+This is what an unsharded keyspace looks like.</p>
+
+<p>If you click on the shard box, you&#39;ll see a list of <a href="/overview/concepts/#tablet">tablets</a> in that shard.
+Note that it&#39;s normal for the tablets to be unhealthy at this point, since
+you haven&#39;t initialized them yet.</p>
+
+<p>You can also click the <strong>STATUS</strong> link on each tablet to be taken to its
+status page, showing more details on its operation. Every Vitess server has
+a status page served at <code class="prettyprint">/debug/status</code> on its web port.</p></li>
+<li><p><strong>Initialize MySQL databases</strong></p>
+
+<p>Next, designate one of the tablets to be the initial master.
+Vitess will automatically connect the other slaves&#39; mysqld instances so
+that they start replicating from the master&#39;s mysqld.
+This is also when the default database is created. Since our keyspace is
+named <code class="prettyprint">test_keyspace</code>, the MySQL database will be named <code class="prettyprint">vt_test_keyspace</code>.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh InitShardMaster -force test_keyspace/0 <span class="nb">test</span>-100
+<span class="c">### example output:</span>
+<span class="c"># master-elect tablet test-0000000100 is not the shard master, proceeding anyway as -force was used</span>
+<span class="c"># master-elect tablet test-0000000100 is not a master in the shard, proceeding anyway as -force was used</span>
+</code></pre></div>
+<p><strong>Note:</strong> Since this is the first time the shard has been started,
+the tablets are not already doing any replication, and there is no
+existing master. The <code class="prettyprint">InitShardMaster</code> command above uses the <code class="prettyprint">-force</code> flag
+to bypass the usual sanity checks that would apply if this wasn&#39;t a
+brand new shard.</p>
+
+<p>After running this command, go back to the <strong>Shard Status</strong> page
+in the <em>vtctld</em> web interface. When you refresh the
+page, you should see that one <em>vttablet</em> is the master,
+two are replicas and two are rdonly.</p>
+
+<p>You can also see this on the command line:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh ListAllTablets <span class="nb">test</span>
+<span class="c">### example output:</span>
+<span class="c"># test-0000000100 test_keyspace 0 master localhost:15100 localhost:17100 []</span>
+<span class="c"># test-0000000101 test_keyspace 0 replica localhost:15101 localhost:17101 []</span>
+<span class="c"># test-0000000102 test_keyspace 0 replica localhost:15102 localhost:17102 []</span>
+<span class="c"># test-0000000103 test_keyspace 0 rdonly localhost:15103 localhost:17103 []</span>
+<span class="c"># test-0000000104 test_keyspace 0 rdonly localhost:15104 localhost:17104 []</span>
+</code></pre></div></li>
+<li><p><strong>Create a table</strong></p>
+
+<p>The <code class="prettyprint">vtctlclient</code> tool can be used to apply the database schema across all
+tablets in a keyspace. The following command creates the table defined in
+the <code class="prettyprint">create_test_table.sql</code> file:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Make sure to run this from the examples/local dir, so it finds the file.</span>
+vitess/examples/local<span class="nv">$ </span>./lvtctl.sh ApplySchema -sql <span class="s2">&quot;$(cat create_test_table.sql)&quot;</span> test_keyspace
+</code></pre></div>
+<p>The SQL to create the table is shown below:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="k">CREATE</span> <span class="k">TABLE</span> <span class="n">messages</span> <span class="p">(</span>
+  <span class="n">page</span> <span class="nb">BIGINT</span><span class="p">(</span><span class="mi">20</span><span class="p">)</span> <span class="n">UNSIGNED</span><span class="p">,</span>
+  <span class="n">time_created_ns</span> <span class="nb">BIGINT</span><span class="p">(</span><span class="mi">20</span><span class="p">)</span> <span class="n">UNSIGNED</span><span class="p">,</span>
+  <span class="n">message</span> <span class="nb">VARCHAR</span><span class="p">(</span><span class="mi">10000</span><span class="p">),</span>
+  <span class="k">PRIMARY</span> <span class="k">KEY</span> <span class="p">(</span><span class="n">page</span><span class="p">,</span> <span class="n">time_created_ns</span><span class="p">)</span>
+<span class="p">)</span> <span class="n">ENGINE</span><span class="o">=</span><span class="n">InnoDB</span>
+</code></pre></div></li>
+<li><p><strong>Take a backup</strong></p>
+
+<p>Now that the initial schema is applied, it&#39;s a good time to take the first
+<a href="/user-guide/backup-and-restore/">backup</a>. This backup
+will be used to automatically restore any additional replicas that you run,
+before they connect themselves to the master and catch up on replication.
+If an existing tablet goes down and comes back up without its data, it will
+also automatically restore from the latest backup and then resume replication.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh Backup <span class="nb">test</span>-0000000102
+</code></pre></div>
+<p>After the backup completes, you can list available backups for the shard:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh ListBackups test_keyspace/0
+<span class="c">### example output:</span>
+<span class="c"># 2016-05-06.072724.test-0000000102</span>
+</code></pre></div>
+<p><strong>Note:</strong> In this single-server example setup, backups are stored at
+<code class="prettyprint">$VTDATAROOT/backups</code>. In a multi-server deployment, you would usually mount
+an NFS directory there. You can also change the location by setting the
+<code class="prettyprint">-file_backup_storage_root</code> flag on <em>vtctld</em> and <em>vttablet</em>, as demonstrated
+in <code class="prettyprint">vtctld-up.sh</code> and <code class="prettyprint">vttablet-up.sh</code>.</p></li>
+<li><p><strong>Initialize Vitess Routing Schema</strong></p>
+
+<p>In the examples, we are just using a single database with no specific
+configuration. So we just need to make that (empty) configuration visible
+for serving. This is done by running the following command:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh RebuildVSchemaGraph
+</code></pre></div>
+<p>(As it works, this command will not display any output.)</p></li>
+<li><p><strong>Start vtgate</strong></p>
+
+<p>Vitess uses <em>vtgate</em> to route each client query to
+the correct <em>vttablet</em>. This local example runs a
+single <em>vtgate</em> instance, though a real deployment
+would likely run multiple <em>vtgate</em> instances to share
+the load.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./vtgate-up.sh
+</code></pre></div></li>
+</ol>
+
+<h3 id="run-a-client-application">Run a Client Application</h3>
+
+<p>The <code class="prettyprint">client.py</code> file is a simple sample application
+that connects to <em>vtgate</em> and executes some queries.
+To run it, you need to either:</p>
+
+<ul>
+<li><p>Add the Vitess Python packages to your <code class="prettyprint">PYTHONPATH</code>.</p>
+
+<p>or</p></li>
+<li><p>Use the <code class="prettyprint">client.sh</code> wrapper script, which temporarily
+sets up the environment and then runs <code class="prettyprint">client.py</code>.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./client.sh
+<span class="c">### example output:</span>
+<span class="c"># Inserting into master...</span>
+<span class="c"># Reading from master...</span>
+<span class="c"># (5L, 1462510331910124032L, &#39;V is for speed&#39;)</span>
+<span class="c"># (15L, 1462519383758071808L, &#39;V is for speed&#39;)</span>
+<span class="c"># (42L, 1462510369213753088L, &#39;V is for speed&#39;)</span>
+<span class="c"># ...</span>
+</code></pre></div></li>
+</ul>
+
+<p>There are also sample clients in the same directory for Java, PHP, and Go.
+See the comments at the top of each sample file for usage instructions.</p>
+
+<h3 id="try-vitess-resharding">Try Vitess resharding</h3>
+
+<p>Now that you have a full Vitess stack running, you may want to go on to the
+<a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding workflow guide</a>
+or <a href="/user-guide/horizontal-sharding/">Horizontal Sharding codelab</a>
+(if you prefer to run each step manually through commands) to try out
+<a href="/user-guide/sharding/#resharding">dynamic resharding</a>.</p>
+
+<p>If so, you can skip the tear-down since the sharding guide picks up right here.
+If not, continue to the clean-up steps below.</p>
+
+<h3 id="tear-down-the-cluster">Tear down the cluster</h3>
+
+<p>Each <code class="prettyprint">-up.sh</code> script has a corresponding <code class="prettyprint">-down.sh</code> script to stop the servers.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./vtgate-down.sh
+vitess/examples/local<span class="nv">$ </span>./vttablet-down.sh
+vitess/examples/local<span class="nv">$ </span>./vtctld-down.sh
+vitess/examples/local<span class="nv">$ </span>./zk-down.sh
+</code></pre></div>
+<p>Note that the <code class="prettyprint">-down.sh</code> scripts will leave behind any data files created.
+If you&#39;re done with this example data, you can clear out the contents of <code class="prettyprint">VTDATAROOT</code>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span><span class="nb">cd</span> <span class="nv">$VTDATAROOT</span>
+/path/to/vtdataroot<span class="nv">$ </span>rm -rf *
+</code></pre></div>
+<h2 id="troubleshooting">Troubleshooting</h2>
+
+<p>If anything goes wrong, check the logs in your <code class="prettyprint">$VTDATAROOT/tmp</code> directory
+for error messages. There are also some tablet-specific logs, as well as
+MySQL logs in the various <code class="prettyprint">$VTDATAROOT/vt_*</code> directories.</p>
+
+<p>If you need help diagnosing a problem, send a message to our
+<a href="https://groups.google.com/forum/#!forum/vitess">mailing list</a>.
+In addition to any errors you see at the command-line, it would also help to
+upload an archive of your <code class="prettyprint">VTDATAROOT</code> directory to a file sharing service
+and provide a link to it.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/images/users/axon_logo.png b/docs/images/users/axon_logo.png
new file mode 100644
index 00000000000..04bb390f64a
Binary files /dev/null and b/docs/images/users/axon_logo.png differ
diff --git a/docs/images/users/bettercloud_logo.png b/docs/images/users/bettercloud_logo.png
new file mode 100644
index 00000000000..2c0bed7501a
Binary files /dev/null and b/docs/images/users/bettercloud_logo.png differ
diff --git a/docs/images/users/flipkart_logo.png b/docs/images/users/flipkart_logo.png
new file mode 100644
index 00000000000..7047b8a52ee
Binary files /dev/null and b/docs/images/users/flipkart_logo.png differ
diff --git a/docs/images/users/hubspot_logo.png b/docs/images/users/hubspot_logo.png
new file mode 100644
index 00000000000..7d9f9556f19
Binary files /dev/null and b/docs/images/users/hubspot_logo.png differ
diff --git a/docs/images/users/nozzle_logo.png b/docs/images/users/nozzle_logo.png
new file mode 100644
index 00000000000..e3a5a731403
Binary files /dev/null and b/docs/images/users/nozzle_logo.png differ
diff --git a/docs/images/users/pixel_federation_logo.png b/docs/images/users/pixel_federation_logo.png
new file mode 100644
index 00000000000..ff60a98fff4
Binary files /dev/null and b/docs/images/users/pixel_federation_logo.png differ
diff --git a/docs/images/users/quiz_of_kings_logo.jpg b/docs/images/users/quiz_of_kings_logo.jpg
new file mode 100644
index 00000000000..aa4078c7ffb
Binary files /dev/null and b/docs/images/users/quiz_of_kings_logo.jpg differ
diff --git a/docs/images/users/slack_logo.png b/docs/images/users/slack_logo.png
new file mode 100644
index 00000000000..90c8c17a41b
Binary files /dev/null and b/docs/images/users/slack_logo.png differ
diff --git a/docs/images/users/square_logo.png b/docs/images/users/square_logo.png
new file mode 100644
index 00000000000..fc71fc855f2
Binary files /dev/null and b/docs/images/users/square_logo.png differ
diff --git a/docs/images/users/stitchlabs_logo.png b/docs/images/users/stitchlabs_logo.png
new file mode 100644
index 00000000000..440307d1df6
Binary files /dev/null and b/docs/images/users/stitchlabs_logo.png differ
diff --git a/docs/images/users/youtube_logo.png b/docs/images/users/youtube_logo.png
new file mode 100644
index 00000000000..165e04b5829
Binary files /dev/null and b/docs/images/users/youtube_logo.png differ
diff --git a/docs/images/vitess_logo.svg b/docs/images/vitess_logo.svg
index 7f718dfa929..bdacb4fb6f4 100644
--- a/docs/images/vitess_logo.svg
+++ b/docs/images/vitess_logo.svg
@@ -152,7 +152,7 @@
          d="m 367.1282,648.85881 -27.87054,-51.05696 43.91222,-28.31214 z"
          inkscape:transform-center-y="9.0326795"
          inkscape:transform-center-x="1.1278866e-05"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#254c63;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -160,7 +160,7 @@
          d="m 358.11877,523.54589 -18.86111,74.25596 43.89303,-28.23753 z"
          inkscape:transform-center-y="-9.0326324"
          inkscape:transform-center-x="1.0833444e-05"
-         style="fill:#3949AB;fill-opacity:1;stroke:none" />
+         style="fill:#265c7d;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -168,7 +168,7 @@
          d="M 339.25766,597.80185 309.81992,543.4964 358.11877,523.54589 z"
          inkscape:transform-center-y="9.0326757"
          inkscape:transform-center-x="1.4539605e-05"
-         style="fill:#9FA8DA;fill-opacity:1;stroke:none" />
+         style="fill:#3788b7;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -176,7 +176,7 @@
          d="m 321.77925,456.51404 -11.95933,86.98236 48.29885,-19.95051 z"
          inkscape:transform-center-y="-9.0326719"
          inkscape:transform-center-x="1.4539605e-05"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#1e4c66;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -184,7 +184,7 @@
          d="m 396.92809,488.92607 -28.80694,53.00636 15.02954,27.63189 z"
          inkscape:transform-center-y="-9.0326719"
          inkscape:transform-center-x="1.7127283e-05"
-         style="fill:#C5CAE9;fill-opacity:1;stroke:none" />
+         style="fill:#3e9dd7;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -192,7 +192,7 @@
          d="m 309.81992,543.4964 -29.45786,-54.08204 41.41719,-32.90032 z"
          inkscape:transform-center-y="9.0326752"
          inkscape:transform-center-x="1.6018239e-05"
-         style="fill:#5C6BC0;fill-opacity:1;stroke:none" />
+         style="fill:#2d709a;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -200,7 +200,7 @@
          d="m 424.96714,544.084 -37.46497,0.0312 68.05792,-55.31976 z"
          inkscape:transform-center-y="9.0326752"
          inkscape:transform-center-x="1.4311967e-05"
-         style="fill:#283593;fill-opacity:1;stroke:none" />
+         style="fill:#28495c;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -208,7 +208,7 @@
          d="m 309.88277,434.58815 -29.52071,54.82621 41.41719,-32.90032 z"
          inkscape:transform-center-y="-9.0326741"
          inkscape:transform-center-x="1.7800343e-05"
-         style="fill:#C5CAE9;fill-opacity:1;stroke:none" />
+         style="fill:#3c97ce;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -216,14 +216,14 @@
          d="m 426.72149,434.94529 -29.7934,53.98078 -9.42592,55.18913 z"
          inkscape:transform-center-y="-9.0326741"
          inkscape:transform-center-x="1.609407e-05"
-         style="fill:#E8EAF6;fill-opacity:1;stroke:none" />
+         style="fill:#61b7eb;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path5101"
          d="m 280.36206,489.41436 -7.99111,-14.56861 37.51182,-40.25759 z"
          inkscape:transform-center-y="9.0326798"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#1e4c66;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -231,7 +231,7 @@
          d="m 387.50217,544.1152 39.21932,-109.16991 28.8386,53.85018 z"
          inkscape:transform-center-y="9.0326798"
          inkscape:transform-center-x="1.3724591e-05"
-         style="fill:#3F51B5;fill-opacity:1;stroke:none" />
+         style="fill:#296589;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -239,7 +239,7 @@
          d="m 280.22019,380.34483 -7.84924,94.50092 37.51182,-40.25759 z"
          inkscape:transform-center-y="-9.0326738"
          inkscape:transform-center-x="1.4136307e-05"
-         style="fill:#3949AB;fill-opacity:1;stroke:none" />
+         style="fill:#1a5a81;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -247,7 +247,7 @@
          d="m 456.61375,380.34483 -29.89226,54.60046 28.8386,53.85018 z"
          inkscape:transform-center-y="-9.0326738"
          inkscape:transform-center-x="1.4316579e-05"
-         style="fill:#7986CB;fill-opacity:1;stroke:none" />
+         style="fill:#427b9e;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -255,14 +255,14 @@
          d="m 272.37095,474.84575 -51.15286,-94.50092 59.0021,0 z"
          inkscape:transform-center-y="9.0326732"
          inkscape:transform-center-x="1.2539717e-05"
-         style="fill:#9FA8DA;fill-opacity:1;stroke:none" />
+         style="fill:#328cc2;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path5121"
          d="m 455.56009,488.79547 1.05366,-108.45064 58.754,0 z"
          inkscape:transform-center-y="9.0326732"
-         style="fill:#1A237E;fill-opacity:1;stroke:none" />
+         style="fill:#183b4f;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -270,7 +270,7 @@
          d="M 367.1282,648.85881 387.50217,544.1152 424.96714,544.084 z"
          inkscape:transform-center-y="9.0326757"
          inkscape:transform-center-x="1.7127283e-05"
-         style="fill:#1A237E;fill-opacity:1;stroke:none" />
+         style="fill:#0d3044;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/docs/images/vitess_logo_icon_size.png b/docs/images/vitess_logo_icon_size.png
index 8b427d58022..51b813d82d3 100644
Binary files a/docs/images/vitess_logo_icon_size.png and b/docs/images/vitess_logo_icon_size.png differ
diff --git a/docs/images/vitess_logo_with_border.svg b/docs/images/vitess_logo_with_border.svg
index e44d53c8b59..5c6b8a06cea 100644
--- a/docs/images/vitess_logo_with_border.svg
+++ b/docs/images/vitess_logo_with_border.svg
@@ -157,7 +157,7 @@
          d="m 367.1282,648.85881 -27.87054,-51.05696 43.91222,-28.31214 z"
          inkscape:transform-center-y="9.0326795"
          inkscape:transform-center-x="1.1278866e-05"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#254c63;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -165,7 +165,7 @@
          d="m 358.11877,523.54589 -18.86111,74.25596 43.89303,-28.23753 z"
          inkscape:transform-center-y="-9.0326324"
          inkscape:transform-center-x="1.0833444e-05"
-         style="fill:#3949AB;fill-opacity:1;stroke:none" />
+         style="fill:#265c7d;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -173,7 +173,7 @@
          d="M 339.25766,597.80185 309.81992,543.4964 358.11877,523.54589 z"
          inkscape:transform-center-y="9.0326757"
          inkscape:transform-center-x="1.4539605e-05"
-         style="fill:#9FA8DA;fill-opacity:1;stroke:none" />
+         style="fill:#3788b7;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -181,7 +181,7 @@
          d="m 321.77925,456.51404 -11.95933,86.98236 48.29885,-19.95051 z"
          inkscape:transform-center-y="-9.0326719"
          inkscape:transform-center-x="1.4539605e-05"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#1e4c66;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -189,7 +189,7 @@
          d="m 396.92809,488.92607 -28.80694,53.00636 15.02954,27.63189 z"
          inkscape:transform-center-y="-9.0326719"
          inkscape:transform-center-x="1.7127283e-05"
-         style="fill:#C5CAE9;fill-opacity:1;stroke:none" />
+         style="fill:#3e9dd7;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -197,7 +197,7 @@
          d="m 309.81992,543.4964 -29.45786,-54.08204 41.41719,-32.90032 z"
          inkscape:transform-center-y="9.0326752"
          inkscape:transform-center-x="1.6018239e-05"
-         style="fill:#5C6BC0;fill-opacity:1;stroke:none" />
+         style="fill:#2d709a;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -205,7 +205,7 @@
          d="m 424.96714,544.084 -37.46497,0.0312 68.05792,-55.31976 z"
          inkscape:transform-center-y="9.0326752"
          inkscape:transform-center-x="1.4311967e-05"
-         style="fill:#283593;fill-opacity:1;stroke:none" />
+         style="fill:#28495c;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -213,7 +213,7 @@
          d="m 309.88277,434.58815 -29.52071,54.82621 41.41719,-32.90032 z"
          inkscape:transform-center-y="-9.0326741"
          inkscape:transform-center-x="1.7800343e-05"
-         style="fill:#C5CAE9;fill-opacity:1;stroke:none" />
+         style="fill:#3c97ce;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -221,14 +221,14 @@
          d="m 426.72149,434.94529 -29.7934,53.98078 -9.42592,55.18913 z"
          inkscape:transform-center-y="-9.0326741"
          inkscape:transform-center-x="1.609407e-05"
-         style="fill:#E8EAF6;fill-opacity:1;stroke:none" />
+         style="fill:#61b7eb;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path5101"
          d="m 280.36206,489.41436 -7.99111,-14.56861 37.51182,-40.25759 z"
          inkscape:transform-center-y="9.0326798"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#1e4c66;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -236,7 +236,7 @@
          d="m 387.50217,544.1152 39.21932,-109.16991 28.8386,53.85018 z"
          inkscape:transform-center-y="9.0326798"
          inkscape:transform-center-x="1.3724591e-05"
-         style="fill:#3F51B5;fill-opacity:1;stroke:none" />
+         style="fill:#296589;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -244,7 +244,7 @@
          d="m 280.22019,380.34483 -7.84924,94.50092 37.51182,-40.25759 z"
          inkscape:transform-center-y="-9.0326738"
          inkscape:transform-center-x="1.4136307e-05"
-         style="fill:#3949AB;fill-opacity:1;stroke:none" />
+         style="fill:#1a5a81;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -252,7 +252,7 @@
          d="m 456.61375,380.34483 -29.89226,54.60046 28.8386,53.85018 z"
          inkscape:transform-center-y="-9.0326738"
          inkscape:transform-center-x="1.4316579e-05"
-         style="fill:#7986CB;fill-opacity:1;stroke:none" />
+         style="fill:#427b9e;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -260,14 +260,14 @@
          d="m 272.37095,474.84575 -51.15286,-94.50092 59.0021,0 z"
          inkscape:transform-center-y="9.0326732"
          inkscape:transform-center-x="1.2539717e-05"
-         style="fill:#9FA8DA;fill-opacity:1;stroke:none" />
+         style="fill:#328cc2;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path5121"
          d="m 455.56009,488.79547 1.05366,-108.45064 58.754,0 z"
          inkscape:transform-center-y="9.0326732"
-         style="fill:#1A237E;fill-opacity:1;stroke:none" />
+         style="fill:#183b4f;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -275,7 +275,7 @@
          d="M 367.1282,648.85881 387.50217,544.1152 424.96714,544.084 z"
          inkscape:transform-center-y="9.0326757"
          inkscape:transform-center-x="1.7127283e-05"
-         style="fill:#1A237E;fill-opacity:1;stroke:none" />
+         style="fill:#0d3044;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/docs/index.html b/docs/index.html
index 21efe304d12..3cdd4ddf62c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / </title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / "/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Vitess - Database Clustering System for Horizontal Scaling of MySQL | Vitess</title>
+<meta property="og:title" content="Vitess - Database Clustering System for Horizontal Scaling of MySQL" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/" />
+<meta property="og:url" content="http://vitess.io/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":"Vitess","description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/","headline":"Vitess - Database Clustering System for Horizontal Scaling of MySQL","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebSite","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -195,7 +204,7 @@ <h4 class="arrow-r">Internal</h4>
       <p>
         <a class="btn btn-default btn-lg" href="/getting-started/" role="button">
         <img src="/images/kubernetes.svg" style="width:30px;height:30px;margin-top:-5px"> Quickstart</a>
-        <a class="btn btn-default btn-lg" href="/getting-started/local-instance.html" role="button">Manual Build</a>
+        <a class="btn btn-default btn-lg" href="/getting-started/local-instance/" role="button">Manual Build</a>
         <a class="btn btn-default btn-lg" href="/overview/" role="button">Learn More</a>
       </p>
     </div>
@@ -209,7 +218,6 @@ <h4 class="arrow-r">Internal</h4>
   <div class="col-md-4">
     <h2><i class="fa fa-cubes"></i>&nbsp;Scalability</h2>
     <p class="desc">Vitess combines many important MySQL features with the scalability of a NoSQL database. Its built-in sharding features let you grow your database without adding sharding logic to your application.</p>
-<!--<p><a class="btn btn-default" href="/user-guide/sharding.html">View details</a></p>-->
   </div>
   <div class="col-md-4">
     <h2><i class="fa fa-fighter-jet"></i>&nbsp;Performance</h2>
@@ -225,7 +233,6 @@ <h2><i class="fa fa-dashboard"></i>&nbsp;Manageability</h2>
   <div class="col-md-4">
     <h2><i class="fa fa-share-alt"></i>&nbsp;Connection pooling</h2>
     <p class="desc">Vitess eliminates the high-memory overhead of MySQL connections. Its gRPC-based protocol lets Vitess servers easily handle thousands of connections at once.</p>
-<!--<p><a class="btn btn-default" href="/user-guide/sharding.html">View details</a></p>-->
   </div>
   <div class="col-md-4">
     <h2><i class="fa fa-object-ungroup"></i>&nbsp;Shard Management</h2>
@@ -237,6 +244,66 @@ <h2><i class="fa fa-magic"></i>&nbsp;Workflow</h2>
   </div>
 </div>
 
+<div class="page-spacer"></div>
+
+<!-- Ordering of logos: alphabetical with YouTube as exception.
+Slack and Nozzle are swapped for aesthetics, because the icons don't align well otherwise. -->
+
+<div class="row">
+  <div class="col-md-6">
+    <h2><i class="fa fa-flag-checkered"></i>&nbsp;Who uses Vitess</h2>
+    <div class="row logo-row">
+      <div class="col-md-3">
+        <img src="/images/users/youtube_logo.png" alt="YouTube" width="120">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/axon_logo.png" alt="Axon" width="60">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/bettercloud_logo.png" alt="BetterCloud" width="120">
+      </div>
+    </div>
+    <div class="row logo-row">
+      <div class="col-md-3">
+        <img src="/images/users/flipkart_logo.png" alt="Flipkart" width="120">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/hubspot_logo.png" alt="Hubspot" width="120">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/slack_logo.png" alt="Slack" width="120">
+      </div>
+    </div>
+    <div class="row logo-row">
+      <div class="col-md-3">
+        <img src="/images/users/pixel_federation_logo.png" alt="Pixel Federation" width="100">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/quiz_of_kings_logo.jpg" alt="Quiz of Kings" width="100">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/nozzle_logo.png" alt="Nozzle" width="60">
+      </div>
+    </div>
+    <div class="row logo-row">
+      <div class="col-md-3">
+        <img src="/images/users/square_logo.png" alt="Square" width="120">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/stitchlabs_logo.png" alt="Stitch Labs" width="120">
+      </div>
+    </div>
+  </div>
+  <div class="col-md-6">
+    <h2><i class="fa fa-rocket"></i>&nbsp;An Introduction to Vitess</h2>
+    <div class="row">
+      <div class="col-md-12">
+        <iframe width="480" height="270" src="https://www.youtube.com/embed/q65TleTn2vg?rel=0" frameborder="0" allowfullscreen></iframe>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!--
 ## Contact
 
diff --git a/docs/internal/index.html b/docs/internal/index.html
index dedc252eaed..819b06c7ba6 100644
--- a/docs/internal/index.html
+++ b/docs/internal/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Overview</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Overview"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Overview | Vitess</title>
+<meta property="og:title" content="Overview" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/internal/" />
+<meta property="og:url" content="http://vitess.io/internal/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/internal/","headline":"Overview","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Overview</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
diff --git a/docs/internal/publish-website.html b/docs/internal/publish-website.html
index 9bbd089e328..a45840a3e13 100644
--- a/docs/internal/publish-website.html
+++ b/docs/internal/publish-website.html
@@ -1,538 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Publish Website</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Publish Website"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Publish Website</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="publishing-vitess-io-web-site">Publishing vitess.io Web Site</h1>
-
-<h2 id="overview">Overview</h2>
-
-<p>Our website <a href="http://vitess.io">vitess.io</a> are static HTML pages which are
-generated by <a href="https://github.com/jekyll/jekyll">Jekyll</a> from Markdown files
-located in the <a href="https://github.com/youtube/vitess/tree/master/doc"><code class="prettyprint">doc/</code></a>
-directory.</p>
-
-<p>The generated files will be put in the
-<a href="https://github.com/youtube/vitess/tree/master/docs"><code class="prettyprint">docs/</code></a> directory (note
-the extra <strong>s</strong>). GitHub serves the website from this directory off the master
-branch.</p>
-
-<h2 id="tl-dr">TL;DR</h2>
-
-<h3 id="to-preview-site-locally">To preview site locally</h3>
-
-<ul>
-<li><p>Run:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">./vitess.io/publish-site.sh
-</code></pre></div></li>
-<li><p>Site should be live at localhost:4000</p></li>
-</ul>
-
-<h3 id="to-publish-the-site">To publish the site</h3>
-
-<ul>
-<li>  Make sure your doc and site changes have been committed to your branch and
-your branch is clean.</li>
-<li><p>Run:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">./vitess.io/publish-site.sh
-</code></pre></div></li>
-<li><p>Sanity check the diffs.</p>
-
-<ul>
-<li>  <code class="prettyprint">git diff HEAD~</code></li>
-</ul></li>
-<li><p>Create a pull request for your branch and let somebody review it.</p></li>
-<li><p>Merge the pull request into the master branch.</p></li>
-</ul>
-
-<h2 id="details">Details</h2>
-
-<h3 id="directory-structure">Directory Structure</h3>
-
-<p>We have three main directories:</p>
-
-<ul>
-<li>  <a href="https://github.com/youtube/vitess/tree/master/doc"><code class="prettyprint">doc/</code></a> - original
-content</li>
-<li>  <a href="https://github.com/youtube/vitess/tree/master/docs"><code class="prettyprint">docs/</code></a> - generated
-website actually served at <a href="http://vitess.io/">http://vitess.io/</a></li>
-<li>  <a href="https://github.com/youtube/vitess/tree/master/vitess.io"><code class="prettyprint">vitess.io/</code></a> -
-all relevant files for the website e.g.
-
-<ul>
-<li>  Jekyll configuration</li>
-<li>  images e.g. our logo</li>
-<li>  CSS</li>
-<li>  <a href="https://github.com/youtube/vitess/blob/master/vitess.io/_includes/left-nav-menu.html">Navigation
-menu</a></li>
-<li>  boiler plate markdown files which include the actual content from the
-<code class="prettyprint">doc/</code> directory
-(<a href="https://github.com/youtube/vitess/blob/master/vitess.io/contributing/github-workflow.md">example</a>)</li>
-</ul></li>
-</ul>
-
-<p>The boiler plate markdown files have multiple purposes:</p>
-
-<ul>
-<li>  feed the actual content into a template which adds e.g. the navigation to
-the file</li>
-<li>  re-arrange paths on the website e.g.
-<a href="https://github.com/youtube/vitess/blob/master/doc/GitHubWorkflow.md"><code class="prettyprint">doc/GitHubWorkFlow.md</code></a>
-is actually served as <a href="http://vitess.io/contributing/github-workflow.html">http://vitess.io/contributing/github-workflow.html</a>
-because there is the file
-<a href="https://github.com/youtube/vitess/blob/master/vitess.io/contributing/github-workflow.md"><code class="prettyprint">vitess.io/vitess.io/contributing/github-workflow.md</code></a>.</li>
-</ul>
-
-<h3 id="changing-content">Changing Content</h3>
-
-<p>To modify our website, you need to:</p>
-
-<ul>
-<li>  change the underlying Markdown files in the <code class="prettyprint">doc/</code> directory</li>
-<li>  re-generate the static pages (see <a href="#to-publish-the-site"><code class="prettyprint">publish-site.sh</code>
-above</a>)</li>
-<li>  merge your changes into the master branch e.g. as pull request</li>
-</ul>
-
-<h3 id="adding-new-pages">Adding new Pages</h3>
-
-<p>If you want to add a new page, you must also:</p>
-
-<ul>
-<li>  add it to the left menu:
-<a href="https://github.com/youtube/vitess/blob/master/vitess.io/_includes/left-nav-menu.html"><code class="prettyprint">vitess.io/_includes/left-nav-menu.html</code></a></li>
-<li>  create a boiler plate .md file. Example:
-<a href="https://github.com/youtube/vitess/blob/master/vitess.io/contributing/github-workflow.md"><code class="prettyprint">vitess.io/contributing/github-workflow.md</code></a></li>
-</ul>
-
-<p>When you add a new section to the menu, please create a new directory below
-<code class="prettyprint">vitess.io/</code>. For example, the &quot;Contributing&quot; section is served out of
-<code class="prettyprint">vitess.io/contributing/</code>.</p>
-
-<p>The main file in the section should have <code class="prettyprint">index.md</code> as its boiler plate counter
-part. Example: <code class="prettyprint">doc/Contributing.md</code> is included by
-<code class="prettyprint">vitess.io/contributing/index.md</code> and therefore served as
-<a href="http://vitess.io/contributing/">http://vitess.io/contributing/</a>.</p>
-
-<h3 id="links">Links</h3>
-
-<p>Please always use absolute paths with a leading <code class="prettyprint">/</code> e.g. in links to other
-documents or images.</p>
-
-<p><strong>Right:</strong></p>
-
-<ul>
-<li>  <code class="prettyprint">/user-guide/troubleshooting.html</code></li>
-</ul>
-
-<p><strong>Wrong:</strong></p>
-
-<ul>
-<li>  <code class="prettyprint">../troubleshooting.html</code></li>
-<li>  <code class="prettyprint">http://vitess.io/user-guide/troubleshooting.html</code></li>
-</ul>
-
-<h3 id="orphaned-doc-markdown-files">Orphaned doc/ Markdown Files</h3>
-
-<p>There are several files in <code class="prettyprint">doc/</code> which are currently not visible on
-<a href="http://vitess.io">http://vitess.io</a>.</p>
-
-<p>Examples:</p>
-
-<ul>
-<li>  <a href="https://github.com/youtube/vitess/blob/master/doc/LifeOfAQuery.md">https://github.com/youtube/vitess/blob/master/doc/LifeOfAQuery.md</a></li>
-<li>  <a href="https://github.com/youtube/vitess/blob/master/doc/V3VindexDesign.md">https://github.com/youtube/vitess/blob/master/doc/V3VindexDesign.md</a></li>
-</ul>
-
-<p>This is fine and accepted. Users can still view them on GitHub.com.</p>
-
-<p>Note that these files should include images using the full path e.g. in
-<code class="prettyprint">LifeOfAQuery.md</code>:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">![](https://raw.githubusercontent.com/youtube/vitess/master/doc/life_of_a_query.png)
-</code></pre></div>
-<p>Otherwise GitHub cannot find and show the images.</p>
-
-<h2 id="jekyll-install-instructions">Jekyll Install Instructions</h2>
-
-<p>This section describes how to install Jekyll to generate the website.</p>
-
-<h3 id="the-easy-way">The Easy Way</h3>
-
-<ul>
-<li>  Install Docker.</li>
-<li>  Run the <code class="prettyprint">./vitess.io/preview-site.sh</code> and <code class="prettyprint">./vitess.io/publish-site.sh</code> commands as shown above.</li>
-</ul>
-
-<h3 id="the-hard-way">The Hard Way</h3>
-
-<ul>
-<li>  On Ubuntu, you need a non-root Ruby install so gem packages can be
-installed correctly.
-
-<ul>
-<li>  <a href="https://github.com/sstephenson/rbenv#installation">Install rbenv</a>.</li>
-<li>  Close and re-open your shell to complete the installation.</li>
-<li>  <a href="https://github.com/sstephenson/ruby-build#installation">Install
-ruby-build</a>
-plugin for rbenv.</li>
-<li>  Use rbenv to build a recent version of Ruby.</li>
-<li>  rbenv install 2.2.3</li>
-<li>  You may need to install extra dependencies. The build output should tell
-you which packages. For example: <code class="prettyprint">sudo apt-get install -y libreadline-dev</code></li>
-<li>  Set the new Ruby as the system-wide default.
-
-<ul>
-<li>  <code class="prettyprint">rbenv global 2.2.3</code></li>
-<li>  <code class="prettyprint">rbenv rehash</code></li>
-</ul></li>
-</ul></li>
-<li>  Install bundler.
-
-<ul>
-<li>  <code class="prettyprint">gem install bundler</code></li>
-</ul></li>
-<li>  Install &quot;nodejs&quot; as JavaScript runtime.
-
-<ul>
-<li>  <code class="prettyprint">sudo apt-get install nodejs</code></li>
-<li>  In Ubuntu, the binary is unfortunately renamed from &quot;node&quot; to &quot;nodejs&quot;.
-We work-around this by creating a &quot;node&quot; symlink on a directory which is
-early in the PATH list: <code class="prettyprint">ln -s /usr/bin/nodejs $HOME/.rbenv/bin/node</code></li>
-</ul></li>
-<li>  Add <code class="prettyprint">--docker=false</code> to the commands above.</li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/internal/publish-website/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/internal/publish-website/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/internal/publish-website/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/internal/publish-website/"</script>
 </html>
diff --git a/docs/internal/publish-website/index.html b/docs/internal/publish-website/index.html
new file mode 100644
index 00000000000..e1b62c93ee0
--- /dev/null
+++ b/docs/internal/publish-website/index.html
@@ -0,0 +1,539 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Publish Website | Vitess</title>
+<meta property="og:title" content="Publish Website" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/internal/publish-website/" />
+<meta property="og:url" content="http://vitess.io/internal/publish-website/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/internal/publish-website/","headline":"Publish Website","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Publish Website</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="publishing-vitess-io-web-site">Publishing vitess.io Web Site</h1>
+
+<h2 id="overview">Overview</h2>
+
+<p>Our website <a href="http://vitess.io">vitess.io</a> are static HTML pages which are
+generated by <a href="https://github.com/jekyll/jekyll">Jekyll</a> from Markdown files
+located in the <a href="https://github.com/youtube/vitess/tree/master/doc"><code class="prettyprint">doc/</code></a>
+directory.</p>
+
+<p>The generated files will be put in the
+<a href="https://github.com/youtube/vitess/tree/master/docs"><code class="prettyprint">docs/</code></a> directory (note
+the extra <strong>s</strong>). GitHub serves the website from this directory off the master
+branch.</p>
+
+<h2 id="tl-dr">TL;DR</h2>
+
+<h3 id="to-preview-site-locally">To preview site locally</h3>
+
+<ul>
+<li><p>Run:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">./vitess.io/publish-site.sh
+</code></pre></div></li>
+<li><p>Site should be live at localhost:4000</p></li>
+</ul>
+
+<h3 id="to-publish-the-site">To publish the site</h3>
+
+<ul>
+<li>  Make sure your doc and site changes have been committed to your branch and
+your branch is clean.</li>
+<li><p>Run:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">./vitess.io/publish-site.sh
+</code></pre></div></li>
+<li><p>Sanity check the diffs.</p>
+
+<ul>
+<li>  <code class="prettyprint">git diff HEAD~</code></li>
+</ul></li>
+<li><p>Create a pull request for your branch and let somebody review it.</p></li>
+<li><p>Merge the pull request into the master branch.</p></li>
+</ul>
+
+<h2 id="details">Details</h2>
+
+<h3 id="directory-structure">Directory Structure</h3>
+
+<p>We have three main directories:</p>
+
+<ul>
+<li>  <a href="https://github.com/youtube/vitess/tree/master/doc"><code class="prettyprint">doc/</code></a> - original
+content</li>
+<li>  <a href="https://github.com/youtube/vitess/tree/master/docs"><code class="prettyprint">docs/</code></a> - generated
+website actually served at <a href="http://vitess.io/">http://vitess.io/</a></li>
+<li>  <a href="https://github.com/youtube/vitess/tree/master/vitess.io"><code class="prettyprint">vitess.io/</code></a> -
+all relevant files for the website e.g.
+
+<ul>
+<li>  Jekyll configuration</li>
+<li>  images e.g. our logo</li>
+<li>  CSS</li>
+<li>  <a href="https://github.com/youtube/vitess/blob/master/vitess.io/_includes/left-nav-menu.html">Navigation
+menu</a></li>
+<li>  boiler plate markdown files which include the actual content from the
+<code class="prettyprint">doc/</code> directory
+(<a href="https://github.com/youtube/vitess/blob/master/vitess.io/contributing/github-workflow.md">example</a>)</li>
+</ul></li>
+</ul>
+
+<p>The boiler plate markdown files have multiple purposes:</p>
+
+<ul>
+<li>  feed the actual content into a template which adds e.g. the navigation to
+the file</li>
+<li>  re-arrange paths on the website e.g.
+<a href="https://github.com/youtube/vitess/blob/master/doc/GitHubWorkflow.md"><code class="prettyprint">doc/GitHubWorkFlow.md</code></a>
+is actually served as <a href="http://vitess.io/contributing/github-workflow/">http://vitess.io/contributing/github-workflow/</a>
+because there is the file
+<a href="https://github.com/youtube/vitess/blob/master/vitess.io/contributing/github-workflow.md"><code class="prettyprint">vitess.io/contributing/github-workflow.md</code></a>.</li>
+</ul>
+
+<h3 id="changing-content">Changing Content</h3>
+
+<p>To modify our website, you need to:</p>
+
+<ul>
+<li>  change the underlying Markdown files in the <code class="prettyprint">doc/</code> directory</li>
+<li>  re-generate the static pages (see <a href="#to-publish-the-site"><code class="prettyprint">publish-site.sh</code>
+above</a>)</li>
+<li>  merge your changes into the master branch e.g. as pull request</li>
+</ul>
+
+<h3 id="linking-pages">Linking pages</h3>
+
+<p>Always use the <code class="prettyprint">{% link ... %}</code> template tag to link other pages.</p>
+
+<p>Note that you have to refer to the <code class="prettyprint">.md</code> file of the page. Example:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">[GitHub Workflow page]({% link contributing/github-workflow.md %})
+</code></pre></div>
+<h3 id="adding-new-pages">Adding new Pages</h3>
+
+<p>If you want to add a new page, you must also:</p>
+
+<ul>
+<li>  add it to the left menu:
+<a href="https://github.com/youtube/vitess/blob/master/vitess.io/_includes/left-nav-menu.html"><code class="prettyprint">vitess.io/_includes/left-nav-menu.html</code></a></li>
+<li>  create a boiler plate .md file. Example:
+<a href="https://github.com/youtube/vitess/blob/master/vitess.io/contributing/github-workflow.md"><code class="prettyprint">vitess.io/contributing/github-workflow.md</code></a></li>
+</ul>
+
+<p>When you add a new section to the menu, please create a new directory below
+<code class="prettyprint">vitess.io/</code>. For example, the &quot;Contributing&quot; section is served out of
+<code class="prettyprint">vitess.io/contributing/</code>.</p>
+
+<p>The main file in the section should have <code class="prettyprint">index.md</code> as its boiler plate counter
+part. Example: <code class="prettyprint">doc/Contributing.md</code> is included by
+<code class="prettyprint">vitess.io/contributing/index.md</code> and therefore served as
+<a href="http://vitess.io/contributing/">http://vitess.io/contributing/</a>.</p>
+
+<p>Make sure that you use <code class="prettyprint">{% link ... %}</code> to generate the URLs.
+See existing entries for examples.</p>
+
+<h3 id="orphaned-doc-markdown-files">Orphaned doc/ Markdown Files</h3>
+
+<p>There are several files in <code class="prettyprint">doc/</code> which are currently not visible on
+<a href="http://vitess.io">http://vitess.io</a>.</p>
+
+<p>Examples:</p>
+
+<ul>
+<li>  <a href="https://github.com/youtube/vitess/blob/master/doc/LifeOfAQuery.md">https://github.com/youtube/vitess/blob/master/doc/LifeOfAQuery.md</a></li>
+<li>  <a href="https://github.com/youtube/vitess/blob/master/doc/V3VindexDesign.md">https://github.com/youtube/vitess/blob/master/doc/V3VindexDesign.md</a></li>
+</ul>
+
+<p>This is fine and accepted. Users can still view them on GitHub.com.</p>
+
+<p>Note that these files should include images using the full path e.g. in
+<code class="prettyprint">LifeOfAQuery.md</code>:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">![](https://raw.githubusercontent.com/youtube/vitess/master/doc/life_of_a_query.png)
+</code></pre></div>
+<p>Otherwise GitHub cannot find and show the images.</p>
+
+<h2 id="jekyll-install-instructions">Jekyll Install Instructions</h2>
+
+<p>This section describes how to install Jekyll to generate the website.</p>
+
+<h3 id="the-easy-way">The Easy Way</h3>
+
+<ul>
+<li>  Install Docker.</li>
+<li>  Run the <code class="prettyprint">./vitess.io/preview-site.sh</code> and <code class="prettyprint">./vitess.io/publish-site.sh</code> commands as shown above.</li>
+</ul>
+
+<h3 id="the-hard-way">The Hard Way</h3>
+
+<ul>
+<li>  On Ubuntu, you need a non-root Ruby install so gem packages can be
+installed correctly.
+
+<ul>
+<li>  <a href="https://github.com/sstephenson/rbenv#installation">Install rbenv</a>.</li>
+<li>  Close and re-open your shell to complete the installation.</li>
+<li>  <a href="https://github.com/sstephenson/ruby-build#installation">Install
+ruby-build</a>
+plugin for rbenv.</li>
+<li>  Use rbenv to build a recent version of Ruby.</li>
+<li>  rbenv install 2.2.3</li>
+<li>  You may need to install extra dependencies. The build output should tell
+you which packages. For example: <code class="prettyprint">sudo apt-get install -y libreadline-dev</code></li>
+<li>  Set the new Ruby as the system-wide default.
+
+<ul>
+<li>  <code class="prettyprint">rbenv global 2.2.3</code></li>
+<li>  <code class="prettyprint">rbenv rehash</code></li>
+</ul></li>
+</ul></li>
+<li>  Install bundler.
+
+<ul>
+<li>  <code class="prettyprint">gem install bundler</code></li>
+</ul></li>
+<li>  Install &quot;nodejs&quot; as JavaScript runtime.
+
+<ul>
+<li>  <code class="prettyprint">sudo apt-get install nodejs</code></li>
+<li>  In Ubuntu, the binary is unfortunately renamed from &quot;node&quot; to &quot;nodejs&quot;.
+We work-around this by creating a &quot;node&quot; symlink on a directory which is
+early in the PATH list: <code class="prettyprint">ln -s /usr/bin/nodejs $HOME/.rbenv/bin/node</code></li>
+</ul></li>
+<li>  Add <code class="prettyprint">--docker=false</code> to the commands above.</li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/internal/release-instructions.html b/docs/internal/release-instructions/index.html
similarity index 78%
rename from docs/internal/release-instructions.html
rename to docs/internal/release-instructions/index.html
index 746a8483e24..b9a8d28aa03 100644
--- a/docs/internal/release-instructions.html
+++ b/docs/internal/release-instructions/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Release Instructions</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Release Instructions"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Release Instructions | Vitess</title>
+<meta property="og:title" content="Release Instructions" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/internal/release-instructions/" />
+<meta property="og:url" content="http://vitess.io/internal/release-instructions/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/internal/release-instructions/","headline":"Release Instructions","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Release Instructions</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -460,7 +469,7 @@ <h2 id="testing">Testing</h2>
 
 <h3 id="local-tutorial">Local Tutorial</h3>
 
-<p>We must check that the <a href="http://vitess.io/getting-started/local-instance.html#start-a-vitess-cluster">local startup
+<p>We must check that the <a href="/getting-started/local-instance/#start-a-vitess-cluster">local startup
 tutorial</a>
 is not broken.</p>
 
@@ -472,7 +481,7 @@ <h3 id="local-tutorial">Local Tutorial</h3>
 </code></pre></div>
 <h3 id="kubernetes-tutorial">Kubernetes Tutorial</h3>
 
-<p>Follow the <a href="http://vitess.io/getting-started/">Kubernetes tutorial</a>, which will
+<p>Follow the <a href="/getting-started/">Kubernetes tutorial</a>, which will
 automatically use the latest Docker images you pushed.</p>
 
 <p>TODO(mberlin): Describe how to launch our new cluster tests in <code class="prettyprint">test/cluster</code>
diff --git a/docs/overview/concepts.html b/docs/overview/concepts/index.html
similarity index 75%
rename from docs/overview/concepts.html
rename to docs/overview/concepts/index.html
index 3bbfb77f480..3385b56119f 100644
--- a/docs/overview/concepts.html
+++ b/docs/overview/concepts/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Key Concepts</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Key Concepts"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Key Concepts | Vitess</title>
+<meta property="og:title" content="Key Concepts" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Understand common terms used in Vitess." />
+<meta property="og:description" content="Understand common terms used in Vitess." />
+<link rel="canonical" href="http://vitess.io/overview/concepts/" />
+<meta property="og:url" content="http://vitess.io/overview/concepts/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Understand common terms used in Vitess.","url":"http://vitess.io/overview/concepts/","headline":"Key Concepts","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Key Concepts</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -330,7 +339,7 @@ <h2 id="keyspace">Keyspace</h2>
 <h2 id="keyspace-id">Keyspace ID</h2>
 
 <p>The <em>keyspace ID</em> is the value that is used to decide on which shard a given
-record lives. <a href="http://vitess.io/user-guide/sharding.html#range-based-sharding">Range-based Sharding</a>
+record lives. <a href="/user-guide/sharding/#range-based-sharding">Range-based Sharding</a>
 refers to creating shards that each cover a particular range of keyspace IDs.</p>
 
 <p>Often, the keyspace ID is computed as the hash of some column in your data,
@@ -361,7 +370,7 @@ <h2 id="shard">Shard</h2>
 
 <h3 id="resharding">Resharding</h3>
 
-<p>Vitess supports <a href="http://vitess.io/user-guide/sharding.html#resharding">dynamic resharding</a>,
+<p>Vitess supports <a href="/user-guide/sharding/#resharding">dynamic resharding</a>,
 in which the number of shards is changed on a live cluster. This can be either
 splitting one or more shards into smaller pieces, or merging neighboring shards
 into bigger pieces.</p>
@@ -458,14 +467,14 @@ <h2 id="replication-graph">Replication Graph</h2>
 
 <h2 id="topology-service">Topology Service</h2>
 
-<p>The <em><a href="/user-guide/topology-service.html">Topology Service</a></em>
+<p>The <em><a href="/user-guide/topology-service/">Topology Service</a></em>
 is a set of backend processes running on different servers.
 Those servers store topology data and provide a distributed locking service.</p>
 
 <p>Vitess uses a plug-in system to support various backends for storing topology
 data, which are assumed to provide a distributed, consistent key-value store.
-By default, our <a href="http://vitess.io/getting-started/local-instance.html">local example</a>
-uses the ZooKeeper plugin, and the <a href="http://vitess.io/getting-started/">Kubernetes example</a>
+By default, our <a href="/getting-started/local-instance/">local example</a>
+uses the ZooKeeper plugin, and the <a href="/getting-started/">Kubernetes example</a>
 uses etcd.</p>
 
 <p>The topology service exists for several reasons:</p>
diff --git a/docs/overview/index.html b/docs/overview/index.html
index e18a2df4407..cf6f122d4b4 100644
--- a/docs/overview/index.html
+++ b/docs/overview/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Understanding Vitess </title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Understanding Vitess "/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Understanding Vitess | Vitess</title>
+<meta property="og:title" content="Understanding Vitess" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Learn about core Vitess features and how Vitess stacks up against data storage alternatives." />
+<meta property="og:description" content="Learn about core Vitess features and how Vitess stacks up against data storage alternatives." />
+<link rel="canonical" href="http://vitess.io/overview/" />
+<meta property="og:url" content="http://vitess.io/overview/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Learn about core Vitess features and how Vitess stacks up against data storage alternatives.","url":"http://vitess.io/overview/","headline":"Understanding Vitess","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -192,7 +201,7 @@ <h4 class="arrow-r">Internal</h4>
   <div class="container">
     <div class="row">
       <div class="col-md-9">
-        <h1>Understanding Vitess </h1>
+        <h1>Understanding Vitess</h1>
       </div>
     </div>
   </div>
@@ -207,8 +216,8 @@ <h1>Understanding Vitess </h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -455,7 +464,7 @@ <h2 id="architecture">Architecture</h2>
 
 <h3 id="topology">Topology</h3>
 
-<p>The <a href="/user-guide/topology-service.html">Topology Service</a> is a metadata store that contains information about running servers, the sharding scheme, and the replication graph.  The topology is backed by a consistent data store.  You can explore the topology using <strong>vtctl</strong> (command-line) and <strong>vtctld</strong> (web).</p>
+<p>The <a href="/user-guide/topology-service/">Topology Service</a> is a metadata store that contains information about running servers, the sharding scheme, and the replication graph.  The topology is backed by a consistent data store.  You can explore the topology using <strong>vtctl</strong> (command-line) and <strong>vtctld</strong> (web).</p>
 
 <p>In Kubernetes, the data store is <a href="https://github.com/coreos/etcd">etcd</a>.  Vitess source code also ships with <a href="http://zookeeper.apache.org/">Apache ZooKeeper</a> support.</p>
 
@@ -469,7 +478,7 @@ <h3 id="vttablet">vttablet</h3>
 
 <p><strong>vttablet</strong> is a proxy server that sits in front of a MySQL database. A Vitess implementation has one vttablet for each MySQL instance.</p>
 
-<p>vttablet performs tasks that attempt to maximize throughput as well as protect MySQL from harmful queries. Its features include connection pooling, query rewriting, and query de-duping. In addition, vttablet executes management tasks that vtctl initiates, and it provides streaming services that are used for <a href="/user-guide/sharding.html#filtered-replication">filtered replication</a> and data exports.</p>
+<p>vttablet performs tasks that attempt to maximize throughput as well as protect MySQL from harmful queries. Its features include connection pooling, query rewriting, and query de-duping. In addition, vttablet executes management tasks that vtctl initiates, and it provides streaming services that are used for <a href="/user-guide/sharding/#filtered-replication">filtered replication</a> and data exports.</p>
 
 <p>A lightweight Vitess implementation uses vttablet as a smart connection proxy that serves queries for a single MySQL database. By running vttablet in front of your MySQL database and changing your app to use the Vitess client instead of your MySQL driver, your app benefits from vttablet&#39;s connection pooling, query rewriting, and query de-duping features.</p>
 
diff --git a/docs/overview/scaling-mysql.html b/docs/overview/scaling-mysql.html
index a24d7340b07..008a8dfd90e 100644
--- a/docs/overview/scaling-mysql.html
+++ b/docs/overview/scaling-mysql.html
@@ -1,519 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Understanding Vitess </title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Understanding Vitess "/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Understanding Vitess </h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>Traditionally, it&#39;s been difficult to scale a MySQL-based database to an arbitrary size. Since MySQL lacks the out-of-the-box multi-instance support required to really scale an application, the process can be complex and obscure.</p>
-
-<p>As the application grows, scripts emerge to back up data, migrate a master database, or run some offline data processing. Complexity creeps into the application layer, which increasingly needs to be aware of database details. And before we know it, any change needs a big engineering effort so we can keep scaling.</p>
-
-<p>Vitess grew out of YouTube&#39;s attempt to break this cycle, and YouTube decided to open source Vitess after realizing that this is a very common problem. Vitess simplifies every aspect of managing a MySQL cluster, allowing easy scaling to any size without complicating your application layer. It ensures your database can keep up when your application takes off, leaving you with a database that is flexible, secure, and easy to mine.</p>
-
-<p>This document talks about the process of moving from a single small database to a limitless database cluster. It explains how steps in that process influenced Vitess&#39; design, linking to relevant parts of the Vitess documentation along the way. It concludes with tips for designing a new, highly scalable application and database schema.</p>
-
-<h2 id="getting-started">Getting started</h2>
-
-<p>Vitess sits between your application and your MySQL database. It looks at incoming queries and routes them properly. So, instead of sending a query directly from your application to your database, you send it through Vitess, which understands your database topology and constantly monitors the health of individual database instances.</p>
-
-<p>While Vitess is designed to manage large, multi-instance databases, it offers features that simplify database setup and management at all stages of your product&#39;s lifecycle. </p>
-
-<p>Starting out, our first step is getting a simple, reliable, durable database cluster in place with a master instance and a couple of replicas. In Vitess terminology, that&#39;s a single-shard, single-keyspace database. Once that building block is in place, we can focus on replicating it to scale up.</p>
-
-<h3 id="planning-for-scale">Planning for scale</h3>
-
-<p>We recommend a number of best practices to facilitate scaling your database as your product evolves. You might not experience the benefits of these actions immediately, but adopting these practices from day one will make it much easier for your database and product to grow:</p>
-
-<ul>
-<li>Always keep your database schema under source control and provide unit test coverage of that schema. Also check schema changes into source control and run unit tests against the newly modified schema.</li>
-<li>Think about appropriate sharding keys for your data and structure that data accordingly. Usually, sharding keys are obvious -- e.g. a user ID. However, having your key(s) in place ahead of time is much easier than needing to retrofit your data before you can actually shard it.</li>
-<li>Group tables that share the same sharding key. Similarly, split tables that don’t share the same sharding key into different keyspaces.</li>
-<li>Avoid cross-shard queries (scatter queries). Instead, use MapReduce for offline queries and build Spark data processing pipelines for online queries. Usually, it is faster to extract raw data and then post-process it in the MapReduce framework.</li>
-<li>Plan to have data in multiple data centers and regions. It is easier to migrate to multiple data centers if you&#39;ve planned for incoming queries to be routed to a region or application server pool that, in turn, connects to the right database pool.</li>
-</ul>
-
-<h2 id="step-1-setting-up-a-database-cluster">Step 1: Setting up a database cluster</h2>
-
-<p>At the outset, plan to create a database cluster that has a master instance and a couple of read-only replicas (or slaves). The replicas would be able to take over if the master became unavailable, and they might also handle read-only traffic. You&#39;d also want to schedule regular data backups.</p>
-
-<p>It&#39;s worth noting that master management is a complex and critical challenge for data reliability. At any given time, a shard has only one master instance, and all replica instances replicate from it. Your application -- either a component in your application layer or Vitess, if you are using it -- needs to be able to easily identify the master instance for write operations, recognizing that the master might change from time to time. Similarly, your application, with or without Vitess, should be able to seamlessly adapt to new replicas coming online or old ones being unavailable.</p>
-
-<h3 id="keep-routing-logic-out-of-your-application">Keep routing logic out of your application</h3>
-
-<p>A core principle underlying Vitess&#39; design is that your database and data management practices should always be ready to support your application&#39;s growth. So, you might not yet have an immediate need to store data in multiple data centers, shard your database, or even do regular backups. But when those needs arise, you want to be sure that you&#39;ll have an easy path to achieve them. Note that you can run Vitess in a Kubernetes cluster or on local hardware. </p>
-
-<p>With that in mind, you want to have a plan that allows your database to grow without complicating your application code. For example, if you reshard your database, your application code shouldn&#39;t need to change to identify the target shards for a particular query.</p>
-
-<p>Vitess has several components that keep this complexity out of your application:</p>
-
-<ul>
-<li>Each MySQL instance is paired with a <strong>vttablet</strong> process, which provides features like connection pooling, query rewriting, and query de-duping.</li>
-<li>Your application sends queries to <strong>vtgate</strong>, a light proxy that routes traffic to the correct vttablet(s) and then returns consolidated results to the application.</li>
-<li>The <strong>Topology Service</strong> -- Vitess supports Zookeeper and etcd -- maintains configuration data for the database system. Vitess relies on the service to know where to route queries based on both the sharding scheme and the availability of individual MySQL instances.</li>
-<li>The <strong>vtctl</strong> and <strong>vtctld</strong> tools offer command-line and web interfaces to the system.</li>
-</ul>
-
-<div style="overflow-x: scroll">
-<img src="https://raw.githubusercontent.com/youtube/vitess/master/doc/VitessOverview.png" alt="Diagram showing Vitess implementation" width="585" height="300"/>
-</div>
-
-<p>Setting up these components directly -- for example, writing your own topology service or your own implementation of vtgate -- would require a lot of scripting specific to a given configuration. It would also yield a system that would be difficult and costly to support. In addition, while any one of the components on its own is useful in limiting complexity, you need all of them to keep your application as simple as possible while also optimizing performance.</p>
-
-<p><strong>Optional functionality to implement</strong></p>
-
-<ul>
-<li><p><em>Recommended</em>.  Vitess has basic support for identifying or changing a master, but it doesn&#39;t aim to fully address this feature. As such, we recommend using another program, like <a href="https://github.com/github/orchestrator">Orchestrator</a>, to monitor the health of your servers and to change your master database when necessary. (In a sharded database, each shard has a master.)</p></li>
-<li><p><em>Recommended</em>. You should have a way to monitor your database topology and set up alerts as needed. Vitess components facilitate this monitoring by exporting a lot of runtime variables, like QPS over the last few minutes, error rates, and query latency. The variables are exported in JSON format, and Vitess also supports an InfluxDB plug-in.</p></li>
-<li><p><em>Optional</em>. Using the Kubernetes scripts as a base, you could run Vitess components with other configuration management systems (like Puppet) or frameworks (like Mesos or AWS images).</p></li>
-</ul>
-
-<p><strong>Related Vitess documentation:</strong></p>
-
-<ul>
-<li><a href="http://vitess.io/getting-started/">Running Vitess on Kubernetes</a></li>
-<li><a href="http://vitess.io/getting-started/local-instance.html">Running Vitess on a local server</a></li>
-<li><a href="http://vitess.io/user-guide/backup-and-restore.html">Backing up data</a></li>
-<li><a href="http://vitess.io/user-guide/reparenting.html">Reparenting - basic assignment of master instance in Vitess</a></li>
-</ul>
-
-<h2 id="step-2-connect-your-application-to-your-database">Step 2: Connect your application to your database</h2>
-
-<p>Obviously, your application needs to be able to call your database. So, we&#39;ll jump straight to explaining how you&#39;d modify your application to connect to your database through vtgate.</p>
-
-<h3 id="using-the-vitess-connector">Using the Vitess connector</h3>
-
-<p>The main protocol for connecting to Vitess is <a href="http://www.grpc.io/">gRPC</a>. The connection lets the application see the database and send queries to it. The queries are virtually identical to the ones the application would send directly to MySQL.</p>
-
-<p>Vitess supports connections for several languages:</p>
-
-<ul>
-<li><strong>Go</strong>: We provide a sql/database driver.</li>
-<li><strong>Java</strong>: We provide a library that wraps the gRPC code and a JDBC driver.</li>
-<li><strong>PHP</strong>: We provide a library that wraps the gRPC code and a PDO driver.</li>
-<li><strong>Python</strong>: We provide a library that wraps the gRPC code and a PEP-compliant driver.</li>
-</ul>
-
-<h4 id="unit-testing-database-interactions">Unit testing database interactions</h4>
-
-<p>The vttest library and executables provide a unit testing environment that lets you start a fake cluster that acts as an exact replica of your production environment for testing purposes. In the fake cluster, a single DB instance hosts all of your shards.</p>
-
-<h3 id="migrating-production-data-to-vitess">Migrating production data to Vitess</h3>
-
-<p>The easiest way to migrate data to your Vitess database is to take a backup of your existing data, restore it on the Vitess cluster, and go from there. However, that requires some downtime.</p>
-
-<p>Another, more complicated approach, is a live migration, which requires your application to support both direct MySQL access and Vitess access. In that approach, you&#39;d enable MySQL replication from your source database to the Vitess master database. This would allow you to migrate quickly and with almost no downtime.</p>
-
-<p>Note that this path is highly dependent on the source setup. Thus, while Vitess provides helper tools, it does not offer a generic way to support this type of migration.</p>
-
-<p><strong>Related Vitess documentation:</strong></p>
-
-<ul>
-<li><a href="http://vitess.io/reference/vitess-api.html">Vitess API Reference</a></li>
-<li><a href="http://vitess.io/user-guide/schema-management.html">Schema Management</a></li>
-<li><a href="http://vitess.io/user-guide/transport-security-model.html">Transport Security Model</a></li>
-</ul>
-
-<h2 id="step-3-vertical-sharding-scaling-to-multiple-keyspaces">Step 3: Vertical sharding (scaling to multiple keyspaces)</h2>
-
-<p>Typically, the first step in scaling up is vertical sharding, in which you identify groups of tables that belong together and move them to separate keyspaces. A keyspace is a distributed database, and, usually, the databases are unsharded at this point. That said, it&#39;s possible that you&#39;ll need to horizontally shard your data (step 4) before scaling to multiple keyspaces.</p>
-
-<p>The benefit of splitting tables into multiple keyspaces is to parallelize access to the data (increased performance), and to prepare each smaller keyspace for horizontal sharding. And, in separating data into multiple keyspaces, you should aim to reach a point where:</p>
-
-<ul>
-<li>All data inside a keyspace scales the same way. For example, in an e-commerce application, user data and product data don’t scale the same way. But user preferences and shopping cart data usually scale with the number of users.</li>
-<li>You can choose a sharding key inside a keyspace and associate each row of every table with a value of the sharding key. Step 4 talks more about choosing a sharding key.</li>
-<li>Joins are primarily within keyspaces. (Joins between keyspaces are costly.)</li>
-<li>Transactions involving data in multiple keyspaces, which are also expensive, are uncommon.</li>
-</ul>
-
-<h3 id="scaling-keyspaces-with-vitess">Scaling keyspaces with Vitess</h3>
-
-<p>Several vtctl functions -- vtctl is Vitess&#39; command-line tool for managing your database topology -- support features for vertically splitting a keyspace. In this process, a set of tables can be moved from an existing keyspace to a new keyspace with no read downtime and write downtime of just a few seconds.</p>
-
-<p><strong>Related Vitess documentation:</strong></p>
-
-<ul>
-<li><a href="http://vitess.io/reference/vtctl.html">vtctl Reference guide</a></li>
-</ul>
-
-<h2 id="step-4-horizontal-sharding-partitioning-your-data">Step 4: Horizontal sharding (partitioning your data)</h2>
-
-<p>The next step in scaling your data is horizontal sharding, the process of partitioning your data to improve scalability and performance. A shard is a horizontal partition of the data within a keyspace. Each shard has a master instance and replica instances, but data does not overlap between shards.</p>
-
-<p>In general, database sharding is most effective when the assigned keyspace IDs are evenly distributed among shards. Keyspace IDs identify the primary entity of a keyspace. For example, a keyspace ID might identify a user, a product, or a purchase.</p>
-
-<p>Since vanilla MySQL lacks native sharding support, you&#39;d typically need to write sharding code and embed sharding logic in your application to shard your data.</p>
-
-<h3 id="sharding-options-in-vitess">Sharding options in Vitess</h3>
-
-<p>A keyspace in Vitess can have three sharding schemes:</p>
-
-<ul>
-<li><strong>Not sharded</strong> (or <strong>unsharded</strong>). The keyspace has one shard, which contains all of the data.</li>
-<li><strong>Custom</strong>: The keyspace has multiple shards, each of which can be targeted by a different connection pool. The application needs to target statements to the right shards.</li>
-<li><strong>Range-based</strong>: The application provides a sharding key for each record, and each shard contains a range of sharding keys. Vitess uses the sharding key values to route queries to the right shards and also supports advanced features like dynamic resharding.</li>
-</ul>
-
-<p>A prerequisite for sharding a keyspace in Vitess is that all of the tables in the keyspace contain a keyspace ID, which is a hashed version of the sharding key. Having all of the tables in a keyspace share a keyspace ID was one of the goals mentioned in section 3, but it&#39;s a requirement once you&#39;re ready to shard your data.</p>
-
-<p>Vitess offers robust resharding support, which involves updating the sharding scheme for a keyspace and dynamically reorganizing data to match the new scheme. During resharding, Vitess copies, verifies, and keeps data up-to-date on new shards while existing shards continue serving live read and write traffic. When you&#39;re ready to switch over, the migration occurs with just a few seconds of read-only downtime.</p>
-
-<p><strong>Related Vitess documentation:</strong></p>
-
-<ul>
-<li><a href="http://vitess.io/user-guide/sharding.html">Sharding</a></li>
-<li><a href="http://vitess.io/user-guide/horizontal-sharding.html">Horizontal sharding (Codelab)</a></li>
-<li><a href="http://vitess.io/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Codelab)</a></li>
-</ul>
-
-<h2 id="related-tasks">Related tasks</h2>
-
-<p>In addition to the four steps discussed above, you might also want to do some or all of the following as your application matures.</p>
-
-<h3 id="data-processing-input-output">Data processing input / output</h3>
-
-<p>Hadoop is a framework that enables distributed processing of large data sets across clusters of computers using simple programming models.</p>
-
-<p>Vitess provides a Hadoop InputSource that can be used for any Hadoop MapReduce job or even connected to Spark. The Vitess InputSource takes a simple SQL query, splits that query into small chunks, and parallelizes data reading as much as possible across database instances, shards, etc.</p>
-
-<h3 id="query-log-analysis">Query log analysis</h3>
-
-<p>Database query logs can help you to monitor and improve your application&#39;s performance. </p>
-
-<p>To that end, each vttablet instance provides runtime stats, which can be accessed through the tablet’s web page, for the queries the tablet is running. These stats make it easy to detect slow queries, which are usually hampered by a missing or mismatched table index. Reviewing these queries regularly helps maintain the overall health of your large database installation.</p>
-
-<p>Each vttablet instance can also provide a stream of all the queries it is running. If the Vitess cluster is colocated with a log cluster, you can dump this data in real time and then run more advanced query analysis.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/overview/scaling-mysql/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/overview/scaling-mysql/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/overview/scaling-mysql/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/overview/scaling-mysql/"</script>
 </html>
diff --git a/docs/overview/scaling-mysql/index.html b/docs/overview/scaling-mysql/index.html
new file mode 100644
index 00000000000..87eb666f08e
--- /dev/null
+++ b/docs/overview/scaling-mysql/index.html
@@ -0,0 +1,528 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Scaling MySQL with Vitess | Vitess</title>
+<meta property="og:title" content="Scaling MySQL with Vitess" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess simplifies every aspect of managing a MySQL cluster, allowing easy scaling to any size without complicating your application layer." />
+<meta property="og:description" content="Vitess simplifies every aspect of managing a MySQL cluster, allowing easy scaling to any size without complicating your application layer." />
+<link rel="canonical" href="http://vitess.io/overview/scaling-mysql/" />
+<meta property="og:url" content="http://vitess.io/overview/scaling-mysql/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess simplifies every aspect of managing a MySQL cluster, allowing easy scaling to any size without complicating your application layer.","url":"http://vitess.io/overview/scaling-mysql/","headline":"Scaling MySQL with Vitess","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Scaling MySQL with Vitess</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>Traditionally, it&#39;s been difficult to scale a MySQL-based database to an arbitrary size. Since MySQL lacks the out-of-the-box multi-instance support required to really scale an application, the process can be complex and obscure.</p>
+
+<p>As the application grows, scripts emerge to back up data, migrate a master database, or run some offline data processing. Complexity creeps into the application layer, which increasingly needs to be aware of database details. And before we know it, any change needs a big engineering effort so we can keep scaling.</p>
+
+<p>Vitess grew out of YouTube&#39;s attempt to break this cycle, and YouTube decided to open source Vitess after realizing that this is a very common problem. Vitess simplifies every aspect of managing a MySQL cluster, allowing easy scaling to any size without complicating your application layer. It ensures your database can keep up when your application takes off, leaving you with a database that is flexible, secure, and easy to mine.</p>
+
+<p>This document talks about the process of moving from a single small database to a limitless database cluster. It explains how steps in that process influenced Vitess&#39; design, linking to relevant parts of the Vitess documentation along the way. It concludes with tips for designing a new, highly scalable application and database schema.</p>
+
+<h2 id="getting-started">Getting started</h2>
+
+<p>Vitess sits between your application and your MySQL database. It looks at incoming queries and routes them properly. So, instead of sending a query directly from your application to your database, you send it through Vitess, which understands your database topology and constantly monitors the health of individual database instances.</p>
+
+<p>While Vitess is designed to manage large, multi-instance databases, it offers features that simplify database setup and management at all stages of your product&#39;s lifecycle. </p>
+
+<p>Starting out, our first step is getting a simple, reliable, durable database cluster in place with a master instance and a couple of replicas. In Vitess terminology, that&#39;s a single-shard, single-keyspace database. Once that building block is in place, we can focus on replicating it to scale up.</p>
+
+<h3 id="planning-for-scale">Planning for scale</h3>
+
+<p>We recommend a number of best practices to facilitate scaling your database as your product evolves. You might not experience the benefits of these actions immediately, but adopting these practices from day one will make it much easier for your database and product to grow:</p>
+
+<ul>
+<li>Always keep your database schema under source control and provide unit test coverage of that schema. Also check schema changes into source control and run unit tests against the newly modified schema.</li>
+<li>Think about appropriate sharding keys for your data and structure that data accordingly. Usually, sharding keys are obvious -- e.g. a user ID. However, having your key(s) in place ahead of time is much easier than needing to retrofit your data before you can actually shard it.</li>
+<li>Group tables that share the same sharding key. Similarly, split tables that don’t share the same sharding key into different keyspaces.</li>
+<li>Avoid cross-shard queries (scatter queries). Instead, use MapReduce for offline queries and build Spark data processing pipelines for online queries. Usually, it is faster to extract raw data and then post-process it in the MapReduce framework.</li>
+<li>Plan to have data in multiple data centers and regions. It is easier to migrate to multiple data centers if you&#39;ve planned for incoming queries to be routed to a region or application server pool that, in turn, connects to the right database pool.</li>
+</ul>
+
+<h2 id="step-1-setting-up-a-database-cluster">Step 1: Setting up a database cluster</h2>
+
+<p>At the outset, plan to create a database cluster that has a master instance and a couple of read-only replicas (or slaves). The replicas would be able to take over if the master became unavailable, and they might also handle read-only traffic. You&#39;d also want to schedule regular data backups.</p>
+
+<p>It&#39;s worth noting that master management is a complex and critical challenge for data reliability. At any given time, a shard has only one master instance, and all replica instances replicate from it. Your application -- either a component in your application layer or Vitess, if you are using it -- needs to be able to easily identify the master instance for write operations, recognizing that the master might change from time to time. Similarly, your application, with or without Vitess, should be able to seamlessly adapt to new replicas coming online or old ones being unavailable.</p>
+
+<h3 id="keep-routing-logic-out-of-your-application">Keep routing logic out of your application</h3>
+
+<p>A core principle underlying Vitess&#39; design is that your database and data management practices should always be ready to support your application&#39;s growth. So, you might not yet have an immediate need to store data in multiple data centers, shard your database, or even do regular backups. But when those needs arise, you want to be sure that you&#39;ll have an easy path to achieve them. Note that you can run Vitess in a Kubernetes cluster or on local hardware. </p>
+
+<p>With that in mind, you want to have a plan that allows your database to grow without complicating your application code. For example, if you reshard your database, your application code shouldn&#39;t need to change to identify the target shards for a particular query.</p>
+
+<p>Vitess has several components that keep this complexity out of your application:</p>
+
+<ul>
+<li>Each MySQL instance is paired with a <strong>vttablet</strong> process, which provides features like connection pooling, query rewriting, and query de-duping.</li>
+<li>Your application sends queries to <strong>vtgate</strong>, a light proxy that routes traffic to the correct vttablet(s) and then returns consolidated results to the application.</li>
+<li>The <strong>Topology Service</strong> -- Vitess supports Zookeeper and etcd -- maintains configuration data for the database system. Vitess relies on the service to know where to route queries based on both the sharding scheme and the availability of individual MySQL instances.</li>
+<li>The <strong>vtctl</strong> and <strong>vtctld</strong> tools offer command-line and web interfaces to the system.</li>
+</ul>
+
+<div style="overflow-x: scroll">
+<img src="https://raw.githubusercontent.com/youtube/vitess/master/doc/VitessOverview.png" alt="Diagram showing Vitess implementation" width="585" height="300"/>
+</div>
+
+<p>Setting up these components directly -- for example, writing your own topology service or your own implementation of vtgate -- would require a lot of scripting specific to a given configuration. It would also yield a system that would be difficult and costly to support. In addition, while any one of the components on its own is useful in limiting complexity, you need all of them to keep your application as simple as possible while also optimizing performance.</p>
+
+<p><strong>Optional functionality to implement</strong></p>
+
+<ul>
+<li><p><em>Recommended</em>.  Vitess has basic support for identifying or changing a master, but it doesn&#39;t aim to fully address this feature. As such, we recommend using another program, like <a href="https://github.com/github/orchestrator">Orchestrator</a>, to monitor the health of your servers and to change your master database when necessary. (In a sharded database, each shard has a master.)</p></li>
+<li><p><em>Recommended</em>. You should have a way to monitor your database topology and set up alerts as needed. Vitess components facilitate this monitoring by exporting a lot of runtime variables, like QPS over the last few minutes, error rates, and query latency. The variables are exported in JSON format, and Vitess also supports an InfluxDB plug-in.</p></li>
+<li><p><em>Optional</em>. Using the Kubernetes scripts as a base, you could run Vitess components with other configuration management systems (like Puppet) or frameworks (like Mesos or AWS images).</p></li>
+</ul>
+
+<p><strong>Related Vitess documentation:</strong></p>
+
+<ul>
+<li><a href="/getting-started/">Running Vitess on Kubernetes</a></li>
+<li><a href="/getting-started/local-instance/">Running Vitess on a local server</a></li>
+<li><a href="/user-guide/backup-and-restore/">Backing up data</a></li>
+<li><a href="/user-guide/reparenting/">Reparenting - basic assignment of master instance in Vitess</a></li>
+</ul>
+
+<h2 id="step-2-connect-your-application-to-your-database">Step 2: Connect your application to your database</h2>
+
+<p>Obviously, your application needs to be able to call your database. So, we&#39;ll jump straight to explaining how you&#39;d modify your application to connect to your database through vtgate.</p>
+
+<h3 id="using-the-vitess-connector">Using the Vitess connector</h3>
+
+<p>The main protocol for connecting to Vitess is <a href="http://www.grpc.io/">gRPC</a>. The connection lets the application see the database and send queries to it. The queries are virtually identical to the ones the application would send directly to MySQL.</p>
+
+<p>Vitess supports connections for several languages:</p>
+
+<ul>
+<li><strong>Go</strong>: We provide a sql/database driver.</li>
+<li><strong>Java</strong>: We provide a library that wraps the gRPC code and a JDBC driver.</li>
+<li><strong>PHP</strong>: We provide a library that wraps the gRPC code and a PDO driver.</li>
+<li><strong>Python</strong>: We provide a library that wraps the gRPC code and a PEP-compliant driver.</li>
+</ul>
+
+<h4 id="unit-testing-database-interactions">Unit testing database interactions</h4>
+
+<p>The vttest library and executables provide a unit testing environment that lets you start a fake cluster that acts as an exact replica of your production environment for testing purposes. In the fake cluster, a single DB instance hosts all of your shards.</p>
+
+<h3 id="migrating-production-data-to-vitess">Migrating production data to Vitess</h3>
+
+<p>The easiest way to migrate data to your Vitess database is to take a backup of your existing data, restore it on the Vitess cluster, and go from there. However, that requires some downtime.</p>
+
+<p>Another, more complicated approach, is a live migration, which requires your application to support both direct MySQL access and Vitess access. In that approach, you&#39;d enable MySQL replication from your source database to the Vitess master database. This would allow you to migrate quickly and with almost no downtime.</p>
+
+<p>Note that this path is highly dependent on the source setup. Thus, while Vitess provides helper tools, it does not offer a generic way to support this type of migration.</p>
+
+<p><strong>Related Vitess documentation:</strong></p>
+
+<ul>
+<li><a href="/reference/vitess-api/">Vitess API Reference</a></li>
+<li><a href="/user-guide/schema-management/">Schema Management</a></li>
+<li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+</ul>
+
+<h2 id="step-3-vertical-sharding-scaling-to-multiple-keyspaces">Step 3: Vertical sharding (scaling to multiple keyspaces)</h2>
+
+<p>Typically, the first step in scaling up is vertical sharding, in which you identify groups of tables that belong together and move them to separate keyspaces. A keyspace is a distributed database, and, usually, the databases are unsharded at this point. That said, it&#39;s possible that you&#39;ll need to horizontally shard your data (step 4) before scaling to multiple keyspaces.</p>
+
+<p>The benefit of splitting tables into multiple keyspaces is to parallelize access to the data (increased performance), and to prepare each smaller keyspace for horizontal sharding. And, in separating data into multiple keyspaces, you should aim to reach a point where:</p>
+
+<ul>
+<li>All data inside a keyspace scales the same way. For example, in an e-commerce application, user data and product data don’t scale the same way. But user preferences and shopping cart data usually scale with the number of users.</li>
+<li>You can choose a sharding key inside a keyspace and associate each row of every table with a value of the sharding key. Step 4 talks more about choosing a sharding key.</li>
+<li>Joins are primarily within keyspaces. (Joins between keyspaces are costly.)</li>
+<li>Transactions involving data in multiple keyspaces, which are also expensive, are uncommon.</li>
+</ul>
+
+<h3 id="scaling-keyspaces-with-vitess">Scaling keyspaces with Vitess</h3>
+
+<p>Several vtctl functions -- vtctl is Vitess&#39; command-line tool for managing your database topology -- support features for vertically splitting a keyspace. In this process, a set of tables can be moved from an existing keyspace to a new keyspace with no read downtime and write downtime of just a few seconds.</p>
+
+<p><strong>Related Vitess documentation:</strong></p>
+
+<ul>
+<li><a href="/reference/vtctl/">vtctl Reference guide</a></li>
+</ul>
+
+<h2 id="step-4-horizontal-sharding-partitioning-your-data">Step 4: Horizontal sharding (partitioning your data)</h2>
+
+<p>The next step in scaling your data is horizontal sharding, the process of partitioning your data to improve scalability and performance. A shard is a horizontal partition of the data within a keyspace. Each shard has a master instance and replica instances, but data does not overlap between shards.</p>
+
+<p>In general, database sharding is most effective when the assigned keyspace IDs are evenly distributed among shards. Keyspace IDs identify the primary entity of a keyspace. For example, a keyspace ID might identify a user, a product, or a purchase.</p>
+
+<p>Since vanilla MySQL lacks native sharding support, you&#39;d typically need to write sharding code and embed sharding logic in your application to shard your data.</p>
+
+<h3 id="sharding-options-in-vitess">Sharding options in Vitess</h3>
+
+<p>A keyspace in Vitess can have three sharding schemes:</p>
+
+<ul>
+<li><strong>Not sharded</strong> (or <strong>unsharded</strong>). The keyspace has one shard, which contains all of the data.</li>
+<li><strong>Custom</strong>: The keyspace has multiple shards, each of which can be targeted by a different connection pool. The application needs to target statements to the right shards.</li>
+<li><strong>Range-based</strong>: The application provides a sharding key for each record, and each shard contains a range of sharding keys. Vitess uses the sharding key values to route queries to the right shards and also supports advanced features like dynamic resharding.</li>
+</ul>
+
+<p>A prerequisite for sharding a keyspace in Vitess is that all of the tables in the keyspace contain a keyspace ID, which is a hashed version of the sharding key. Having all of the tables in a keyspace share a keyspace ID was one of the goals mentioned in section 3, but it&#39;s a requirement once you&#39;re ready to shard your data.</p>
+
+<p>Vitess offers robust resharding support, which involves updating the sharding scheme for a keyspace and dynamically reorganizing data to match the new scheme. During resharding, Vitess copies, verifies, and keeps data up-to-date on new shards while existing shards continue serving live read and write traffic. When you&#39;re ready to switch over, the migration occurs with just a few seconds of read-only downtime.</p>
+
+<p><strong>Related Vitess documentation:</strong></p>
+
+<ul>
+<li><a href="/user-guide/sharding/">Sharding</a></li>
+<li><a href="/user-guide/horizontal-sharding/">Horizontal sharding (Codelab)</a></li>
+<li><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Codelab)</a></li>
+</ul>
+
+<h2 id="related-tasks">Related tasks</h2>
+
+<p>In addition to the four steps discussed above, you might also want to do some or all of the following as your application matures.</p>
+
+<h3 id="data-processing-input-output">Data processing input / output</h3>
+
+<p>Hadoop is a framework that enables distributed processing of large data sets across clusters of computers using simple programming models.</p>
+
+<p>Vitess provides a Hadoop InputSource that can be used for any Hadoop MapReduce job or even connected to Spark. The Vitess InputSource takes a simple SQL query, splits that query into small chunks, and parallelizes data reading as much as possible across database instances, shards, etc.</p>
+
+<h3 id="query-log-analysis">Query log analysis</h3>
+
+<p>Database query logs can help you to monitor and improve your application&#39;s performance. </p>
+
+<p>To that end, each vttablet instance provides runtime stats, which can be accessed through the tablet’s web page, for the queries the tablet is running. These stats make it easy to detect slow queries, which are usually hampered by a missing or mismatched table index. Reviewing these queries regularly helps maintain the overall health of your large database installation.</p>
+
+<p>Each vttablet instance can also provide a stream of all the queries it is running. If the Vitess cluster is colocated with a log cluster, you can dump this data in real time and then run more advanced query analysis.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/reference/vitess-api.html b/docs/reference/vitess-api.html
index 94e5ae9d326..4416aae4032 100644
--- a/docs/reference/vitess-api.html
+++ b/docs/reference/vitess-api.html
@@ -1,2590 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Vitess API Reference</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Vitess API Reference"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Vitess API Reference</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>This document describes Vitess API methods that enable your client application to more easily talk to your storage system to query data. API methods are grouped into the following categories:</p>
-
-<ul>
-<li><a href="#range-based-sharding">Range-based Sharding</a></li>
-<li><a href="#transactions">Transactions</a></li>
-<li><a href="#custom-sharding">Custom Sharding</a></li>
-<li><a href="#map-reduce">Map Reduce</a></li>
-<li><a href="#topology">Topology</a></li>
-<li><a href="#v3-api-(alpha)">v3 API (alpha)</a></li>
-</ul>
-
-<p>The following table lists the methods in each group and links to more detail about each method:</p>
-
-<table id="api-method-summary">
-<tr><td class="api-method-summary-group" colspan="2">Range-based Sharding</td></tr>
-<tr>
-<td><code><a href="#executebatchkeyspaceids">ExecuteBatchKeyspaceIds</a></code></td>
-<td>ExecuteBatchKeyspaceIds executes the list of queries based on the specified keyspace ids.</td>
-</tr>
-<tr>
-<td><code><a href="#executeentityids">ExecuteEntityIds</a></code></td>
-<td>ExecuteEntityIds executes the query based on the specified external id to keyspace id map.</td>
-</tr>
-<tr>
-<td><code><a href="#executekeyranges">ExecuteKeyRanges</a></code></td>
-<td>ExecuteKeyRanges executes the query based on the specified key ranges.</td>
-</tr>
-<tr>
-<td><code><a href="#executekeyspaceids">ExecuteKeyspaceIds</a></code></td>
-<td>ExecuteKeyspaceIds executes the query based on the specified keyspace ids.</td>
-</tr>
-<tr>
-<td><code><a href="#streamexecutekeyranges">StreamExecuteKeyRanges</a></code></td>
-<td>StreamExecuteKeyRanges executes a streaming query based on key ranges. Use this method if the query returns a large number of rows.</td>
-</tr>
-<tr>
-<td><code><a href="#streamexecutekeyspaceids">StreamExecuteKeyspaceIds</a></code></td>
-<td>StreamExecuteKeyspaceIds executes a streaming query based on keyspace ids. Use this method if the query returns a large number of rows.</td>
-</tr>
-<tr><td class="api-method-summary-group" colspan="2">Transactions</td></tr>
-<tr>
-<td><code><a href="#begin">Begin</a></code></td>
-<td>Begin a transaction.</td>
-</tr>
-<tr>
-<td><code><a href="#commit">Commit</a></code></td>
-<td>Commit a transaction.</td>
-</tr>
-<tr>
-<td><code><a href="#resolvetransaction">ResolveTransaction</a></code></td>
-<td>ResolveTransaction resolves a transaction.</td>
-</tr>
-<tr>
-<td><code><a href="#rollback">Rollback</a></code></td>
-<td>Rollback a transaction.</td>
-</tr>
-<tr><td class="api-method-summary-group" colspan="2">Custom Sharding</td></tr>
-<tr>
-<td><code><a href="#executebatchshards">ExecuteBatchShards</a></code></td>
-<td>ExecuteBatchShards executes the list of queries on the specified shards.</td>
-</tr>
-<tr>
-<td><code><a href="#executeshards">ExecuteShards</a></code></td>
-<td>ExecuteShards executes the query on the specified shards.</td>
-</tr>
-<tr>
-<td><code><a href="#streamexecuteshards">StreamExecuteShards</a></code></td>
-<td>StreamExecuteShards executes a streaming query based on shards. Use this method if the query returns a large number of rows.</td>
-</tr>
-<tr><td class="api-method-summary-group" colspan="2">Map Reduce</td></tr>
-<tr>
-<td><code><a href="#splitquery">SplitQuery</a></code></td>
-<td>Split a query into non-overlapping sub queries</td>
-</tr>
-<tr><td class="api-method-summary-group" colspan="2">Topology</td></tr>
-<tr>
-<td><code><a href="#getsrvkeyspace">GetSrvKeyspace</a></code></td>
-<td>GetSrvKeyspace returns a SrvKeyspace object (as seen by this vtgate). This method is provided as a convenient way for clients to take a look at the sharding configuration for a Keyspace. Looking at the sharding information should not be used for routing queries (as the information may change, use the Execute calls for that). It is convenient for monitoring applications for instance, or if using custom sharding.</td>
-</tr>
-<tr><td class="api-method-summary-group" colspan="2">v3 API (alpha)</td></tr>
-<tr>
-<td><code><a href="#execute">Execute</a></code></td>
-<td>Execute tries to route the query to the right shard. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query.</td>
-</tr>
-<tr>
-<td><code><a href="#streamexecute">StreamExecute</a></code></td>
-<td>StreamExecute executes a streaming query based on shards. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query. Use this method if the query returns a large number of rows.</td>
-</tr>
-</table>
-
-<h2 id="range-based-sharding">Range-based Sharding</h2>
-
-<h3 id="executebatchkeyspaceids">ExecuteBatchKeyspaceIds</h3>
-
-<p>ExecuteBatchKeyspaceIds executes the list of queries based on the specified keyspace ids.</p>
-
-<h4 id="request">Request</h4>
-
-<p>ExecuteBatchKeyspaceIdsRequest is the payload to ExecuteBatchKeyspaceId.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>queries</code> <br>list &lt;<a href="#boundkeyspaceidquery">BoundKeyspaceIdQuery</a>&gt;</td>
-<td style="text-align: left">BoundKeyspaceIdQuery represents a single query request for the specified list of keyspace ids. This is used in a list for ExecuteBatchKeyspaceIdsRequest.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>as_transaction</code> <br>bool</td>
-<td style="text-align: left">as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose. (this can be seen as adding a &#39;begin&#39; before and &#39;commit&#39; after the queries). Only makes sense if tablet_type is master. If set, the Session is ignored.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>ExecuteBatchKeyspaceIdsResponse is the returned value from ExecuteBatchKeyspaceId.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
-<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>results</code> <br>list &lt;<a href="#query.queryresult">query.QueryResult</a>&gt;</td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="executeentityids">ExecuteEntityIds</h3>
-
-<p>ExecuteEntityIds executes the query based on the specified external id to keyspace id map.</p>
-
-<h4 id="request">Request</h4>
-
-<p>ExecuteEntityIdsRequest is the payload to ExecuteEntityIds.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>entity_column_name</code> <br>string</td>
-<td style="text-align: left">entity_column_name is the column name to use.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>entity_keyspace_ids</code> <br>list &lt;<a href="#executeentityidsrequest.entityid">EntityId</a>&gt;</td>
-<td style="text-align: left">entity_keyspace_ids are pairs of entity_column_name values associated with its corresponding keyspace_id.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
-<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="messages">Messages</h4>
-
-<h5 id="executeentityidsrequest-entityid">ExecuteEntityIdsRequest.EntityId</h5>
-
-<p><em>Properties</em></p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>type</code> <br><a href="#query.type">query.Type</a></td>
-<td style="text-align: left">Type defines the various supported data types in bind vars and query results.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>value</code> <br>bytes</td>
-<td style="text-align: left">value is the value for the entity. Not set if type is NULL_TYPE.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace_id</code> <br>bytes</td>
-<td style="text-align: left">keyspace_id is the associated keyspace_id for the entity.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>ExecuteEntityIdsResponse is the returned value from ExecuteEntityIds.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
-<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="executekeyranges">ExecuteKeyRanges</h3>
-
-<p>ExecuteKeyRanges executes the query based on the specified key ranges.</p>
-
-<h4 id="request">Request</h4>
-
-<p>ExecuteKeyRangesRequest is the payload to ExecuteKeyRanges.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>key_ranges</code> <br>list &lt;<a href="#topodata.keyrange">topodata.KeyRange</a>&gt;</td>
-<td style="text-align: left">KeyRange describes a range of sharding keys, when range-based sharding is used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
-<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>ExecuteKeyRangesResponse is the returned value from ExecuteKeyRanges.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
-<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="executekeyspaceids">ExecuteKeyspaceIds</h3>
-
-<p>ExecuteKeyspaceIds executes the query based on the specified keyspace ids.</p>
-
-<h4 id="request">Request</h4>
-
-<p>ExecuteKeyspaceIdsRequest is the payload to ExecuteKeyspaceIds.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace_ids</code> <br>list &lt;bytes&gt;</td>
-<td style="text-align: left">keyspace_ids contains the list of keyspace_ids affected by this query. Will be used to find the shards to send the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
-<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>ExecuteKeyspaceIdsResponse is the returned value from ExecuteKeyspaceIds.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
-<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="streamexecutekeyranges">StreamExecuteKeyRanges</h3>
-
-<p>StreamExecuteKeyRanges executes a streaming query based on key ranges. Use this method if the query returns a large number of rows.</p>
-
-<h4 id="request">Request</h4>
-
-<p>StreamExecuteKeyRangesRequest is the payload to StreamExecuteKeyRanges.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>key_ranges</code> <br>list &lt;<a href="#topodata.keyrange">topodata.KeyRange</a>&gt;</td>
-<td style="text-align: left">KeyRange describes a range of sharding keys, when range-based sharding is used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>StreamExecuteKeyRangesResponse is the returned value from StreamExecuteKeyRanges.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="streamexecutekeyspaceids">StreamExecuteKeyspaceIds</h3>
-
-<p>StreamExecuteKeyspaceIds executes a streaming query based on keyspace ids. Use this method if the query returns a large number of rows.</p>
-
-<h4 id="request">Request</h4>
-
-<p>StreamExecuteKeyspaceIdsRequest is the payload to StreamExecuteKeyspaceIds.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace_ids</code> <br>list &lt;bytes&gt;</td>
-<td style="text-align: left">keyspace_ids contains the list of keyspace_ids affected by this query. Will be used to find the shards to send the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>StreamExecuteKeyspaceIdsResponse is the returned value from StreamExecuteKeyspaceIds.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h2 id="transactions">Transactions</h2>
-
-<h3 id="begin">Begin</h3>
-
-<p>Begin a transaction.</p>
-
-<h4 id="request">Request</h4>
-
-<p>BeginRequest is the payload to Begin.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>single_db</code> <br>bool</td>
-<td style="text-align: left">single_db specifies if the transaction should be restricted to a single database.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>BeginResponse is the returned value from Begin.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-</tbody></table>
-
-<h3 id="commit">Commit</h3>
-
-<p>Commit a transaction.</p>
-
-<h4 id="request">Request</h4>
-
-<p>CommitRequest is the payload to Commit.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>atomic</code> <br>bool</td>
-<td style="text-align: left">atomic specifies if the commit should go through the 2PC workflow to ensure atomicity.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>CommitResponse is the returned value from Commit.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-</tbody></table>
-
-<h3 id="resolvetransaction">ResolveTransaction</h3>
-
-<p>ResolveTransaction resolves a transaction.</p>
-
-<h4 id="request">Request</h4>
-
-<p>ResolveTransactionRequest is the payload to ResolveTransaction.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>dtid</code> <br>string</td>
-<td style="text-align: left">dtid is the dtid of the transaction to be resolved.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>ResolveTransactionResponse is the returned value from Rollback.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-</tbody></table>
-
-<h3 id="rollback">Rollback</h3>
-
-<p>Rollback a transaction.</p>
-
-<h4 id="request">Request</h4>
-
-<p>RollbackRequest is the payload to Rollback.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>RollbackResponse is the returned value from Rollback.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-</tbody></table>
-
-<h2 id="custom-sharding">Custom Sharding</h2>
-
-<h3 id="executebatchshards">ExecuteBatchShards</h3>
-
-<p>ExecuteBatchShards executes the list of queries on the specified shards.</p>
-
-<h4 id="request">Request</h4>
-
-<p>ExecuteBatchShardsRequest is the payload to ExecuteBatchShards</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>queries</code> <br>list &lt;<a href="#boundshardquery">BoundShardQuery</a>&gt;</td>
-<td style="text-align: left">BoundShardQuery represents a single query request for the specified list of shards. This is used in a list for ExecuteBatchShardsRequest.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>as_transaction</code> <br>bool</td>
-<td style="text-align: left">as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose. (this can be seen as adding a &#39;begin&#39; before and &#39;commit&#39; after the queries). Only makes sense if tablet_type is master. If set, the Session is ignored.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>ExecuteBatchShardsResponse is the returned value from ExecuteBatchShards.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
-<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>results</code> <br>list &lt;<a href="#query.queryresult">query.QueryResult</a>&gt;</td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="executeshards">ExecuteShards</h3>
-
-<p>ExecuteShards executes the query on the specified shards.</p>
-
-<h4 id="request">Request</h4>
-
-<p>ExecuteShardsRequest is the payload to ExecuteShards.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shards</code> <br>list &lt;string&gt;</td>
-<td style="text-align: left">shards to target the query to. A DML can only target one shard.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
-<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>ExecuteShardsResponse is the returned value from ExecuteShards.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
-<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="streamexecuteshards">StreamExecuteShards</h3>
-
-<p>StreamExecuteShards executes a streaming query based on shards. Use this method if the query returns a large number of rows.</p>
-
-<h4 id="request">Request</h4>
-
-<p>StreamExecuteShardsRequest is the payload to StreamExecuteShards.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shards</code> <br>list &lt;string&gt;</td>
-<td style="text-align: left">shards to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>StreamExecuteShardsResponse is the returned value from StreamExecuteShards.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h2 id="map-reduce">Map Reduce</h2>
-
-<h3 id="splitquery">SplitQuery</h3>
-
-<p>Split a query into non-overlapping sub queries</p>
-
-<h4 id="request">Request</h4>
-
-<p>SplitQueryRequest is the payload to SplitQuery.  SplitQuery takes a &quot;SELECT&quot; query and generates a list of queries called &quot;query-parts&quot;. Each query-part consists of the original query with an added WHERE clause that restricts the query-part to operate only on rows whose values in the the columns listed in the &quot;split_column&quot; field of the request (see below) are in a particular range.  It is guaranteed that the set of rows obtained from executing each query-part on a database snapshot and merging (without deduping) the results is equal to the set of rows obtained from executing the original query on the same snapshot with the rows containing NULL values in any of the split_column&#39;s excluded.  This is typically called by the MapReduce master when reading from Vitess. There it&#39;s desirable that the sets of rows returned by the query-parts have roughly the same size.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>split_column</code> <br>list &lt;string&gt;</td>
-<td style="text-align: left">Each generated query-part will be restricted to rows whose values in the columns listed in this field are in a particular range. The list of columns named here must be a prefix of the list of columns defining some index or primary key of the table referenced in &#39;query&#39;. For many tables using the primary key columns (in order) is sufficient and this is the default if this field is omitted. See the comment on the &#39;algorithm&#39; field for more restrictions and information.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>split_count</code> <br>int64</td>
-<td style="text-align: left">You can specify either an estimate of the number of query-parts to generate or an estimate of the number of rows each query-part should return. Thus, exactly one of split_count or num_rows_per_query_part should be nonzero. The non-given parameter is calculated from the given parameter using the formula: split_count * num_rows_per_query_pary = table_size, where table_size is an approximation of the number of rows in the table. Note that if &quot;split_count&quot; is given it is regarded as an estimate. The number of query-parts returned may differ slightly (in particular, if it&#39;s not a whole multiple of the number of vitess shards).</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>num_rows_per_query_part</code> <br>int64</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>algorithm</code> <br>query.SplitQueryRequest.Algorithm</td>
-<td style="text-align: left">The algorithm to use to split the query. The split algorithm is performed on each database shard in parallel. The lists of query-parts generated by the shards are merged and returned to the caller. Two algorithms are supported: EQUAL_SPLITS If this algorithm is selected then only the first &#39;split_column&#39; given is used (or the first primary key column if the &#39;split_column&#39; field is empty). In the rest of this algorithm&#39;s description, we refer to this column as &quot;the split column&quot;. The split column must have numeric type (integral or floating point). The algorithm works by taking the interval [min, max], where min and max are the minimum and maximum values of the split column in the table-shard, respectively, and partitioning it into &#39;split_count&#39; sub-intervals of equal size. The added WHERE clause of each query-part restricts that part to rows whose value in the split column belongs to a particular sub-interval. This is fast, but requires that the distribution of values of the split column be uniform in [min, max] for the number of rows returned by each query part to be roughly the same. FULL_SCAN If this algorithm is used then the split_column must be the primary key columns (in order). This algorithm performs a full-scan of the table-shard referenced in &#39;query&#39; to get &quot;boundary&quot; rows that are num_rows_per_query_part apart when the table is ordered by the columns listed in &#39;split_column&#39;. It then restricts each query-part to the rows located between two successive boundary rows. This algorithm supports multiple split_column&#39;s of any type, but is slower than EQUAL_SPLITS.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>use_split_query_v2</code> <br>bool</td>
-<td style="text-align: left">Remove this field after this new server code is released to prod. We must keep it for now, so that clients can still send it to the old server code currently in production.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>SplitQueryResponse is the returned value from SplitQuery.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>splits</code> <br>list &lt;<a href="#splitqueryresponse.part">Part</a>&gt;</td>
-<td style="text-align: left">splits contains the queries to run to fetch the entire data set.</td>
-</tr>
-</tbody></table>
-
-<h4 id="messages">Messages</h4>
-
-<h5 id="splitqueryresponse-keyrangepart">SplitQueryResponse.KeyRangePart</h5>
-
-<p><em>Properties</em></p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>key_ranges</code> <br>list &lt;<a href="#topodata.keyrange">topodata.KeyRange</a>&gt;</td>
-<td style="text-align: left">KeyRange describes a range of sharding keys, when range-based sharding is used.</td>
-</tr>
-</tbody></table>
-
-<h5 id="splitqueryresponse-part">SplitQueryResponse.Part</h5>
-
-<p><em>Properties</em></p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>key_range_part</code> <br><a href="#splitqueryresponse.keyrangepart">KeyRangePart</a></td>
-<td style="text-align: left">key_range_part is set if the query should be executed by ExecuteKeyRanges.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shard_part</code> <br><a href="#splitqueryresponse.shardpart">ShardPart</a></td>
-<td style="text-align: left">shard_part is set if the query should be executed by ExecuteShards.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>size</code> <br>int64</td>
-<td style="text-align: left">size is the approximate number of rows this query will return.</td>
-</tr>
-</tbody></table>
-
-<h5 id="splitqueryresponse-shardpart">SplitQueryResponse.ShardPart</h5>
-
-<p><em>Properties</em></p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shards</code> <br>list &lt;string&gt;</td>
-<td style="text-align: left">shards to target the query to.</td>
-</tr>
-</tbody></table>
-
-<h2 id="topology">Topology</h2>
-
-<h3 id="getsrvkeyspace">GetSrvKeyspace</h3>
-
-<p>GetSrvKeyspace returns a SrvKeyspace object (as seen by this vtgate). This method is provided as a convenient way for clients to take a look at the sharding configuration for a Keyspace. Looking at the sharding information should not be used for routing queries (as the information may change, use the Execute calls for that). It is convenient for monitoring applications for instance, or if using custom sharding.</p>
-
-<h4 id="request">Request</h4>
-
-<p>GetSrvKeyspaceRequest is the payload to GetSrvKeyspace.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace name to fetch.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>GetSrvKeyspaceResponse is the returned value from GetSrvKeyspace.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>srv_keyspace</code> <br><a href="#topodata.srvkeyspace">topodata.SrvKeyspace</a></td>
-<td style="text-align: left">SrvKeyspace is a rollup node for the keyspace itself.</td>
-</tr>
-</tbody></table>
-
-<h2 id="v3-api-alpha">v3 API (alpha)</h2>
-
-<h3 id="execute">Execute</h3>
-
-<p>Execute tries to route the query to the right shard. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query.</p>
-
-<h4 id="request">Request</h4>
-
-<p>ExecuteRequest is the payload to Execute.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
-<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>ExecuteResponse is the returned value from Execute.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
-<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
-<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="streamexecute">StreamExecute</h3>
-
-<p>StreamExecute executes a streaming query based on shards. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query. Use this method if the query returns a large number of rows.</p>
-
-<h4 id="request">Request</h4>
-
-<p>StreamExecuteRequest is the payload to StreamExecute.</p>
-
-<h5 id="parameters">Parameters</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
-<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
-<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
-</tr>
-</tbody></table>
-
-<h4 id="response">Response</h4>
-
-<p>StreamExecuteResponse is the returned value from StreamExecute.</p>
-
-<h5 id="properties">Properties</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h2 id="enums">Enums</h2>
-
-<h3 id="query-type">query.Type</h3>
-
-<p>Type defines the various supported data types in bind vars and query results.</p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Value</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>NULL_TYPE</code></td>
-<td style="text-align: left"><code>0</code></td>
-<td style="text-align: left">NULL_TYPE specifies a NULL type.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>INT8</code></td>
-<td style="text-align: left"><code>257</code></td>
-<td style="text-align: left">INT8 specifies a TINYINT type. Properties: 1, IsNumber.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>UINT8</code></td>
-<td style="text-align: left"><code>770</code></td>
-<td style="text-align: left">UINT8 specifies a TINYINT UNSIGNED type. Properties: 2, IsNumber, IsUnsigned.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>INT16</code></td>
-<td style="text-align: left"><code>259</code></td>
-<td style="text-align: left">INT16 specifies a SMALLINT type. Properties: 3, IsNumber.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>UINT16</code></td>
-<td style="text-align: left"><code>772</code></td>
-<td style="text-align: left">UINT16 specifies a SMALLINT UNSIGNED type. Properties: 4, IsNumber, IsUnsigned.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>INT24</code></td>
-<td style="text-align: left"><code>261</code></td>
-<td style="text-align: left">INT24 specifies a MEDIUMINT type. Properties: 5, IsNumber.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>UINT24</code></td>
-<td style="text-align: left"><code>774</code></td>
-<td style="text-align: left">UINT24 specifies a MEDIUMINT UNSIGNED type. Properties: 6, IsNumber, IsUnsigned.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>INT32</code></td>
-<td style="text-align: left"><code>263</code></td>
-<td style="text-align: left">INT32 specifies a INTEGER type. Properties: 7, IsNumber.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>UINT32</code></td>
-<td style="text-align: left"><code>776</code></td>
-<td style="text-align: left">UINT32 specifies a INTEGER UNSIGNED type. Properties: 8, IsNumber, IsUnsigned.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>INT64</code></td>
-<td style="text-align: left"><code>265</code></td>
-<td style="text-align: left">INT64 specifies a BIGINT type. Properties: 9, IsNumber.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>UINT64</code></td>
-<td style="text-align: left"><code>778</code></td>
-<td style="text-align: left">UINT64 specifies a BIGINT UNSIGNED type. Properties: 10, IsNumber, IsUnsigned.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>FLOAT32</code></td>
-<td style="text-align: left"><code>1035</code></td>
-<td style="text-align: left">FLOAT32 specifies a FLOAT type. Properties: 11, IsFloat.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>FLOAT64</code></td>
-<td style="text-align: left"><code>1036</code></td>
-<td style="text-align: left">FLOAT64 specifies a DOUBLE or REAL type. Properties: 12, IsFloat.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>TIMESTAMP</code></td>
-<td style="text-align: left"><code>2061</code></td>
-<td style="text-align: left">TIMESTAMP specifies a TIMESTAMP type. Properties: 13, IsQuoted.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>DATE</code></td>
-<td style="text-align: left"><code>2062</code></td>
-<td style="text-align: left">DATE specifies a DATE type. Properties: 14, IsQuoted.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>TIME</code></td>
-<td style="text-align: left"><code>2063</code></td>
-<td style="text-align: left">TIME specifies a TIME type. Properties: 15, IsQuoted.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>DATETIME</code></td>
-<td style="text-align: left"><code>2064</code></td>
-<td style="text-align: left">DATETIME specifies a DATETIME type. Properties: 16, IsQuoted.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>YEAR</code></td>
-<td style="text-align: left"><code>785</code></td>
-<td style="text-align: left">YEAR specifies a YEAR type. Properties: 17, IsNumber, IsUnsigned.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>DECIMAL</code></td>
-<td style="text-align: left"><code>18</code></td>
-<td style="text-align: left">DECIMAL specifies a DECIMAL or NUMERIC type. Properties: 18, None.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>TEXT</code></td>
-<td style="text-align: left"><code>6163</code></td>
-<td style="text-align: left">TEXT specifies a TEXT type. Properties: 19, IsQuoted, IsText.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>BLOB</code></td>
-<td style="text-align: left"><code>10260</code></td>
-<td style="text-align: left">BLOB specifies a BLOB type. Properties: 20, IsQuoted, IsBinary.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>VARCHAR</code></td>
-<td style="text-align: left"><code>6165</code></td>
-<td style="text-align: left">VARCHAR specifies a VARCHAR type. Properties: 21, IsQuoted, IsText.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>VARBINARY</code></td>
-<td style="text-align: left"><code>10262</code></td>
-<td style="text-align: left">VARBINARY specifies a VARBINARY type. Properties: 22, IsQuoted, IsBinary.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>CHAR</code></td>
-<td style="text-align: left"><code>6167</code></td>
-<td style="text-align: left">CHAR specifies a CHAR type. Properties: 23, IsQuoted, IsText.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>BINARY</code></td>
-<td style="text-align: left"><code>10264</code></td>
-<td style="text-align: left">BINARY specifies a BINARY type. Properties: 24, IsQuoted, IsBinary.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>BIT</code></td>
-<td style="text-align: left"><code>2073</code></td>
-<td style="text-align: left">BIT specifies a BIT type. Properties: 25, IsQuoted.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>ENUM</code></td>
-<td style="text-align: left"><code>2074</code></td>
-<td style="text-align: left">ENUM specifies an ENUM type. Properties: 26, IsQuoted.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>SET</code></td>
-<td style="text-align: left"><code>2075</code></td>
-<td style="text-align: left">SET specifies a SET type. Properties: 27, IsQuoted.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>TUPLE</code></td>
-<td style="text-align: left"><code>28</code></td>
-<td style="text-align: left">TUPLE specifies a a tuple. This cannot be returned in a QueryResult, but it can be sent as a bind var. Properties: 28, None.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>GEOMETRY</code></td>
-<td style="text-align: left"><code>2077</code></td>
-<td style="text-align: left">GEOMETRY specifies a GEOMETRY type. Properties: 29, IsQuoted.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>JSON</code></td>
-<td style="text-align: left"><code>2078</code></td>
-<td style="text-align: left">JSON specified a JSON type. Properties: 30, IsQuoted.</td>
-</tr>
-</tbody></table>
-
-<h3 id="topodata-keyspaceidtype">topodata.KeyspaceIdType</h3>
-
-<p>KeyspaceIdType describes the type of the sharding key for a range-based sharded keyspace.</p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Value</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>UNSET</code></td>
-<td style="text-align: left"><code>0</code></td>
-<td style="text-align: left">UNSET is the default value, when range-based sharding is not used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>UINT64</code></td>
-<td style="text-align: left"><code>1</code></td>
-<td style="text-align: left">UINT64 is when uint64 value is used. This is represented as &#39;unsigned bigint&#39; in mysql</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>BYTES</code></td>
-<td style="text-align: left"><code>2</code></td>
-<td style="text-align: left">BYTES is when an array of bytes is used. This is represented as &#39;varbinary&#39; in mysql</td>
-</tr>
-</tbody></table>
-
-<h3 id="topodata-tablettype">topodata.TabletType</h3>
-
-<p>TabletType represents the type of a given tablet.</p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Value</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>UNKNOWN</code></td>
-<td style="text-align: left"><code>0</code></td>
-<td style="text-align: left">UNKNOWN is not a valid value.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>MASTER</code></td>
-<td style="text-align: left"><code>1</code></td>
-<td style="text-align: left">MASTER is the master server for the shard. Only MASTER allows DMLs.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>REPLICA</code></td>
-<td style="text-align: left"><code>2</code></td>
-<td style="text-align: left">REPLICA is a slave type. It is used to serve live traffic. A REPLICA can be promoted to MASTER. A demoted MASTER will go to REPLICA.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>RDONLY</code></td>
-<td style="text-align: left"><code>3</code></td>
-<td style="text-align: left">RDONLY (old name) / BATCH (new name) is used to serve traffic for long-running jobs. It is a separate type from REPLICA so long-running queries don&#39;t affect web-like traffic.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>BATCH</code></td>
-<td style="text-align: left"><code>3</code></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>SPARE</code></td>
-<td style="text-align: left"><code>4</code></td>
-<td style="text-align: left">SPARE is a type of servers that cannot serve queries, but is available in case an extra server is needed.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>EXPERIMENTAL</code></td>
-<td style="text-align: left"><code>5</code></td>
-<td style="text-align: left">EXPERIMENTAL is like SPARE, except it can serve queries. This type can be used for usages not planned by Vitess, like online export to another storage engine.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>BACKUP</code></td>
-<td style="text-align: left"><code>6</code></td>
-<td style="text-align: left">BACKUP is the type a server goes to when taking a backup. No queries can be served in BACKUP mode.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>RESTORE</code></td>
-<td style="text-align: left"><code>7</code></td>
-<td style="text-align: left">RESTORE is the type a server uses when restoring a backup, at startup time.  No queries can be served in RESTORE mode.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>DRAINED</code></td>
-<td style="text-align: left"><code>8</code></td>
-<td style="text-align: left">DRAINED is the type a server goes into when used by Vitess tools to perform an offline action. It is a serving type (as the tools processes may need to run queries), but it&#39;s not used to route queries from Vitess users. In this state, this tablet is dedicated to the process that uses it.</td>
-</tr>
-</tbody></table>
-
-<h3 id="vtrpc-errorcode">vtrpc.ErrorCode</h3>
-
-<p>ErrorCode is the enum values for Errors. Internally, errors should be created with one of these codes. These will then be translated over the wire by various RPC frameworks.</p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Value</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>SUCCESS</code></td>
-<td style="text-align: left"><code>0</code></td>
-<td style="text-align: left">SUCCESS is returned from a successful call.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>CANCELLED</code></td>
-<td style="text-align: left"><code>1</code></td>
-<td style="text-align: left">CANCELLED means that the context was cancelled (and noticed in the app layer, as opposed to the RPC layer).</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>UNKNOWN_ERROR</code></td>
-<td style="text-align: left"><code>2</code></td>
-<td style="text-align: left">UNKNOWN_ERROR includes: 1. MySQL error codes that we don&#39;t explicitly handle. 2. MySQL response that wasn&#39;t as expected. For example, we might expect a MySQL timestamp to be returned in a particular way, but it wasn&#39;t. 3. Anything else that doesn&#39;t fall into a different bucket.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>BAD_INPUT</code></td>
-<td style="text-align: left"><code>3</code></td>
-<td style="text-align: left">BAD_INPUT is returned when an end-user either sends SQL that couldn&#39;t be parsed correctly, or tries a query that isn&#39;t supported by Vitess.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>DEADLINE_EXCEEDED</code></td>
-<td style="text-align: left"><code>4</code></td>
-<td style="text-align: left">DEADLINE_EXCEEDED is returned when an action is taking longer than a given timeout.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>INTEGRITY_ERROR</code></td>
-<td style="text-align: left"><code>5</code></td>
-<td style="text-align: left">INTEGRITY_ERROR is returned on integrity error from MySQL, usually due to duplicate primary keys.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>PERMISSION_DENIED</code></td>
-<td style="text-align: left"><code>6</code></td>
-<td style="text-align: left">PERMISSION_DENIED errors are returned when a user requests access to something that they don&#39;t have permissions for.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>RESOURCE_EXHAUSTED</code></td>
-<td style="text-align: left"><code>7</code></td>
-<td style="text-align: left">RESOURCE_EXHAUSTED is returned when a query exceeds its quota in some dimension and can&#39;t be completed due to that. Queries that return RESOURCE_EXHAUSTED should not be retried, as it could be detrimental to the server&#39;s health. Examples of errors that will cause the RESOURCE_EXHAUSTED code: 1. TxPoolFull: this is retried server-side, and is only returned as an error if the server-side retries failed. 2. Query is killed due to it taking too long.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>QUERY_NOT_SERVED</code></td>
-<td style="text-align: left"><code>8</code></td>
-<td style="text-align: left">QUERY_NOT_SERVED means that a query could not be served right now. Client can interpret it as: &quot;the tablet that you sent this query to cannot serve the query right now, try a different tablet or try again later.&quot; This could be due to various reasons: QueryService is not serving, should not be serving, wrong shard, wrong tablet type, blacklisted table, etc. Clients that receive this error should usually retry the query, but after taking the appropriate steps to make sure that the query will get sent to the correct tablet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>NOT_IN_TX</code></td>
-<td style="text-align: left"><code>9</code></td>
-<td style="text-align: left">NOT_IN_TX means that we&#39;re not currently in a transaction, but we should be.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>INTERNAL_ERROR</code></td>
-<td style="text-align: left"><code>10</code></td>
-<td style="text-align: left">INTERNAL_ERRORs are problems that only the server can fix, not the client. These errors are not due to a query itself, but rather due to the state of the system. Generally, we don&#39;t expect the errors to go away by themselves, but they may go away after human intervention. Examples of scenarios where INTERNAL_ERROR is returned: 1. Something is not configured correctly internally. 2. A necessary resource is not available, and we don&#39;t expect it to become available by itself. 3. A sanity check fails. 4. Some other internal error occurs. Clients should not retry immediately, as there is little chance of success. However, it&#39;s acceptable for retries to happen internally, for example to multiple backends, in case only a subset of backend are not functional.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>TRANSIENT_ERROR</code></td>
-<td style="text-align: left"><code>11</code></td>
-<td style="text-align: left">TRANSIENT_ERROR is used for when there is some error that we expect we can recover from automatically - often due to a resource limit temporarily being reached. Retrying this error, with an exponential backoff, should succeed. Clients should be able to successfully retry the query on the same backends. Examples of things that can trigger this error: 1. Query has been throttled 2. VtGate could have request backlog</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>UNAUTHENTICATED</code></td>
-<td style="text-align: left"><code>12</code></td>
-<td style="text-align: left">UNAUTHENTICATED errors are returned when a user requests access to something, and we&#39;re unable to verify the user&#39;s authentication.</td>
-</tr>
-</tbody></table>
-
-<h2 id="messages">Messages</h2>
-
-<h3 id="boundkeyspaceidquery">BoundKeyspaceIdQuery</h3>
-
-<p>BoundKeyspaceIdQuery represents a single query request for the specified list of keyspace ids. This is used in a list for ExecuteBatchKeyspaceIdsRequest.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace_ids</code> <br>list &lt;bytes&gt;</td>
-<td style="text-align: left">keyspace_ids contains the list of keyspace_ids affected by this query. Will be used to find the shards to send the query to.</td>
-</tr>
-</tbody></table>
-
-<h3 id="boundshardquery">BoundShardQuery</h3>
-
-<p>BoundShardQuery represents a single query request for the specified list of shards. This is used in a list for ExecuteBatchShardsRequest.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
-<td style="text-align: left">BoundQuery is a query with its bind variables</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">keyspace to target the query to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shards</code> <br>list &lt;string&gt;</td>
-<td style="text-align: left">shards to target the query to. A DML can only target one shard.</td>
-</tr>
-</tbody></table>
-
-<h3 id="session">Session</h3>
-
-<p>Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>in_transaction</code> <br>bool</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shard_sessions</code> <br>list &lt;<a href="#session.shardsession">ShardSession</a>&gt;</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>single_db</code> <br>bool</td>
-<td style="text-align: left">single_db specifies if the transaction should be restricted to a single database.</td>
-</tr>
-</tbody></table>
-
-<h4 id="messages">Messages</h4>
-
-<h5 id="session-shardsession">Session.ShardSession</h5>
-
-<p><em>Properties</em></p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>target</code> <br><a href="#query.target">query.Target</a></td>
-<td style="text-align: left">Target describes what the client expects the tablet is. If the tablet does not match, an error is returned.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>transaction_id</code> <br>int64</td>
-<td style="text-align: left"></td>
-</tr>
-</tbody></table>
-
-<h3 id="query-bindvariable">query.BindVariable</h3>
-
-<p>BindVariable represents a single bind variable in a Query.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>type</code> <br><a href="#query.type">Type</a></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>value</code> <br>bytes</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>values</code> <br>list &lt;<a href="#query.value">Value</a>&gt;</td>
-<td style="text-align: left">Value represents a typed value.</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-boundquery">query.BoundQuery</h3>
-
-<p>BoundQuery is a query with its bind variables</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>sql</code> <br>string</td>
-<td style="text-align: left">sql is the SQL query to execute</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>bind_variables</code> <br>map &lt;string, <a href="#query.bindvariable">BindVariable</a>&gt;</td>
-<td style="text-align: left">bind_variables is a map of all bind variables to expand in the query</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-eventtoken">query.EventToken</h3>
-
-<p>EventToken is a structure that describes a point in time in a replication stream on one shard. The most recent known replication position can be retrieved from vttablet when executing a query. It is also sent with the replication streams from the binlog service.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>timestamp</code> <br>int64</td>
-<td style="text-align: left">timestamp is the MySQL timestamp of the statements. Seconds since Epoch.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shard</code> <br>string</td>
-<td style="text-align: left">The shard name that applied the statements. Note this is not set when streaming from a vttablet. It is only used on the client -&gt; vtgate link.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>position</code> <br>string</td>
-<td style="text-align: left">The position on the replication stream after this statement was applied. It is not the transaction ID / GTID, but the position / GTIDSet.</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-executeoptions">query.ExecuteOptions</h3>
-
-<p>ExecuteOptions is passed around for all Execute calls.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>include_event_token</code> <br>bool</td>
-<td style="text-align: left">This used to be exclude_field_names, which was replaced by IncludedFields enum below If set, we will try to include an EventToken with the responses.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>compare_event_token</code> <br><a href="#query.eventtoken">EventToken</a></td>
-<td style="text-align: left">EventToken is a structure that describes a point in time in a replication stream on one shard. The most recent known replication position can be retrieved from vttablet when executing a query. It is also sent with the replication streams from the binlog service.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>included_fields</code> <br><a href="#executeoptions.includedfields">IncludedFields</a></td>
-<td style="text-align: left">Controls what fields are returned in Field message responses from mysql, i.e. field name, table name, etc. This is an optimization for high-QPS queries where the client knows what it&#39;s getting</td>
-</tr>
-</tbody></table>
-
-<h4 id="enums">Enums</h4>
-
-<h5 id="executeoptions-includedfields">ExecuteOptions.IncludedFields</h5>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Value</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>TYPE_AND_NAME</code></td>
-<td style="text-align: left"><code>0</code></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>TYPE_ONLY</code></td>
-<td style="text-align: left"><code>1</code></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>ALL</code></td>
-<td style="text-align: left"><code>2</code></td>
-<td style="text-align: left"></td>
-</tr>
-</tbody></table>
-
-<h3 id="query-field">query.Field</h3>
-
-<p>Field describes a single column returned by a query</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>name</code> <br>string</td>
-<td style="text-align: left">name of the field as returned by mysql C API</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>type</code> <br><a href="#query.type">Type</a></td>
-<td style="text-align: left">vitess-defined type. Conversion function is in sqltypes package.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>table</code> <br>string</td>
-<td style="text-align: left">Remaining fields from mysql C API. These fields are only populated when ExecuteOptions.included_fields is set to IncludedFields.ALL.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>org_table</code> <br>string</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>database</code> <br>string</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>org_name</code> <br>string</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>column_length</code> <br>uint32</td>
-<td style="text-align: left">column_length is really a uint32. All 32 bits can be used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>charset</code> <br>uint32</td>
-<td style="text-align: left">charset is actually a uint16. Only the lower 16 bits are used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>decimals</code> <br>uint32</td>
-<td style="text-align: left">decimals is actualy a uint8. Only the lower 8 bits are used.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>flags</code> <br>uint32</td>
-<td style="text-align: left">flags is actually a uint16. Only the lower 16 bits are used.</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-queryresult">query.QueryResult</h3>
-
-<p>QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>fields</code> <br>list &lt;<a href="#query.field">Field</a>&gt;</td>
-<td style="text-align: left">Field describes a single column returned by a query</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>rows_affected</code> <br>uint64</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>insert_id</code> <br>uint64</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>rows</code> <br>list &lt;<a href="#query.row">Row</a>&gt;</td>
-<td style="text-align: left">Row is a database row.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>extras</code> <br><a href="#query.resultextras">ResultExtras</a></td>
-<td style="text-align: left">ResultExtras contains optional out-of-band information. Usually the extras are requested by adding ExecuteOptions flags.</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-resultextras">query.ResultExtras</h3>
-
-<p>ResultExtras contains optional out-of-band information. Usually the extras are requested by adding ExecuteOptions flags.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>event_token</code> <br><a href="#query.eventtoken">EventToken</a></td>
-<td style="text-align: left">EventToken is a structure that describes a point in time in a replication stream on one shard. The most recent known replication position can be retrieved from vttablet when executing a query. It is also sent with the replication streams from the binlog service.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>fresher</code> <br>bool</td>
-<td style="text-align: left">If set, it means the data returned with this result is fresher than the compare_token passed in the ExecuteOptions.</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-resultwitherror">query.ResultWithError</h3>
-
-<p>ResultWithError represents a query response in the form of result or error but not both.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
-<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
-<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-row">query.Row</h3>
-
-<p>Row is a database row.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>lengths</code> <br>list &lt;sint64&gt;</td>
-<td style="text-align: left">lengths contains the length of each value in values. A length of -1 means that the field is NULL. While reading values, you have to accummulate the length to know the offset where the next value begins in values.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>values</code> <br>bytes</td>
-<td style="text-align: left">values contains a concatenation of all values in the row.</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-streamevent">query.StreamEvent</h3>
-
-<p>StreamEvent describes a set of transformations that happened as a single transactional unit on a server. It is streamed back by the Update Stream calls.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>statements</code> <br>list &lt;<a href="#streamevent.statement">Statement</a>&gt;</td>
-<td style="text-align: left">The statements in this transaction.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>event_token</code> <br><a href="#query.eventtoken">EventToken</a></td>
-<td style="text-align: left">EventToken is a structure that describes a point in time in a replication stream on one shard. The most recent known replication position can be retrieved from vttablet when executing a query. It is also sent with the replication streams from the binlog service.</td>
-</tr>
-</tbody></table>
-
-<h4 id="messages">Messages</h4>
-
-<h5 id="streamevent-statement">StreamEvent.Statement</h5>
-
-<p>One individual Statement in a transaction.</p>
-
-<p><em>Properties</em></p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>category</code> <br><a href="#streamevent.statement.category">Category</a></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>table_name</code> <br>string</td>
-<td style="text-align: left">table_name, primary_key_fields and primary_key_values are set for DML.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>primary_key_fields</code> <br>list &lt;<a href="#query.field">Field</a>&gt;</td>
-<td style="text-align: left">Field describes a single column returned by a query</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>primary_key_values</code> <br>list &lt;<a href="#query.row">Row</a>&gt;</td>
-<td style="text-align: left">Row is a database row.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>sql</code> <br>bytes</td>
-<td style="text-align: left">sql is set for all queries. FIXME(alainjobart) we may not need it for DMLs.</td>
-</tr>
-</tbody></table>
-
-<h4 id="enums">Enums</h4>
-
-<h5 id="streamevent-statement-category">StreamEvent.Statement.Category</h5>
-
-<p>One individual Statement in a transaction. The category of one statement.</p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Value</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>Error</code></td>
-<td style="text-align: left"><code>0</code></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>DML</code></td>
-<td style="text-align: left"><code>1</code></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>DDL</code></td>
-<td style="text-align: left"><code>2</code></td>
-<td style="text-align: left"></td>
-</tr>
-</tbody></table>
-
-<h3 id="query-target">query.Target</h3>
-
-<p>Target describes what the client expects the tablet is. If the tablet does not match, an error is returned.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shard</code> <br>string</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
-<td style="text-align: left">TabletType represents the type of a given tablet.</td>
-</tr>
-</tbody></table>
-
-<h3 id="query-value">query.Value</h3>
-
-<p>Value represents a typed value.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>type</code> <br><a href="#query.type">Type</a></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>value</code> <br>bytes</td>
-<td style="text-align: left"></td>
-</tr>
-</tbody></table>
-
-<h3 id="topodata-keyrange">topodata.KeyRange</h3>
-
-<p>KeyRange describes a range of sharding keys, when range-based sharding is used.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>start</code> <br>bytes</td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>end</code> <br>bytes</td>
-<td style="text-align: left"></td>
-</tr>
-</tbody></table>
-
-<h3 id="topodata-shardreference">topodata.ShardReference</h3>
-
-<p>ShardReference is used as a pointer from a SrvKeyspace to a Shard</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>name</code> <br>string</td>
-<td style="text-align: left">Copied from Shard.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>key_range</code> <br><a href="#topodata.keyrange">KeyRange</a></td>
-<td style="text-align: left">KeyRange describes a range of sharding keys, when range-based sharding is used.</td>
-</tr>
-</tbody></table>
-
-<h3 id="topodata-srvkeyspace">topodata.SrvKeyspace</h3>
-
-<p>SrvKeyspace is a rollup node for the keyspace itself.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>partitions</code> <br>list &lt;<a href="#srvkeyspace.keyspacepartition">KeyspacePartition</a>&gt;</td>
-<td style="text-align: left">The partitions this keyspace is serving, per tablet type.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>sharding_column_name</code> <br>string</td>
-<td style="text-align: left">copied from Keyspace</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>sharding_column_type</code> <br><a href="#topodata.keyspaceidtype">KeyspaceIdType</a></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>served_from</code> <br>list &lt;<a href="#srvkeyspace.servedfrom">ServedFrom</a>&gt;</td>
-<td style="text-align: left"></td>
-</tr>
-</tbody></table>
-
-<h4 id="messages">Messages</h4>
-
-<h5 id="srvkeyspace-keyspacepartition">SrvKeyspace.KeyspacePartition</h5>
-
-<p><em>Properties</em></p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>served_type</code> <br><a href="#topodata.tablettype">TabletType</a></td>
-<td style="text-align: left">The type this partition applies to.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>shard_references</code> <br>list &lt;<a href="#topodata.shardreference">ShardReference</a>&gt;</td>
-<td style="text-align: left">ShardReference is used as a pointer from a SrvKeyspace to a Shard</td>
-</tr>
-</tbody></table>
-
-<h5 id="srvkeyspace-servedfrom">SrvKeyspace.ServedFrom</h5>
-
-<p>ServedFrom indicates a relationship between a TabletType and the keyspace name that&#39;s serving it.</p>
-
-<p><em>Properties</em></p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">TabletType</a></td>
-<td style="text-align: left">ServedFrom indicates a relationship between a TabletType and the keyspace name that&#39;s serving it. the tablet type</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>keyspace</code> <br>string</td>
-<td style="text-align: left">the keyspace name that&#39;s serving it</td>
-</tr>
-</tbody></table>
-
-<h3 id="vtrpc-callerid">vtrpc.CallerID</h3>
-
-<p>CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>principal</code> <br>string</td>
-<td style="text-align: left">principal is the effective user identifier. It is usually filled in with whoever made the request to the appserver, if the request came from an automated job or another system component. If the request comes directly from the Internet, or if the Vitess client takes action on its own accord, it is okay for this field to be absent.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>component</code> <br>string</td>
-<td style="text-align: left">component describes the running process of the effective caller. It can for instance be the hostname:port of the servlet initiating the database call, or the container engine ID used by the servlet.</td>
-</tr>
-<tr>
-<td style="text-align: left"><code>subcomponent</code> <br>string</td>
-<td style="text-align: left">subcomponent describes a component inisde the immediate caller which is responsible for generating is request. Suggested values are a servlet name or an API endpoint name.</td>
-</tr>
-</tbody></table>
-
-<h3 id="vtrpc-rpcerror">vtrpc.RPCError</h3>
-
-<p>RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</p>
-
-<h4 id="properties">Properties</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left"><code>code</code> <br><a href="#vtrpc.errorcode">ErrorCode</a></td>
-<td style="text-align: left"></td>
-</tr>
-<tr>
-<td style="text-align: left"><code>message</code> <br>string</td>
-<td style="text-align: left"></td>
-</tr>
-</tbody></table>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/reference/vitess-api/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/reference/vitess-api/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/reference/vitess-api/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/reference/vitess-api/"</script>
 </html>
diff --git a/docs/reference/vitess-api/index.html b/docs/reference/vitess-api/index.html
new file mode 100644
index 00000000000..685bcae2aa2
--- /dev/null
+++ b/docs/reference/vitess-api/index.html
@@ -0,0 +1,2599 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Vitess API Reference | Vitess</title>
+<meta property="og:title" content="Vitess API Reference" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/reference/vitess-api/" />
+<meta property="og:url" content="http://vitess.io/reference/vitess-api/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/reference/vitess-api/","headline":"Vitess API Reference","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Vitess API Reference</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>This document describes Vitess API methods that enable your client application to more easily talk to your storage system to query data. API methods are grouped into the following categories:</p>
+
+<ul>
+<li><a href="#range-based-sharding">Range-based Sharding</a></li>
+<li><a href="#transactions">Transactions</a></li>
+<li><a href="#custom-sharding">Custom Sharding</a></li>
+<li><a href="#map-reduce">Map Reduce</a></li>
+<li><a href="#topology">Topology</a></li>
+<li><a href="#v3-api-(alpha)">v3 API (alpha)</a></li>
+</ul>
+
+<p>The following table lists the methods in each group and links to more detail about each method:</p>
+
+<table id="api-method-summary">
+<tr><td class="api-method-summary-group" colspan="2">Range-based Sharding</td></tr>
+<tr>
+<td><code><a href="#executebatchkeyspaceids">ExecuteBatchKeyspaceIds</a></code></td>
+<td>ExecuteBatchKeyspaceIds executes the list of queries based on the specified keyspace ids.</td>
+</tr>
+<tr>
+<td><code><a href="#executeentityids">ExecuteEntityIds</a></code></td>
+<td>ExecuteEntityIds executes the query based on the specified external id to keyspace id map.</td>
+</tr>
+<tr>
+<td><code><a href="#executekeyranges">ExecuteKeyRanges</a></code></td>
+<td>ExecuteKeyRanges executes the query based on the specified key ranges.</td>
+</tr>
+<tr>
+<td><code><a href="#executekeyspaceids">ExecuteKeyspaceIds</a></code></td>
+<td>ExecuteKeyspaceIds executes the query based on the specified keyspace ids.</td>
+</tr>
+<tr>
+<td><code><a href="#streamexecutekeyranges">StreamExecuteKeyRanges</a></code></td>
+<td>StreamExecuteKeyRanges executes a streaming query based on key ranges. Use this method if the query returns a large number of rows.</td>
+</tr>
+<tr>
+<td><code><a href="#streamexecutekeyspaceids">StreamExecuteKeyspaceIds</a></code></td>
+<td>StreamExecuteKeyspaceIds executes a streaming query based on keyspace ids. Use this method if the query returns a large number of rows.</td>
+</tr>
+<tr><td class="api-method-summary-group" colspan="2">Transactions</td></tr>
+<tr>
+<td><code><a href="#begin">Begin</a></code></td>
+<td>Begin a transaction.</td>
+</tr>
+<tr>
+<td><code><a href="#commit">Commit</a></code></td>
+<td>Commit a transaction.</td>
+</tr>
+<tr>
+<td><code><a href="#resolvetransaction">ResolveTransaction</a></code></td>
+<td>ResolveTransaction resolves a transaction.</td>
+</tr>
+<tr>
+<td><code><a href="#rollback">Rollback</a></code></td>
+<td>Rollback a transaction.</td>
+</tr>
+<tr><td class="api-method-summary-group" colspan="2">Custom Sharding</td></tr>
+<tr>
+<td><code><a href="#executebatchshards">ExecuteBatchShards</a></code></td>
+<td>ExecuteBatchShards executes the list of queries on the specified shards.</td>
+</tr>
+<tr>
+<td><code><a href="#executeshards">ExecuteShards</a></code></td>
+<td>ExecuteShards executes the query on the specified shards.</td>
+</tr>
+<tr>
+<td><code><a href="#streamexecuteshards">StreamExecuteShards</a></code></td>
+<td>StreamExecuteShards executes a streaming query based on shards. Use this method if the query returns a large number of rows.</td>
+</tr>
+<tr><td class="api-method-summary-group" colspan="2">Map Reduce</td></tr>
+<tr>
+<td><code><a href="#splitquery">SplitQuery</a></code></td>
+<td>Split a query into non-overlapping sub queries</td>
+</tr>
+<tr><td class="api-method-summary-group" colspan="2">Topology</td></tr>
+<tr>
+<td><code><a href="#getsrvkeyspace">GetSrvKeyspace</a></code></td>
+<td>GetSrvKeyspace returns a SrvKeyspace object (as seen by this vtgate). This method is provided as a convenient way for clients to take a look at the sharding configuration for a Keyspace. Looking at the sharding information should not be used for routing queries (as the information may change, use the Execute calls for that). It is convenient for monitoring applications for instance, or if using custom sharding.</td>
+</tr>
+<tr><td class="api-method-summary-group" colspan="2">v3 API (alpha)</td></tr>
+<tr>
+<td><code><a href="#execute">Execute</a></code></td>
+<td>Execute tries to route the query to the right shard. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query.</td>
+</tr>
+<tr>
+<td><code><a href="#streamexecute">StreamExecute</a></code></td>
+<td>StreamExecute executes a streaming query based on shards. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query. Use this method if the query returns a large number of rows.</td>
+</tr>
+</table>
+
+<h2 id="range-based-sharding">Range-based Sharding</h2>
+
+<h3 id="executebatchkeyspaceids">ExecuteBatchKeyspaceIds</h3>
+
+<p>ExecuteBatchKeyspaceIds executes the list of queries based on the specified keyspace ids.</p>
+
+<h4 id="request">Request</h4>
+
+<p>ExecuteBatchKeyspaceIdsRequest is the payload to ExecuteBatchKeyspaceId.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>queries</code> <br>list &lt;<a href="#boundkeyspaceidquery">BoundKeyspaceIdQuery</a>&gt;</td>
+<td style="text-align: left">BoundKeyspaceIdQuery represents a single query request for the specified list of keyspace ids. This is used in a list for ExecuteBatchKeyspaceIdsRequest.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>as_transaction</code> <br>bool</td>
+<td style="text-align: left">as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose. (this can be seen as adding a &#39;begin&#39; before and &#39;commit&#39; after the queries). Only makes sense if tablet_type is master. If set, the Session is ignored.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>ExecuteBatchKeyspaceIdsResponse is the returned value from ExecuteBatchKeyspaceId.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
+<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>results</code> <br>list &lt;<a href="#query.queryresult">query.QueryResult</a>&gt;</td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="executeentityids">ExecuteEntityIds</h3>
+
+<p>ExecuteEntityIds executes the query based on the specified external id to keyspace id map.</p>
+
+<h4 id="request">Request</h4>
+
+<p>ExecuteEntityIdsRequest is the payload to ExecuteEntityIds.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>entity_column_name</code> <br>string</td>
+<td style="text-align: left">entity_column_name is the column name to use.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>entity_keyspace_ids</code> <br>list &lt;<a href="#executeentityidsrequest.entityid">EntityId</a>&gt;</td>
+<td style="text-align: left">entity_keyspace_ids are pairs of entity_column_name values associated with its corresponding keyspace_id.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
+<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="messages">Messages</h4>
+
+<h5 id="executeentityidsrequest-entityid">ExecuteEntityIdsRequest.EntityId</h5>
+
+<p><em>Properties</em></p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>type</code> <br><a href="#query.type">query.Type</a></td>
+<td style="text-align: left">Type defines the various supported data types in bind vars and query results.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>value</code> <br>bytes</td>
+<td style="text-align: left">value is the value for the entity. Not set if type is NULL_TYPE.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace_id</code> <br>bytes</td>
+<td style="text-align: left">keyspace_id is the associated keyspace_id for the entity.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>ExecuteEntityIdsResponse is the returned value from ExecuteEntityIds.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
+<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="executekeyranges">ExecuteKeyRanges</h3>
+
+<p>ExecuteKeyRanges executes the query based on the specified key ranges.</p>
+
+<h4 id="request">Request</h4>
+
+<p>ExecuteKeyRangesRequest is the payload to ExecuteKeyRanges.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>key_ranges</code> <br>list &lt;<a href="#topodata.keyrange">topodata.KeyRange</a>&gt;</td>
+<td style="text-align: left">KeyRange describes a range of sharding keys, when range-based sharding is used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
+<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>ExecuteKeyRangesResponse is the returned value from ExecuteKeyRanges.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
+<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="executekeyspaceids">ExecuteKeyspaceIds</h3>
+
+<p>ExecuteKeyspaceIds executes the query based on the specified keyspace ids.</p>
+
+<h4 id="request">Request</h4>
+
+<p>ExecuteKeyspaceIdsRequest is the payload to ExecuteKeyspaceIds.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace_ids</code> <br>list &lt;bytes&gt;</td>
+<td style="text-align: left">keyspace_ids contains the list of keyspace_ids affected by this query. Will be used to find the shards to send the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
+<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>ExecuteKeyspaceIdsResponse is the returned value from ExecuteKeyspaceIds.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
+<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="streamexecutekeyranges">StreamExecuteKeyRanges</h3>
+
+<p>StreamExecuteKeyRanges executes a streaming query based on key ranges. Use this method if the query returns a large number of rows.</p>
+
+<h4 id="request">Request</h4>
+
+<p>StreamExecuteKeyRangesRequest is the payload to StreamExecuteKeyRanges.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>key_ranges</code> <br>list &lt;<a href="#topodata.keyrange">topodata.KeyRange</a>&gt;</td>
+<td style="text-align: left">KeyRange describes a range of sharding keys, when range-based sharding is used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>StreamExecuteKeyRangesResponse is the returned value from StreamExecuteKeyRanges.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="streamexecutekeyspaceids">StreamExecuteKeyspaceIds</h3>
+
+<p>StreamExecuteKeyspaceIds executes a streaming query based on keyspace ids. Use this method if the query returns a large number of rows.</p>
+
+<h4 id="request">Request</h4>
+
+<p>StreamExecuteKeyspaceIdsRequest is the payload to StreamExecuteKeyspaceIds.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace_ids</code> <br>list &lt;bytes&gt;</td>
+<td style="text-align: left">keyspace_ids contains the list of keyspace_ids affected by this query. Will be used to find the shards to send the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>StreamExecuteKeyspaceIdsResponse is the returned value from StreamExecuteKeyspaceIds.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h2 id="transactions">Transactions</h2>
+
+<h3 id="begin">Begin</h3>
+
+<p>Begin a transaction.</p>
+
+<h4 id="request">Request</h4>
+
+<p>BeginRequest is the payload to Begin.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>single_db</code> <br>bool</td>
+<td style="text-align: left">single_db specifies if the transaction should be restricted to a single database.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>BeginResponse is the returned value from Begin.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+</tbody></table>
+
+<h3 id="commit">Commit</h3>
+
+<p>Commit a transaction.</p>
+
+<h4 id="request">Request</h4>
+
+<p>CommitRequest is the payload to Commit.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>atomic</code> <br>bool</td>
+<td style="text-align: left">atomic specifies if the commit should go through the 2PC workflow to ensure atomicity.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>CommitResponse is the returned value from Commit.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+</tbody></table>
+
+<h3 id="resolvetransaction">ResolveTransaction</h3>
+
+<p>ResolveTransaction resolves a transaction.</p>
+
+<h4 id="request">Request</h4>
+
+<p>ResolveTransactionRequest is the payload to ResolveTransaction.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>dtid</code> <br>string</td>
+<td style="text-align: left">dtid is the dtid of the transaction to be resolved.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>ResolveTransactionResponse is the returned value from Rollback.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+</tbody></table>
+
+<h3 id="rollback">Rollback</h3>
+
+<p>Rollback a transaction.</p>
+
+<h4 id="request">Request</h4>
+
+<p>RollbackRequest is the payload to Rollback.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>RollbackResponse is the returned value from Rollback.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+</tbody></table>
+
+<h2 id="custom-sharding">Custom Sharding</h2>
+
+<h3 id="executebatchshards">ExecuteBatchShards</h3>
+
+<p>ExecuteBatchShards executes the list of queries on the specified shards.</p>
+
+<h4 id="request">Request</h4>
+
+<p>ExecuteBatchShardsRequest is the payload to ExecuteBatchShards</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>queries</code> <br>list &lt;<a href="#boundshardquery">BoundShardQuery</a>&gt;</td>
+<td style="text-align: left">BoundShardQuery represents a single query request for the specified list of shards. This is used in a list for ExecuteBatchShardsRequest.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>as_transaction</code> <br>bool</td>
+<td style="text-align: left">as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose. (this can be seen as adding a &#39;begin&#39; before and &#39;commit&#39; after the queries). Only makes sense if tablet_type is master. If set, the Session is ignored.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>ExecuteBatchShardsResponse is the returned value from ExecuteBatchShards.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
+<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>results</code> <br>list &lt;<a href="#query.queryresult">query.QueryResult</a>&gt;</td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="executeshards">ExecuteShards</h3>
+
+<p>ExecuteShards executes the query on the specified shards.</p>
+
+<h4 id="request">Request</h4>
+
+<p>ExecuteShardsRequest is the payload to ExecuteShards.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shards</code> <br>list &lt;string&gt;</td>
+<td style="text-align: left">shards to target the query to. A DML can only target one shard.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
+<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>ExecuteShardsResponse is the returned value from ExecuteShards.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
+<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="streamexecuteshards">StreamExecuteShards</h3>
+
+<p>StreamExecuteShards executes a streaming query based on shards. Use this method if the query returns a large number of rows.</p>
+
+<h4 id="request">Request</h4>
+
+<p>StreamExecuteShardsRequest is the payload to StreamExecuteShards.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shards</code> <br>list &lt;string&gt;</td>
+<td style="text-align: left">shards to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>StreamExecuteShardsResponse is the returned value from StreamExecuteShards.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h2 id="map-reduce">Map Reduce</h2>
+
+<h3 id="splitquery">SplitQuery</h3>
+
+<p>Split a query into non-overlapping sub queries</p>
+
+<h4 id="request">Request</h4>
+
+<p>SplitQueryRequest is the payload to SplitQuery.  SplitQuery takes a &quot;SELECT&quot; query and generates a list of queries called &quot;query-parts&quot;. Each query-part consists of the original query with an added WHERE clause that restricts the query-part to operate only on rows whose values in the the columns listed in the &quot;split_column&quot; field of the request (see below) are in a particular range.  It is guaranteed that the set of rows obtained from executing each query-part on a database snapshot and merging (without deduping) the results is equal to the set of rows obtained from executing the original query on the same snapshot with the rows containing NULL values in any of the split_column&#39;s excluded.  This is typically called by the MapReduce master when reading from Vitess. There it&#39;s desirable that the sets of rows returned by the query-parts have roughly the same size.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>split_column</code> <br>list &lt;string&gt;</td>
+<td style="text-align: left">Each generated query-part will be restricted to rows whose values in the columns listed in this field are in a particular range. The list of columns named here must be a prefix of the list of columns defining some index or primary key of the table referenced in &#39;query&#39;. For many tables using the primary key columns (in order) is sufficient and this is the default if this field is omitted. See the comment on the &#39;algorithm&#39; field for more restrictions and information.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>split_count</code> <br>int64</td>
+<td style="text-align: left">You can specify either an estimate of the number of query-parts to generate or an estimate of the number of rows each query-part should return. Thus, exactly one of split_count or num_rows_per_query_part should be nonzero. The non-given parameter is calculated from the given parameter using the formula: split_count * num_rows_per_query_pary = table_size, where table_size is an approximation of the number of rows in the table. Note that if &quot;split_count&quot; is given it is regarded as an estimate. The number of query-parts returned may differ slightly (in particular, if it&#39;s not a whole multiple of the number of vitess shards).</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>num_rows_per_query_part</code> <br>int64</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>algorithm</code> <br>query.SplitQueryRequest.Algorithm</td>
+<td style="text-align: left">The algorithm to use to split the query. The split algorithm is performed on each database shard in parallel. The lists of query-parts generated by the shards are merged and returned to the caller. Two algorithms are supported: EQUAL_SPLITS If this algorithm is selected then only the first &#39;split_column&#39; given is used (or the first primary key column if the &#39;split_column&#39; field is empty). In the rest of this algorithm&#39;s description, we refer to this column as &quot;the split column&quot;. The split column must have numeric type (integral or floating point). The algorithm works by taking the interval [min, max], where min and max are the minimum and maximum values of the split column in the table-shard, respectively, and partitioning it into &#39;split_count&#39; sub-intervals of equal size. The added WHERE clause of each query-part restricts that part to rows whose value in the split column belongs to a particular sub-interval. This is fast, but requires that the distribution of values of the split column be uniform in [min, max] for the number of rows returned by each query part to be roughly the same. FULL_SCAN If this algorithm is used then the split_column must be the primary key columns (in order). This algorithm performs a full-scan of the table-shard referenced in &#39;query&#39; to get &quot;boundary&quot; rows that are num_rows_per_query_part apart when the table is ordered by the columns listed in &#39;split_column&#39;. It then restricts each query-part to the rows located between two successive boundary rows. This algorithm supports multiple split_column&#39;s of any type, but is slower than EQUAL_SPLITS.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>use_split_query_v2</code> <br>bool</td>
+<td style="text-align: left">Remove this field after this new server code is released to prod. We must keep it for now, so that clients can still send it to the old server code currently in production.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>SplitQueryResponse is the returned value from SplitQuery.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>splits</code> <br>list &lt;<a href="#splitqueryresponse.part">Part</a>&gt;</td>
+<td style="text-align: left">splits contains the queries to run to fetch the entire data set.</td>
+</tr>
+</tbody></table>
+
+<h4 id="messages">Messages</h4>
+
+<h5 id="splitqueryresponse-keyrangepart">SplitQueryResponse.KeyRangePart</h5>
+
+<p><em>Properties</em></p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>key_ranges</code> <br>list &lt;<a href="#topodata.keyrange">topodata.KeyRange</a>&gt;</td>
+<td style="text-align: left">KeyRange describes a range of sharding keys, when range-based sharding is used.</td>
+</tr>
+</tbody></table>
+
+<h5 id="splitqueryresponse-part">SplitQueryResponse.Part</h5>
+
+<p><em>Properties</em></p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>key_range_part</code> <br><a href="#splitqueryresponse.keyrangepart">KeyRangePart</a></td>
+<td style="text-align: left">key_range_part is set if the query should be executed by ExecuteKeyRanges.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shard_part</code> <br><a href="#splitqueryresponse.shardpart">ShardPart</a></td>
+<td style="text-align: left">shard_part is set if the query should be executed by ExecuteShards.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>size</code> <br>int64</td>
+<td style="text-align: left">size is the approximate number of rows this query will return.</td>
+</tr>
+</tbody></table>
+
+<h5 id="splitqueryresponse-shardpart">SplitQueryResponse.ShardPart</h5>
+
+<p><em>Properties</em></p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shards</code> <br>list &lt;string&gt;</td>
+<td style="text-align: left">shards to target the query to.</td>
+</tr>
+</tbody></table>
+
+<h2 id="topology">Topology</h2>
+
+<h3 id="getsrvkeyspace">GetSrvKeyspace</h3>
+
+<p>GetSrvKeyspace returns a SrvKeyspace object (as seen by this vtgate). This method is provided as a convenient way for clients to take a look at the sharding configuration for a Keyspace. Looking at the sharding information should not be used for routing queries (as the information may change, use the Execute calls for that). It is convenient for monitoring applications for instance, or if using custom sharding.</p>
+
+<h4 id="request">Request</h4>
+
+<p>GetSrvKeyspaceRequest is the payload to GetSrvKeyspace.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace name to fetch.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>GetSrvKeyspaceResponse is the returned value from GetSrvKeyspace.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>srv_keyspace</code> <br><a href="#topodata.srvkeyspace">topodata.SrvKeyspace</a></td>
+<td style="text-align: left">SrvKeyspace is a rollup node for the keyspace itself.</td>
+</tr>
+</tbody></table>
+
+<h2 id="v3-api-alpha">v3 API (alpha)</h2>
+
+<h3 id="execute">Execute</h3>
+
+<p>Execute tries to route the query to the right shard. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query.</p>
+
+<h4 id="request">Request</h4>
+
+<p>ExecuteRequest is the payload to Execute.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>not_in_transaction</code> <br>bool</td>
+<td style="text-align: left">not_in_transaction is deprecated and should not be used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>ExecuteResponse is the returned value from Execute.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
+<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>session</code> <br><a href="#session">Session</a></td>
+<td style="text-align: left">Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="streamexecute">StreamExecute</h3>
+
+<p>StreamExecute executes a streaming query based on shards. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query. Use this method if the query returns a large number of rows.</p>
+
+<h4 id="request">Request</h4>
+
+<p>StreamExecuteRequest is the payload to StreamExecute.</p>
+
+<h5 id="parameters">Parameters</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>caller_id</code> <br><a href="#vtrpc.callerid">vtrpc.CallerID</a></td>
+<td style="text-align: left">CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>options</code> <br><a href="#query.executeoptions">query.ExecuteOptions</a></td>
+<td style="text-align: left">ExecuteOptions is passed around for all Execute calls.</td>
+</tr>
+</tbody></table>
+
+<h4 id="response">Response</h4>
+
+<p>StreamExecuteResponse is the returned value from StreamExecute.</p>
+
+<h5 id="properties">Properties</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h2 id="enums">Enums</h2>
+
+<h3 id="query-type">query.Type</h3>
+
+<p>Type defines the various supported data types in bind vars and query results.</p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Value</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>NULL_TYPE</code></td>
+<td style="text-align: left"><code>0</code></td>
+<td style="text-align: left">NULL_TYPE specifies a NULL type.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>INT8</code></td>
+<td style="text-align: left"><code>257</code></td>
+<td style="text-align: left">INT8 specifies a TINYINT type. Properties: 1, IsNumber.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>UINT8</code></td>
+<td style="text-align: left"><code>770</code></td>
+<td style="text-align: left">UINT8 specifies a TINYINT UNSIGNED type. Properties: 2, IsNumber, IsUnsigned.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>INT16</code></td>
+<td style="text-align: left"><code>259</code></td>
+<td style="text-align: left">INT16 specifies a SMALLINT type. Properties: 3, IsNumber.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>UINT16</code></td>
+<td style="text-align: left"><code>772</code></td>
+<td style="text-align: left">UINT16 specifies a SMALLINT UNSIGNED type. Properties: 4, IsNumber, IsUnsigned.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>INT24</code></td>
+<td style="text-align: left"><code>261</code></td>
+<td style="text-align: left">INT24 specifies a MEDIUMINT type. Properties: 5, IsNumber.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>UINT24</code></td>
+<td style="text-align: left"><code>774</code></td>
+<td style="text-align: left">UINT24 specifies a MEDIUMINT UNSIGNED type. Properties: 6, IsNumber, IsUnsigned.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>INT32</code></td>
+<td style="text-align: left"><code>263</code></td>
+<td style="text-align: left">INT32 specifies a INTEGER type. Properties: 7, IsNumber.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>UINT32</code></td>
+<td style="text-align: left"><code>776</code></td>
+<td style="text-align: left">UINT32 specifies a INTEGER UNSIGNED type. Properties: 8, IsNumber, IsUnsigned.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>INT64</code></td>
+<td style="text-align: left"><code>265</code></td>
+<td style="text-align: left">INT64 specifies a BIGINT type. Properties: 9, IsNumber.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>UINT64</code></td>
+<td style="text-align: left"><code>778</code></td>
+<td style="text-align: left">UINT64 specifies a BIGINT UNSIGNED type. Properties: 10, IsNumber, IsUnsigned.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>FLOAT32</code></td>
+<td style="text-align: left"><code>1035</code></td>
+<td style="text-align: left">FLOAT32 specifies a FLOAT type. Properties: 11, IsFloat.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>FLOAT64</code></td>
+<td style="text-align: left"><code>1036</code></td>
+<td style="text-align: left">FLOAT64 specifies a DOUBLE or REAL type. Properties: 12, IsFloat.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>TIMESTAMP</code></td>
+<td style="text-align: left"><code>2061</code></td>
+<td style="text-align: left">TIMESTAMP specifies a TIMESTAMP type. Properties: 13, IsQuoted.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>DATE</code></td>
+<td style="text-align: left"><code>2062</code></td>
+<td style="text-align: left">DATE specifies a DATE type. Properties: 14, IsQuoted.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>TIME</code></td>
+<td style="text-align: left"><code>2063</code></td>
+<td style="text-align: left">TIME specifies a TIME type. Properties: 15, IsQuoted.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>DATETIME</code></td>
+<td style="text-align: left"><code>2064</code></td>
+<td style="text-align: left">DATETIME specifies a DATETIME type. Properties: 16, IsQuoted.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>YEAR</code></td>
+<td style="text-align: left"><code>785</code></td>
+<td style="text-align: left">YEAR specifies a YEAR type. Properties: 17, IsNumber, IsUnsigned.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>DECIMAL</code></td>
+<td style="text-align: left"><code>18</code></td>
+<td style="text-align: left">DECIMAL specifies a DECIMAL or NUMERIC type. Properties: 18, None.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>TEXT</code></td>
+<td style="text-align: left"><code>6163</code></td>
+<td style="text-align: left">TEXT specifies a TEXT type. Properties: 19, IsQuoted, IsText.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>BLOB</code></td>
+<td style="text-align: left"><code>10260</code></td>
+<td style="text-align: left">BLOB specifies a BLOB type. Properties: 20, IsQuoted, IsBinary.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>VARCHAR</code></td>
+<td style="text-align: left"><code>6165</code></td>
+<td style="text-align: left">VARCHAR specifies a VARCHAR type. Properties: 21, IsQuoted, IsText.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>VARBINARY</code></td>
+<td style="text-align: left"><code>10262</code></td>
+<td style="text-align: left">VARBINARY specifies a VARBINARY type. Properties: 22, IsQuoted, IsBinary.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>CHAR</code></td>
+<td style="text-align: left"><code>6167</code></td>
+<td style="text-align: left">CHAR specifies a CHAR type. Properties: 23, IsQuoted, IsText.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>BINARY</code></td>
+<td style="text-align: left"><code>10264</code></td>
+<td style="text-align: left">BINARY specifies a BINARY type. Properties: 24, IsQuoted, IsBinary.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>BIT</code></td>
+<td style="text-align: left"><code>2073</code></td>
+<td style="text-align: left">BIT specifies a BIT type. Properties: 25, IsQuoted.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>ENUM</code></td>
+<td style="text-align: left"><code>2074</code></td>
+<td style="text-align: left">ENUM specifies an ENUM type. Properties: 26, IsQuoted.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>SET</code></td>
+<td style="text-align: left"><code>2075</code></td>
+<td style="text-align: left">SET specifies a SET type. Properties: 27, IsQuoted.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>TUPLE</code></td>
+<td style="text-align: left"><code>28</code></td>
+<td style="text-align: left">TUPLE specifies a a tuple. This cannot be returned in a QueryResult, but it can be sent as a bind var. Properties: 28, None.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>GEOMETRY</code></td>
+<td style="text-align: left"><code>2077</code></td>
+<td style="text-align: left">GEOMETRY specifies a GEOMETRY type. Properties: 29, IsQuoted.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>JSON</code></td>
+<td style="text-align: left"><code>2078</code></td>
+<td style="text-align: left">JSON specified a JSON type. Properties: 30, IsQuoted.</td>
+</tr>
+</tbody></table>
+
+<h3 id="topodata-keyspaceidtype">topodata.KeyspaceIdType</h3>
+
+<p>KeyspaceIdType describes the type of the sharding key for a range-based sharded keyspace.</p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Value</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>UNSET</code></td>
+<td style="text-align: left"><code>0</code></td>
+<td style="text-align: left">UNSET is the default value, when range-based sharding is not used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>UINT64</code></td>
+<td style="text-align: left"><code>1</code></td>
+<td style="text-align: left">UINT64 is when uint64 value is used. This is represented as &#39;unsigned bigint&#39; in mysql</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>BYTES</code></td>
+<td style="text-align: left"><code>2</code></td>
+<td style="text-align: left">BYTES is when an array of bytes is used. This is represented as &#39;varbinary&#39; in mysql</td>
+</tr>
+</tbody></table>
+
+<h3 id="topodata-tablettype">topodata.TabletType</h3>
+
+<p>TabletType represents the type of a given tablet.</p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Value</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>UNKNOWN</code></td>
+<td style="text-align: left"><code>0</code></td>
+<td style="text-align: left">UNKNOWN is not a valid value.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>MASTER</code></td>
+<td style="text-align: left"><code>1</code></td>
+<td style="text-align: left">MASTER is the master server for the shard. Only MASTER allows DMLs.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>REPLICA</code></td>
+<td style="text-align: left"><code>2</code></td>
+<td style="text-align: left">REPLICA is a slave type. It is used to serve live traffic. A REPLICA can be promoted to MASTER. A demoted MASTER will go to REPLICA.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>RDONLY</code></td>
+<td style="text-align: left"><code>3</code></td>
+<td style="text-align: left">RDONLY (old name) / BATCH (new name) is used to serve traffic for long-running jobs. It is a separate type from REPLICA so long-running queries don&#39;t affect web-like traffic.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>BATCH</code></td>
+<td style="text-align: left"><code>3</code></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>SPARE</code></td>
+<td style="text-align: left"><code>4</code></td>
+<td style="text-align: left">SPARE is a type of servers that cannot serve queries, but is available in case an extra server is needed.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>EXPERIMENTAL</code></td>
+<td style="text-align: left"><code>5</code></td>
+<td style="text-align: left">EXPERIMENTAL is like SPARE, except it can serve queries. This type can be used for usages not planned by Vitess, like online export to another storage engine.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>BACKUP</code></td>
+<td style="text-align: left"><code>6</code></td>
+<td style="text-align: left">BACKUP is the type a server goes to when taking a backup. No queries can be served in BACKUP mode.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>RESTORE</code></td>
+<td style="text-align: left"><code>7</code></td>
+<td style="text-align: left">RESTORE is the type a server uses when restoring a backup, at startup time.  No queries can be served in RESTORE mode.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>DRAINED</code></td>
+<td style="text-align: left"><code>8</code></td>
+<td style="text-align: left">DRAINED is the type a server goes into when used by Vitess tools to perform an offline action. It is a serving type (as the tools processes may need to run queries), but it&#39;s not used to route queries from Vitess users. In this state, this tablet is dedicated to the process that uses it.</td>
+</tr>
+</tbody></table>
+
+<h3 id="vtrpc-errorcode">vtrpc.ErrorCode</h3>
+
+<p>ErrorCode is the enum values for Errors. Internally, errors should be created with one of these codes. These will then be translated over the wire by various RPC frameworks.</p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Value</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>SUCCESS</code></td>
+<td style="text-align: left"><code>0</code></td>
+<td style="text-align: left">SUCCESS is returned from a successful call.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>CANCELLED</code></td>
+<td style="text-align: left"><code>1</code></td>
+<td style="text-align: left">CANCELLED means that the context was cancelled (and noticed in the app layer, as opposed to the RPC layer).</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>UNKNOWN_ERROR</code></td>
+<td style="text-align: left"><code>2</code></td>
+<td style="text-align: left">UNKNOWN_ERROR includes: 1. MySQL error codes that we don&#39;t explicitly handle. 2. MySQL response that wasn&#39;t as expected. For example, we might expect a MySQL timestamp to be returned in a particular way, but it wasn&#39;t. 3. Anything else that doesn&#39;t fall into a different bucket.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>BAD_INPUT</code></td>
+<td style="text-align: left"><code>3</code></td>
+<td style="text-align: left">BAD_INPUT is returned when an end-user either sends SQL that couldn&#39;t be parsed correctly, or tries a query that isn&#39;t supported by Vitess.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>DEADLINE_EXCEEDED</code></td>
+<td style="text-align: left"><code>4</code></td>
+<td style="text-align: left">DEADLINE_EXCEEDED is returned when an action is taking longer than a given timeout.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>INTEGRITY_ERROR</code></td>
+<td style="text-align: left"><code>5</code></td>
+<td style="text-align: left">INTEGRITY_ERROR is returned on integrity error from MySQL, usually due to duplicate primary keys.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>PERMISSION_DENIED</code></td>
+<td style="text-align: left"><code>6</code></td>
+<td style="text-align: left">PERMISSION_DENIED errors are returned when a user requests access to something that they don&#39;t have permissions for.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>RESOURCE_EXHAUSTED</code></td>
+<td style="text-align: left"><code>7</code></td>
+<td style="text-align: left">RESOURCE_EXHAUSTED is returned when a query exceeds its quota in some dimension and can&#39;t be completed due to that. Queries that return RESOURCE_EXHAUSTED should not be retried, as it could be detrimental to the server&#39;s health. Examples of errors that will cause the RESOURCE_EXHAUSTED code: 1. TxPoolFull: this is retried server-side, and is only returned as an error if the server-side retries failed. 2. Query is killed due to it taking too long.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>QUERY_NOT_SERVED</code></td>
+<td style="text-align: left"><code>8</code></td>
+<td style="text-align: left">QUERY_NOT_SERVED means that a query could not be served right now. Client can interpret it as: &quot;the tablet that you sent this query to cannot serve the query right now, try a different tablet or try again later.&quot; This could be due to various reasons: QueryService is not serving, should not be serving, wrong shard, wrong tablet type, blacklisted table, etc. Clients that receive this error should usually retry the query, but after taking the appropriate steps to make sure that the query will get sent to the correct tablet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>NOT_IN_TX</code></td>
+<td style="text-align: left"><code>9</code></td>
+<td style="text-align: left">NOT_IN_TX means that we&#39;re not currently in a transaction, but we should be.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>INTERNAL_ERROR</code></td>
+<td style="text-align: left"><code>10</code></td>
+<td style="text-align: left">INTERNAL_ERRORs are problems that only the server can fix, not the client. These errors are not due to a query itself, but rather due to the state of the system. Generally, we don&#39;t expect the errors to go away by themselves, but they may go away after human intervention. Examples of scenarios where INTERNAL_ERROR is returned: 1. Something is not configured correctly internally. 2. A necessary resource is not available, and we don&#39;t expect it to become available by itself. 3. A sanity check fails. 4. Some other internal error occurs. Clients should not retry immediately, as there is little chance of success. However, it&#39;s acceptable for retries to happen internally, for example to multiple backends, in case only a subset of backend are not functional.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>TRANSIENT_ERROR</code></td>
+<td style="text-align: left"><code>11</code></td>
+<td style="text-align: left">TRANSIENT_ERROR is used for when there is some error that we expect we can recover from automatically - often due to a resource limit temporarily being reached. Retrying this error, with an exponential backoff, should succeed. Clients should be able to successfully retry the query on the same backends. Examples of things that can trigger this error: 1. Query has been throttled 2. VtGate could have request backlog</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>UNAUTHENTICATED</code></td>
+<td style="text-align: left"><code>12</code></td>
+<td style="text-align: left">UNAUTHENTICATED errors are returned when a user requests access to something, and we&#39;re unable to verify the user&#39;s authentication.</td>
+</tr>
+</tbody></table>
+
+<h2 id="messages">Messages</h2>
+
+<h3 id="boundkeyspaceidquery">BoundKeyspaceIdQuery</h3>
+
+<p>BoundKeyspaceIdQuery represents a single query request for the specified list of keyspace ids. This is used in a list for ExecuteBatchKeyspaceIdsRequest.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace_ids</code> <br>list &lt;bytes&gt;</td>
+<td style="text-align: left">keyspace_ids contains the list of keyspace_ids affected by this query. Will be used to find the shards to send the query to.</td>
+</tr>
+</tbody></table>
+
+<h3 id="boundshardquery">BoundShardQuery</h3>
+
+<p>BoundShardQuery represents a single query request for the specified list of shards. This is used in a list for ExecuteBatchShardsRequest.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>query</code> <br><a href="#query.boundquery">query.BoundQuery</a></td>
+<td style="text-align: left">BoundQuery is a query with its bind variables</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">keyspace to target the query to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shards</code> <br>list &lt;string&gt;</td>
+<td style="text-align: left">shards to target the query to. A DML can only target one shard.</td>
+</tr>
+</tbody></table>
+
+<h3 id="session">Session</h3>
+
+<p>Session objects are session cookies and are invalidated on use. Query results will contain updated session values. Their content should be opaque to the user.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>in_transaction</code> <br>bool</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shard_sessions</code> <br>list &lt;<a href="#session.shardsession">ShardSession</a>&gt;</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>single_db</code> <br>bool</td>
+<td style="text-align: left">single_db specifies if the transaction should be restricted to a single database.</td>
+</tr>
+</tbody></table>
+
+<h4 id="messages">Messages</h4>
+
+<h5 id="session-shardsession">Session.ShardSession</h5>
+
+<p><em>Properties</em></p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>target</code> <br><a href="#query.target">query.Target</a></td>
+<td style="text-align: left">Target describes what the client expects the tablet is. If the tablet does not match, an error is returned.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>transaction_id</code> <br>int64</td>
+<td style="text-align: left"></td>
+</tr>
+</tbody></table>
+
+<h3 id="query-bindvariable">query.BindVariable</h3>
+
+<p>BindVariable represents a single bind variable in a Query.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>type</code> <br><a href="#query.type">Type</a></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>value</code> <br>bytes</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>values</code> <br>list &lt;<a href="#query.value">Value</a>&gt;</td>
+<td style="text-align: left">Value represents a typed value.</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-boundquery">query.BoundQuery</h3>
+
+<p>BoundQuery is a query with its bind variables</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>sql</code> <br>string</td>
+<td style="text-align: left">sql is the SQL query to execute</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>bind_variables</code> <br>map &lt;string, <a href="#query.bindvariable">BindVariable</a>&gt;</td>
+<td style="text-align: left">bind_variables is a map of all bind variables to expand in the query</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-eventtoken">query.EventToken</h3>
+
+<p>EventToken is a structure that describes a point in time in a replication stream on one shard. The most recent known replication position can be retrieved from vttablet when executing a query. It is also sent with the replication streams from the binlog service.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>timestamp</code> <br>int64</td>
+<td style="text-align: left">timestamp is the MySQL timestamp of the statements. Seconds since Epoch.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shard</code> <br>string</td>
+<td style="text-align: left">The shard name that applied the statements. Note this is not set when streaming from a vttablet. It is only used on the client -&gt; vtgate link.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>position</code> <br>string</td>
+<td style="text-align: left">The position on the replication stream after this statement was applied. It is not the transaction ID / GTID, but the position / GTIDSet.</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-executeoptions">query.ExecuteOptions</h3>
+
+<p>ExecuteOptions is passed around for all Execute calls.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>include_event_token</code> <br>bool</td>
+<td style="text-align: left">This used to be exclude_field_names, which was replaced by IncludedFields enum below If set, we will try to include an EventToken with the responses.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>compare_event_token</code> <br><a href="#query.eventtoken">EventToken</a></td>
+<td style="text-align: left">EventToken is a structure that describes a point in time in a replication stream on one shard. The most recent known replication position can be retrieved from vttablet when executing a query. It is also sent with the replication streams from the binlog service.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>included_fields</code> <br><a href="#executeoptions.includedfields">IncludedFields</a></td>
+<td style="text-align: left">Controls what fields are returned in Field message responses from mysql, i.e. field name, table name, etc. This is an optimization for high-QPS queries where the client knows what it&#39;s getting</td>
+</tr>
+</tbody></table>
+
+<h4 id="enums">Enums</h4>
+
+<h5 id="executeoptions-includedfields">ExecuteOptions.IncludedFields</h5>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Value</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>TYPE_AND_NAME</code></td>
+<td style="text-align: left"><code>0</code></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>TYPE_ONLY</code></td>
+<td style="text-align: left"><code>1</code></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>ALL</code></td>
+<td style="text-align: left"><code>2</code></td>
+<td style="text-align: left"></td>
+</tr>
+</tbody></table>
+
+<h3 id="query-field">query.Field</h3>
+
+<p>Field describes a single column returned by a query</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>name</code> <br>string</td>
+<td style="text-align: left">name of the field as returned by mysql C API</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>type</code> <br><a href="#query.type">Type</a></td>
+<td style="text-align: left">vitess-defined type. Conversion function is in sqltypes package.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>table</code> <br>string</td>
+<td style="text-align: left">Remaining fields from mysql C API. These fields are only populated when ExecuteOptions.included_fields is set to IncludedFields.ALL.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>org_table</code> <br>string</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>database</code> <br>string</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>org_name</code> <br>string</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>column_length</code> <br>uint32</td>
+<td style="text-align: left">column_length is really a uint32. All 32 bits can be used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>charset</code> <br>uint32</td>
+<td style="text-align: left">charset is actually a uint16. Only the lower 16 bits are used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>decimals</code> <br>uint32</td>
+<td style="text-align: left">decimals is actualy a uint8. Only the lower 8 bits are used.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>flags</code> <br>uint32</td>
+<td style="text-align: left">flags is actually a uint16. Only the lower 16 bits are used.</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-queryresult">query.QueryResult</h3>
+
+<p>QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>fields</code> <br>list &lt;<a href="#query.field">Field</a>&gt;</td>
+<td style="text-align: left">Field describes a single column returned by a query</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>rows_affected</code> <br>uint64</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>insert_id</code> <br>uint64</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>rows</code> <br>list &lt;<a href="#query.row">Row</a>&gt;</td>
+<td style="text-align: left">Row is a database row.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>extras</code> <br><a href="#query.resultextras">ResultExtras</a></td>
+<td style="text-align: left">ResultExtras contains optional out-of-band information. Usually the extras are requested by adding ExecuteOptions flags.</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-resultextras">query.ResultExtras</h3>
+
+<p>ResultExtras contains optional out-of-band information. Usually the extras are requested by adding ExecuteOptions flags.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>event_token</code> <br><a href="#query.eventtoken">EventToken</a></td>
+<td style="text-align: left">EventToken is a structure that describes a point in time in a replication stream on one shard. The most recent known replication position can be retrieved from vttablet when executing a query. It is also sent with the replication streams from the binlog service.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>fresher</code> <br>bool</td>
+<td style="text-align: left">If set, it means the data returned with this result is fresher than the compare_token passed in the ExecuteOptions.</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-resultwitherror">query.ResultWithError</h3>
+
+<p>ResultWithError represents a query response in the form of result or error but not both.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>error</code> <br><a href="#vtrpc.rpcerror">vtrpc.RPCError</a></td>
+<td style="text-align: left">RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>result</code> <br><a href="#query.queryresult">query.QueryResult</a></td>
+<td style="text-align: left">QueryResult is returned by Execute and ExecuteStream.  As returned by Execute, len(fields) is always equal to len(row) (for each row in rows).  As returned by StreamExecute, the first QueryResult has the fields set, and subsequent QueryResult have rows set. And as Execute, len(QueryResult[0].fields) is always equal to len(row) (for each row in rows for each QueryResult in QueryResult[1:]).</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-row">query.Row</h3>
+
+<p>Row is a database row.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>lengths</code> <br>list &lt;sint64&gt;</td>
+<td style="text-align: left">lengths contains the length of each value in values. A length of -1 means that the field is NULL. While reading values, you have to accummulate the length to know the offset where the next value begins in values.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>values</code> <br>bytes</td>
+<td style="text-align: left">values contains a concatenation of all values in the row.</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-streamevent">query.StreamEvent</h3>
+
+<p>StreamEvent describes a set of transformations that happened as a single transactional unit on a server. It is streamed back by the Update Stream calls.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>statements</code> <br>list &lt;<a href="#streamevent.statement">Statement</a>&gt;</td>
+<td style="text-align: left">The statements in this transaction.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>event_token</code> <br><a href="#query.eventtoken">EventToken</a></td>
+<td style="text-align: left">EventToken is a structure that describes a point in time in a replication stream on one shard. The most recent known replication position can be retrieved from vttablet when executing a query. It is also sent with the replication streams from the binlog service.</td>
+</tr>
+</tbody></table>
+
+<h4 id="messages">Messages</h4>
+
+<h5 id="streamevent-statement">StreamEvent.Statement</h5>
+
+<p>One individual Statement in a transaction.</p>
+
+<p><em>Properties</em></p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>category</code> <br><a href="#streamevent.statement.category">Category</a></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>table_name</code> <br>string</td>
+<td style="text-align: left">table_name, primary_key_fields and primary_key_values are set for DML.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>primary_key_fields</code> <br>list &lt;<a href="#query.field">Field</a>&gt;</td>
+<td style="text-align: left">Field describes a single column returned by a query</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>primary_key_values</code> <br>list &lt;<a href="#query.row">Row</a>&gt;</td>
+<td style="text-align: left">Row is a database row.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>sql</code> <br>bytes</td>
+<td style="text-align: left">sql is set for all queries. FIXME(alainjobart) we may not need it for DMLs.</td>
+</tr>
+</tbody></table>
+
+<h4 id="enums">Enums</h4>
+
+<h5 id="streamevent-statement-category">StreamEvent.Statement.Category</h5>
+
+<p>One individual Statement in a transaction. The category of one statement.</p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Value</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>Error</code></td>
+<td style="text-align: left"><code>0</code></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>DML</code></td>
+<td style="text-align: left"><code>1</code></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>DDL</code></td>
+<td style="text-align: left"><code>2</code></td>
+<td style="text-align: left"></td>
+</tr>
+</tbody></table>
+
+<h3 id="query-target">query.Target</h3>
+
+<p>Target describes what the client expects the tablet is. If the tablet does not match, an error is returned.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shard</code> <br>string</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">topodata.TabletType</a></td>
+<td style="text-align: left">TabletType represents the type of a given tablet.</td>
+</tr>
+</tbody></table>
+
+<h3 id="query-value">query.Value</h3>
+
+<p>Value represents a typed value.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>type</code> <br><a href="#query.type">Type</a></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>value</code> <br>bytes</td>
+<td style="text-align: left"></td>
+</tr>
+</tbody></table>
+
+<h3 id="topodata-keyrange">topodata.KeyRange</h3>
+
+<p>KeyRange describes a range of sharding keys, when range-based sharding is used.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>start</code> <br>bytes</td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>end</code> <br>bytes</td>
+<td style="text-align: left"></td>
+</tr>
+</tbody></table>
+
+<h3 id="topodata-shardreference">topodata.ShardReference</h3>
+
+<p>ShardReference is used as a pointer from a SrvKeyspace to a Shard</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>name</code> <br>string</td>
+<td style="text-align: left">Copied from Shard.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>key_range</code> <br><a href="#topodata.keyrange">KeyRange</a></td>
+<td style="text-align: left">KeyRange describes a range of sharding keys, when range-based sharding is used.</td>
+</tr>
+</tbody></table>
+
+<h3 id="topodata-srvkeyspace">topodata.SrvKeyspace</h3>
+
+<p>SrvKeyspace is a rollup node for the keyspace itself.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>partitions</code> <br>list &lt;<a href="#srvkeyspace.keyspacepartition">KeyspacePartition</a>&gt;</td>
+<td style="text-align: left">The partitions this keyspace is serving, per tablet type.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>sharding_column_name</code> <br>string</td>
+<td style="text-align: left">copied from Keyspace</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>sharding_column_type</code> <br><a href="#topodata.keyspaceidtype">KeyspaceIdType</a></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>served_from</code> <br>list &lt;<a href="#srvkeyspace.servedfrom">ServedFrom</a>&gt;</td>
+<td style="text-align: left"></td>
+</tr>
+</tbody></table>
+
+<h4 id="messages">Messages</h4>
+
+<h5 id="srvkeyspace-keyspacepartition">SrvKeyspace.KeyspacePartition</h5>
+
+<p><em>Properties</em></p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>served_type</code> <br><a href="#topodata.tablettype">TabletType</a></td>
+<td style="text-align: left">The type this partition applies to.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>shard_references</code> <br>list &lt;<a href="#topodata.shardreference">ShardReference</a>&gt;</td>
+<td style="text-align: left">ShardReference is used as a pointer from a SrvKeyspace to a Shard</td>
+</tr>
+</tbody></table>
+
+<h5 id="srvkeyspace-servedfrom">SrvKeyspace.ServedFrom</h5>
+
+<p>ServedFrom indicates a relationship between a TabletType and the keyspace name that&#39;s serving it.</p>
+
+<p><em>Properties</em></p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>tablet_type</code> <br><a href="#topodata.tablettype">TabletType</a></td>
+<td style="text-align: left">ServedFrom indicates a relationship between a TabletType and the keyspace name that&#39;s serving it. the tablet type</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>keyspace</code> <br>string</td>
+<td style="text-align: left">the keyspace name that&#39;s serving it</td>
+</tr>
+</tbody></table>
+
+<h3 id="vtrpc-callerid">vtrpc.CallerID</h3>
+
+<p>CallerID is passed along RPCs to identify the originating client for a request. It is not meant to be secure, but only informational.  The client can put whatever info they want in these fields, and they will be trusted by the servers. The fields will just be used for logging purposes, and to easily find a client. VtGate propagates it to VtTablet, and VtTablet may use this information for monitoring purposes, to display on dashboards, or for blacklisting purposes.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>principal</code> <br>string</td>
+<td style="text-align: left">principal is the effective user identifier. It is usually filled in with whoever made the request to the appserver, if the request came from an automated job or another system component. If the request comes directly from the Internet, or if the Vitess client takes action on its own accord, it is okay for this field to be absent.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>component</code> <br>string</td>
+<td style="text-align: left">component describes the running process of the effective caller. It can for instance be the hostname:port of the servlet initiating the database call, or the container engine ID used by the servlet.</td>
+</tr>
+<tr>
+<td style="text-align: left"><code>subcomponent</code> <br>string</td>
+<td style="text-align: left">subcomponent describes a component inisde the immediate caller which is responsible for generating is request. Suggested values are a servlet name or an API endpoint name.</td>
+</tr>
+</tbody></table>
+
+<h3 id="vtrpc-rpcerror">vtrpc.RPCError</h3>
+
+<p>RPCError is an application-level error structure returned by VtTablet (and passed along by VtGate if appropriate). We use this so the clients don&#39;t have to parse the error messages, but instead can depend on the value of the code.</p>
+
+<h4 id="properties">Properties</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left"><code>code</code> <br><a href="#vtrpc.errorcode">ErrorCode</a></td>
+<td style="text-align: left"></td>
+</tr>
+<tr>
+<td style="text-align: left"><code>message</code> <br>string</td>
+<td style="text-align: left"></td>
+</tr>
+</tbody></table>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/reference/vtctl.html b/docs/reference/vtctl.html
index ba60b4ca673..3926427a5f6 100644
--- a/docs/reference/vtctl.html
+++ b/docs/reference/vtctl.html
@@ -1,4051 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / vtctl Reference</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / vtctl Reference"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>vtctl Reference</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>This reference guide explains the commands that the <b>vtctl</b> tool supports. <strong>vtctl</strong> is a command-line tool used to administer a Vitess cluster, and it allows a human or application to easily interact with a Vitess implementation.</p>
-
-<p>Commands are listed in the following groups:</p>
-
-<ul>
-<li><a href="#cells">Cells</a></li>
-<li><a href="#generic">Generic</a></li>
-<li><a href="#keyspaces">Keyspaces</a></li>
-<li><a href="#queries">Queries</a></li>
-<li><a href="#replication-graph">Replication Graph</a></li>
-<li><a href="#resharding-throttler">Resharding Throttler</a></li>
-<li><a href="#schema-version-permissions">Schema, Version, Permissions</a></li>
-<li><a href="#serving-graph">Serving Graph</a></li>
-<li><a href="#shards">Shards</a></li>
-<li><a href="#tablets">Tablets</a></li>
-<li><a href="#workflows">Workflows</a></li>
-</ul>
-
-<h2 id="cells">Cells</h2>
-
-<ul>
-<li><a href="#addcellinfo">AddCellInfo</a></li>
-<li><a href="#deletecellinfo">DeleteCellInfo</a></li>
-<li><a href="#getcellinfo">GetCellInfo</a></li>
-<li><a href="#getcellinfonames">GetCellInfoNames</a></li>
-<li><a href="#updatecellinfo">UpdateCellInfo</a></li>
-</ul>
-
-<h3 id="addcellinfo">AddCellInfo</h3>
-
-<p>Registers a local topology service in a new cell by creating the CellInfo with the provided parameters. The address will be used to connect to the topology service, and we&#39;ll put Vitess data starting at the provided root.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">AddCellInfo [-server_address &lt;addr&gt;] [-root &lt;root&gt;] &lt;cell&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">root</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The root path the topology server is using for that cell.</td>
-</tr>
-<tr>
-<td style="text-align: left">server_address</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The address the topology server is using for that cell.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;addr&gt;</code> &ndash; Required.</li>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;AddCellInfo&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="deletecellinfo">DeleteCellInfo</h3>
-
-<p>Deletes the CellInfo for the provided cell. The cell cannot be referenced by any Shard record.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">DeleteCellInfo &lt;cell&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;DeleteCellInfo&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="getcellinfo">GetCellInfo</h3>
-
-<p>Prints a JSON representation of the CellInfo for a cell.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetCellInfo &lt;cell&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;GetCellInfo&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="getcellinfonames">GetCellInfoNames</h3>
-
-<p>Lists all the cells for which we have a CellInfo object, meaning we have a local topology service registered.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetCellInfoNames </pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li><code>&lt;GetCellInfoNames&gt;</code> command takes no parameter This error occurs if the command is not called with exactly 0 arguments.</li>
-</ul>
-
-<h3 id="updatecellinfo">UpdateCellInfo</h3>
-
-<p>Updates the content of a CellInfo with the provided parameters. If a value is empty, it is not updated. The CellInfo will be created if it doesn&#39;t exist.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">UpdateCellInfo [-server_address &lt;addr&gt;] [-root &lt;root&gt;] &lt;cell&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">root</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The root path the topology server is using for that cell.</td>
-</tr>
-<tr>
-<td style="text-align: left">server_address</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The address the topology server is using for that cell.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;addr&gt;</code> &ndash; Required.</li>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;UpdateCellInfo&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h2 id="generic">Generic</h2>
-
-<ul>
-<li><a href="#listalltablets">ListAllTablets</a></li>
-<li><a href="#listtablets">ListTablets</a></li>
-<li><a href="#pruneactionlogs">PruneActionLogs</a></li>
-<li><a href="#validate">Validate</a></li>
-</ul>
-
-<h3 id="listalltablets">ListAllTablets</h3>
-
-<p>Lists all tablets in an awk-friendly way.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ListAllTablets &lt;cell name&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;cell name&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell name&gt;</code> argument is required for the <code>&lt;ListAllTablets&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="listtablets">ListTablets</h3>
-
-<p>Lists specified tablets in an awk-friendly way.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ListTablets &lt;tablet alias&gt; ...</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>. To specify multiple values for this argument, separate individual values with a space.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;ListTablets&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
-</ul>
-
-<h3 id="pruneactionlogs">PruneActionLogs</h3>
-
-<p>(requires zktopo.Server)<br><br>e.g. PruneActionLogs -keep-count=10 /zk/global/vt/keyspaces/my_keyspace/shards/0/actionlog<br><br>Removes older actionlog entries until at most &lt;count to keep&gt; are left.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">PruneActionLogs [-keep-count=&lt;count to keep&gt;] &lt;zk actionlog path&gt; ...</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">keep-count</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">count to keep</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;zk actionlog path&gt;</code> &ndash; Required. To specify multiple values for this argument, separate individual values with a space.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;PruneActionLogs&gt;</code> requires <code>&lt;zk action log path&gt;</code> [...] This error occurs if the command is not called with at least one argument.</li>
-<li><code>&lt;PruneActionLogs&gt;</code> requires a zktopo.Server</li>
-<li>some errors occurred, check the log</li>
-</ul>
-
-<h3 id="validate">Validate</h3>
-
-<p>Validates that all nodes reachable from the global replication graph and that all tablets in all discoverable cells are consistent.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">Validate [-ping-tablets]</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">ping-tablets</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Indicates whether all tablets should be pinged during the validation process</td>
-</tr>
-</tbody></table>
-
-<h2 id="keyspaces">Keyspaces</h2>
-
-<ul>
-<li><a href="#createkeyspace">CreateKeyspace</a></li>
-<li><a href="#deletekeyspace">DeleteKeyspace</a></li>
-<li><a href="#findallshardsinkeyspace">FindAllShardsInKeyspace</a></li>
-<li><a href="#getkeyspace">GetKeyspace</a></li>
-<li><a href="#getkeyspaces">GetKeyspaces</a></li>
-<li><a href="#migrateservedfrom">MigrateServedFrom</a></li>
-<li><a href="#migrateservedtypes">MigrateServedTypes</a></li>
-<li><a href="#rebuildkeyspacegraph">RebuildKeyspaceGraph</a></li>
-<li><a href="#removekeyspacecell">RemoveKeyspaceCell</a></li>
-<li><a href="#setkeyspaceservedfrom">SetKeyspaceServedFrom</a></li>
-<li><a href="#setkeyspaceshardinginfo">SetKeyspaceShardingInfo</a></li>
-<li><a href="#validatekeyspace">ValidateKeyspace</a></li>
-<li><a href="#waitfordrain">WaitForDrain</a></li>
-</ul>
-
-<h3 id="createkeyspace">CreateKeyspace</h3>
-
-<p>Creates the specified keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">CreateKeyspace [-sharding_column_name=name] [-sharding_column_type=type] [-served_from=tablettype1:ks1,tablettype2,ks2,...] [-force] &lt;keyspace name&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">force</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Proceeds even if the keyspace already exists</td>
-</tr>
-<tr>
-<td style="text-align: left">served_from</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of dbtype:keyspace pairs used to serve traffic</td>
-</tr>
-<tr>
-<td style="text-align: left">sharding_column_name</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies the column to use for sharding operations</td>
-</tr>
-<tr>
-<td style="text-align: left">sharding_column_type</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies the type of the column to use for sharding operations</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;CreateKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="deletekeyspace">DeleteKeyspace</h3>
-
-<p>Deletes the specified keyspace. In recursive mode, it also recursively deletes all shards in the keyspace. Otherwise, there must be no shards left in the keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">DeleteKeyspace [-recursive] &lt;keyspace&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">recursive</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Also recursively delete all shards in the keyspace.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>must specify the <code>&lt;keyspace&gt;</code> argument for <code>&lt;DeleteKeyspace&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="findallshardsinkeyspace">FindAllShardsInKeyspace</h3>
-
-<p>Displays all of the shards in the specified keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">FindAllShardsInKeyspace &lt;keyspace&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;FindAllShardsInKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="getkeyspace">GetKeyspace</h3>
-
-<p>Outputs a JSON structure that contains information about the Keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetKeyspace &lt;keyspace&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;GetKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="getkeyspaces">GetKeyspaces</h3>
-
-<p>Outputs a sorted list of all keyspaces.</p>
-
-<h3 id="migrateservedfrom">MigrateServedFrom</h3>
-
-<p>Makes the &lt;destination keyspace/shard&gt; serve the given type. This command also rebuilds the serving graph.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">MigrateServedFrom [-cells=c1,c2,...] [-reverse] &lt;destination keyspace/shard&gt; &lt;served tablet type&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
-</tr>
-<tr>
-<td style="text-align: left">filtered_replication_wait_time</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Specifies the maximum time to wait, in seconds, for filtered replication to catch up on master migrations</td>
-</tr>
-<tr>
-<td style="text-align: left">reverse</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Moves the served tablet type backward instead of forward. Use in case of trouble</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;destination keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><p><code>&lt;served tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
-
-<ul>
-<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
-<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
-<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
-<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
-<li><code>master</code> &ndash; A primary copy of data</li>
-<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
-<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
-<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
-<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
-<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
-<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
-</ul></li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;destination keyspace/shard&gt;</code> and <code>&lt;served tablet type&gt;</code> arguments are both required for the <code>&lt;MigrateServedFrom&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="migrateservedtypes">MigrateServedTypes</h3>
-
-<p>Migrates a serving type from the source shard to the shards that it replicates to. This command also rebuilds the serving graph. The &lt;keyspace/shard&gt; argument can specify any of the shards involved in the migration.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">MigrateServedTypes [-cells=c1,c2,...] [-reverse] [-skip-refresh-state] &lt;keyspace/shard&gt; &lt;served tablet type&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
-</tr>
-<tr>
-<td style="text-align: left">filtered_replication_wait_time</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Specifies the maximum time to wait, in seconds, for filtered replication to catch up on master migrations</td>
-</tr>
-<tr>
-<td style="text-align: left">reverse</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Moves the served tablet type backward instead of forward. Use in case of trouble</td>
-</tr>
-<tr>
-<td style="text-align: left">skip-refresh-state</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Skips refreshing the state of the source tablets after the migration, meaning that the refresh will need to be done manually, replica and rdonly only)</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><p><code>&lt;served tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
-
-<ul>
-<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
-<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
-<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
-<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
-<li><code>master</code> &ndash; A primary copy of data</li>
-<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
-<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
-<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
-<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
-<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
-<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
-</ul></li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;source keyspace/shard&gt;</code> and <code>&lt;served tablet type&gt;</code> arguments are both required for the <code>&lt;MigrateServedTypes&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-<li>the <code>&lt;skip-refresh-state&gt;</code> flag can only be specified for non-master migrations</li>
-</ul>
-
-<h3 id="rebuildkeyspacegraph">RebuildKeyspaceGraph</h3>
-
-<p>Rebuilds the serving data for the keyspace. This command may trigger an update to all connected clients.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RebuildKeyspaceGraph [-cells=c1,c2,...] &lt;keyspace&gt; ...</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace. To specify multiple values for this argument, separate individual values with a space.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace&gt;</code> argument must be used to specify at least one keyspace when calling the <code>&lt;RebuildKeyspaceGraph&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
-</ul>
-
-<h3 id="removekeyspacecell">RemoveKeyspaceCell</h3>
-
-<p>Removes the cell from the Cells list for all shards in the keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RemoveKeyspaceCell [-force] [-recursive] &lt;keyspace&gt; &lt;cell&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">force</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Proceeds even if the cell&#39;s topology server cannot be reached. The assumption is that you turned down the entire cell, and just need to update the global topo data.</td>
-</tr>
-<tr>
-<td style="text-align: left">recursive</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Also delete all tablets in that cell belonging to the specified keyspace.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace&gt;</code> and <code>&lt;cell&gt;</code> arguments are required for the <code>&lt;RemoveKeyspaceCell&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="setkeyspaceservedfrom">SetKeyspaceServedFrom</h3>
-
-<p>Changes the ServedFromMap manually. This command is intended for emergency fixes. This field is automatically set when you call the <em>MigrateServedFrom</em> command. This command does not rebuild the serving graph.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">SetKeyspaceServedFrom [-source=&lt;source keyspace name&gt;] [-remove] [-cells=c1,c2,...] &lt;keyspace name&gt; &lt;tablet type&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells to affect</td>
-</tr>
-<tr>
-<td style="text-align: left">remove</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Indicates whether to add (default) or remove the served from record</td>
-</tr>
-<tr>
-<td style="text-align: left">source</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies the source keyspace name</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-<li><p><code>&lt;tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
-
-<ul>
-<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
-<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
-<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
-<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
-<li><code>master</code> &ndash; A primary copy of data</li>
-<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
-<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
-<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
-<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
-<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
-<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
-</ul></li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace name&gt;</code> and <code>&lt;tablet type&gt;</code> arguments are required for the <code>&lt;SetKeyspaceServedFrom&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="setkeyspaceshardinginfo">SetKeyspaceShardingInfo</h3>
-
-<p>Updates the sharding information for a keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">SetKeyspaceShardingInfo [-force] &lt;keyspace name&gt; [&lt;column name&gt;] [&lt;column type&gt;]</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">force</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Updates fields even if they are already set. Use caution before calling this command.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-<li><code>&lt;column name&gt;</code> &ndash; Optional.</li>
-<li><code>&lt;column type&gt;</code> &ndash; Optional.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;SetKeyspaceShardingInfo&gt;</code> command. The <code>&lt;column name&gt;</code> and <code>&lt;column type&gt;</code> arguments are both optional This error occurs if the command is not called with between 1 and 3 arguments.</li>
-<li>both <code>&lt;column name&gt;</code> and <code>&lt;column type&gt;</code> must be set, or both must be unset</li>
-</ul>
-
-<h3 id="validatekeyspace">ValidateKeyspace</h3>
-
-<p>Validates that all nodes reachable from the specified keyspace are consistent.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ValidateKeyspace [-ping-tablets] &lt;keyspace name&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">ping-tablets</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Specifies whether all tablets will be pinged during the validation process</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;ValidateKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="waitfordrain">WaitForDrain</h3>
-
-<p>Blocks until no new queries were observed on all tablets with the given tablet type in the specifed keyspace.  This can be used as sanity check to ensure that the tablets were drained after running vtctl MigrateServedTypes  and vtgate is no longer using them. If -timeout is set, it fails when the timeout is reached.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WaitForDrain [-timeout &lt;duration&gt;] [-retry_delay &lt;duration&gt;] [-initial_wait &lt;duration&gt;] &lt;keyspace/shard&gt; &lt;served tablet type&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells to look for tablets</td>
-</tr>
-<tr>
-<td style="text-align: left">initial_wait</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Time to wait for all tablets to check in</td>
-</tr>
-<tr>
-<td style="text-align: left">retry_delay</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Time to wait between two checks</td>
-</tr>
-<tr>
-<td style="text-align: left">timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Timeout after which the command fails</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><p><code>&lt;served tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
-
-<ul>
-<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
-<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
-<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
-<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
-<li><code>master</code> &ndash; A primary copy of data</li>
-<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
-<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
-<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
-<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
-<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
-<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
-</ul></li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;tablet type&gt;</code> arguments are both required for the <code>&lt;WaitForDrain&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h2 id="queries">Queries</h2>
-
-<ul>
-<li><a href="#vtgateexecute">VtGateExecute</a></li>
-<li><a href="#vtgateexecutekeyspaceids">VtGateExecuteKeyspaceIds</a></li>
-<li><a href="#vtgateexecuteshards">VtGateExecuteShards</a></li>
-<li><a href="#vtgatesplitquery">VtGateSplitQuery</a></li>
-<li><a href="#vttabletbegin">VtTabletBegin</a></li>
-<li><a href="#vttabletcommit">VtTabletCommit</a></li>
-<li><a href="#vttabletexecute">VtTabletExecute</a></li>
-<li><a href="#vttabletrollback">VtTabletRollback</a></li>
-<li><a href="#vttabletstreamhealth">VtTabletStreamHealth</a></li>
-<li><a href="#vttabletupdatestream">VtTabletUpdateStream</a></li>
-</ul>
-
-<h3 id="vtgateexecute">VtGateExecute</h3>
-
-<p>Executes the given SQL query with the provided bound variables against the vtgate server.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtGateExecute -server &lt;vtgate&gt; [-bind_variables &lt;JSON map&gt;] [-connect_timeout &lt;connect timeout&gt;] [-keyspace &lt;default keyspace&gt;] [-tablet_type &lt;tablet type&gt;] [-options &lt;proto text options&gt;] [-json] &lt;sql&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vtgate client</td>
-</tr>
-<tr>
-<td style="text-align: left">json</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Output JSON instead of human-readable table</td>
-</tr>
-<tr>
-<td style="text-align: left">keyspace</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">default keyspace to use</td>
-</tr>
-<tr>
-<td style="text-align: left">options</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">execute options values as a text encoded proto of the ExecuteOptions structure</td>
-</tr>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">VtGate server to connect to</td>
-</tr>
-<tr>
-<td style="text-align: left">tablet_type</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">tablet type to query</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtgate&gt;</code> &ndash; Required.</li>
-<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;sql&gt;</code> argument is required for the <code>&lt;VtGateExecute&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>error connecting to vtgate &#39;%v&#39;: %v</li>
-<li>Execute failed: %v</li>
-</ul>
-
-<h3 id="vtgateexecutekeyspaceids">VtGateExecuteKeyspaceIds</h3>
-
-<p>Executes the given SQL query with the provided bound variables against the vtgate server. It is routed to the shards that contain the provided keyspace ids.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtGateExecuteKeyspaceIds -server &lt;vtgate&gt; -keyspace &lt;keyspace&gt; -keyspace_ids &lt;ks1 in hex&gt;,&lt;k2 in hex&gt;,... [-bind_variables &lt;JSON map&gt;] [-connect_timeout &lt;connect timeout&gt;] [-tablet_type &lt;tablet type&gt;] [-options &lt;proto text options&gt;] [-json] &lt;sql&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vtgate client</td>
-</tr>
-<tr>
-<td style="text-align: left">json</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Output JSON instead of human-readable table</td>
-</tr>
-<tr>
-<td style="text-align: left">keyspace</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">keyspace to send query to</td>
-</tr>
-<tr>
-<td style="text-align: left">keyspace_ids</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">comma-separated list of keyspace ids (in hex) that will map into shards to send query to</td>
-</tr>
-<tr>
-<td style="text-align: left">options</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">execute options values as a text encoded proto of the ExecuteOptions structure</td>
-</tr>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">VtGate server to connect to</td>
-</tr>
-<tr>
-<td style="text-align: left">tablet_type</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">tablet type to query</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtgate&gt;</code> &ndash; Required.</li>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-<li><code>&lt;ks1 in hex&gt;</code> &ndash; Required. To specify multiple values for this argument, separate individual values with a comma.</li>
-<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;sql&gt;</code> argument is required for the <code>&lt;VtGateExecuteKeyspaceIds&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>cannot hex-decode value %v &#39;%v&#39;: %v</li>
-<li>error connecting to vtgate &#39;%v&#39;: %v</li>
-<li>Execute failed: %v</li>
-</ul>
-
-<h3 id="vtgateexecuteshards">VtGateExecuteShards</h3>
-
-<p>Executes the given SQL query with the provided bound variables against the vtgate server. It is routed to the provided shards.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtGateExecuteShards -server &lt;vtgate&gt; -keyspace &lt;keyspace&gt; -shards &lt;shard0&gt;,&lt;shard1&gt;,... [-bind_variables &lt;JSON map&gt;] [-connect_timeout &lt;connect timeout&gt;] [-tablet_type &lt;tablet type&gt;] [-options &lt;proto text options&gt;] [-json] &lt;sql&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vtgate client</td>
-</tr>
-<tr>
-<td style="text-align: left">json</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Output JSON instead of human-readable table</td>
-</tr>
-<tr>
-<td style="text-align: left">keyspace</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">keyspace to send query to</td>
-</tr>
-<tr>
-<td style="text-align: left">options</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">execute options values as a text encoded proto of the ExecuteOptions structure</td>
-</tr>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">VtGate server to connect to</td>
-</tr>
-<tr>
-<td style="text-align: left">shards</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">comma-separated list of shards to send query to</td>
-</tr>
-<tr>
-<td style="text-align: left">tablet_type</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">tablet type to query</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtgate&gt;</code> &ndash; Required.</li>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-<li><code>&lt;shard&gt;</code> &ndash; Required. The name of a shard. The argument value is typically in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>. To specify multiple values for this argument, separate individual values with a comma.</li>
-<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;sql&gt;</code> argument is required for the <code>&lt;VtGateExecuteShards&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>error connecting to vtgate &#39;%v&#39;: %v</li>
-<li>Execute failed: %v</li>
-</ul>
-
-<h3 id="vtgatesplitquery">VtGateSplitQuery</h3>
-
-<p>Executes the SplitQuery computation for the given SQL query with the provided bound variables against the vtgate server (this is the base query for Map-Reduce workloads, and is provided here for debug / test purposes).</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtGateSplitQuery -server &lt;vtgate&gt; -keyspace &lt;keyspace&gt; [-split_column &lt;split_column&gt;] -split_count &lt;split_count&gt; [-bind_variables &lt;JSON map&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;sql&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">algorithm</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The algorithm to</td>
-</tr>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vtgate client</td>
-</tr>
-<tr>
-<td style="text-align: left">keyspace</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">keyspace to send query to</td>
-</tr>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">VtGate server to connect to</td>
-</tr>
-<tr>
-<td style="text-align: left">split_count</td>
-<td style="text-align: left">Int64</td>
-<td style="text-align: left">number of splits to generate.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtgate&gt;</code> &ndash; Required.</li>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-<li><code>&lt;split_count&gt;</code> &ndash; Required.</li>
-<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;sql&gt;</code> argument is required for the <code>&lt;VtGateSplitQuery&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>Exactly one of <code>&lt;split_count&gt;</code> or num_rows_per_query_part</li>
-<li>Unknown split-query <code>&lt;algorithm&gt;</code>: %v</li>
-<li>error connecting to vtgate &#39;%v&#39;: %v</li>
-<li>SplitQuery failed: %v</li>
-</ul>
-
-<h3 id="vttabletbegin">VtTabletBegin</h3>
-
-<p>Starts a transaction on the provided server.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtTabletBegin [-username &lt;TableACL user&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;tablet alias&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vttablet client</td>
-</tr>
-<tr>
-<td style="text-align: left">username</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">If set, value is set as immediate caller id in the request and used by vttablet for TableACL check</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;TableACL user&gt;</code> &ndash; Required.</li>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet_alias&gt;</code> argument is required for the <code>&lt;VtTabletBegin&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>cannot connect to tablet %v: %v</li>
-<li>Begin failed: %v</li>
-</ul>
-
-<h3 id="vttabletcommit">VtTabletCommit</h3>
-
-<p>Commits the given transaction on the provided server.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtTabletCommit [-username &lt;TableACL user&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;transaction_id&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vttablet client</td>
-</tr>
-<tr>
-<td style="text-align: left">username</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">If set, value is set as immediate caller id in the request and used by vttablet for TableACL check</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;TableACL user&gt;</code> &ndash; Required.</li>
-<li><code>&lt;transaction_id&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet_alias&gt;</code> and <code>&lt;transaction_id&gt;</code> arguments are required for the <code>&lt;VtTabletCommit&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-<li>cannot connect to tablet %v: %v</li>
-</ul>
-
-<h3 id="vttabletexecute">VtTabletExecute</h3>
-
-<p>Executes the given query on the given tablet. -transaction_id is optional. Use VtTabletBegin to start a transaction.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtTabletExecute [-username &lt;TableACL user&gt;] [-connect_timeout &lt;connect timeout&gt;] [-transaction_id &lt;transaction_id&gt;] [-options &lt;proto text options&gt;] [-json] &lt;tablet alias&gt; &lt;sql&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vttablet client</td>
-</tr>
-<tr>
-<td style="text-align: left">json</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Output JSON instead of human-readable table</td>
-</tr>
-<tr>
-<td style="text-align: left">options</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">execute options values as a text encoded proto of the ExecuteOptions structure</td>
-</tr>
-<tr>
-<td style="text-align: left">transaction_id</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">transaction id to use, if inside a transaction.</td>
-</tr>
-<tr>
-<td style="text-align: left">username</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">If set, value is set as immediate caller id in the request and used by vttablet for TableACL check</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;TableACL user&gt;</code> &ndash; Required.</li>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet_alias&gt;</code> and <code>&lt;sql&gt;</code> arguments are required for the <code>&lt;VtTabletExecute&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-<li>cannot connect to tablet %v: %v</li>
-<li>Execute failed: %v</li>
-</ul>
-
-<h3 id="vttabletrollback">VtTabletRollback</h3>
-
-<p>Rollbacks the given transaction on the provided server.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtTabletRollback [-username &lt;TableACL user&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;tablet alias&gt; &lt;transaction_id&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vttablet client</td>
-</tr>
-<tr>
-<td style="text-align: left">username</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">If set, value is set as immediate caller id in the request and used by vttablet for TableACL check</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;TableACL user&gt;</code> &ndash; Required.</li>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><code>&lt;transaction_id&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet_alias&gt;</code> and <code>&lt;transaction_id&gt;</code> arguments are required for the <code>&lt;VtTabletRollback&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-<li>cannot connect to tablet %v: %v</li>
-</ul>
-
-<h3 id="vttabletstreamhealth">VtTabletStreamHealth</h3>
-
-<p>Executes the StreamHealth streaming query to a vttablet process. Will stop after getting &lt;count&gt; answers.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtTabletStreamHealth [-count &lt;count, default 1&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;tablet alias&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vttablet client</td>
-</tr>
-<tr>
-<td style="text-align: left">count</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">number of responses to wait for</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;count default 1&gt;</code> &ndash; Required.</li>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;VtTabletStreamHealth&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>cannot connect to tablet %v: %v</li>
-</ul>
-
-<h3 id="vttabletupdatestream">VtTabletUpdateStream</h3>
-
-<p>Executes the UpdateStream streaming query to a vttablet process. Will stop after getting &lt;count&gt; answers.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">VtTabletUpdateStream [-count &lt;count, default 1&gt;] [-connect_timeout &lt;connect timeout&gt;] [-position &lt;position&gt;] [-timestamp &lt;timestamp&gt;] &lt;tablet alias&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">connect_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">Connection timeout for vttablet client</td>
-</tr>
-<tr>
-<td style="text-align: left">count</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">number of responses to wait for</td>
-</tr>
-<tr>
-<td style="text-align: left">position</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">position to start the stream from</td>
-</tr>
-<tr>
-<td style="text-align: left">timestamp</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">timestamp to start the stream from</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;count default 1&gt;</code> &ndash; Required.</li>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;VtTabletUpdateStream&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>cannot connect to tablet %v: %v</li>
-</ul>
-
-<h2 id="replication-graph">Replication Graph</h2>
-
-<ul>
-<li><a href="#getshardreplication">GetShardReplication</a></li>
-</ul>
-
-<h3 id="getshardreplication">GetShardReplication</h3>
-
-<p>Outputs a JSON structure that contains information about the ShardReplication.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetShardReplication &lt;cell&gt; &lt;keyspace/shard&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> and <code>&lt;keyspace/shard&gt;</code> arguments are required for the <code>&lt;GetShardReplication&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h2 id="resharding-throttler">Resharding Throttler</h2>
-
-<ul>
-<li><a href="#getthrottlerconfiguration">GetThrottlerConfiguration</a></li>
-<li><a href="#resetthrottlerconfiguration">ResetThrottlerConfiguration</a></li>
-<li><a href="#throttlermaxrates">ThrottlerMaxRates</a></li>
-<li><a href="#throttlersetmaxrate">ThrottlerSetMaxRate</a></li>
-<li><a href="#updatethrottlerconfiguration">UpdateThrottlerConfiguration</a></li>
-</ul>
-
-<h3 id="getthrottlerconfiguration">GetThrottlerConfiguration</h3>
-
-<p>Returns the current configuration of the MaxReplicationLag module. If no throttler name is specified, the configuration of all throttlers will be returned.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetThrottlerConfiguration -server &lt;vtworker or vttablet&gt; [&lt;throttler name&gt;]</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">vtworker or vttablet to connect to</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
-<li><code>&lt;throttler name&gt;</code> &ndash; Optional.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;GetThrottlerConfiguration&gt;</code> command accepts only <code>&lt;throttler name&gt;</code> as optional positional parameter This error occurs if the command is not called with more than 1 arguments.</li>
-<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-<li>failed to get the throttler configuration from <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-</ul>
-
-<h3 id="resetthrottlerconfiguration">ResetThrottlerConfiguration</h3>
-
-<p>Resets the current configuration of the MaxReplicationLag module. If no throttler name is specified, the configuration of all throttlers will be reset.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ResetThrottlerConfiguration -server &lt;vtworker or vttablet&gt; [&lt;throttler name&gt;]</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">vtworker or vttablet to connect to</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
-<li><code>&lt;throttler name&gt;</code> &ndash; Optional.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;ResetThrottlerConfiguration&gt;</code> command accepts only <code>&lt;throttler name&gt;</code> as optional positional parameter This error occurs if the command is not called with more than 1 arguments.</li>
-<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-<li>failed to get the throttler configuration from <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-</ul>
-
-<h3 id="throttlermaxrates">ThrottlerMaxRates</h3>
-
-<p>Returns the current max rate of all active resharding throttlers on the server.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ThrottlerMaxRates -server &lt;vtworker or vttablet&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">vtworker or vttablet to connect to</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the ThrottlerSetMaxRate command does not accept any positional parameters This error occurs if the command is not called with exactly 0 arguments.</li>
-<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-<li>failed to get the throttler rate from <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-</ul>
-
-<h3 id="throttlersetmaxrate">ThrottlerSetMaxRate</h3>
-
-<p>Sets the max rate for all active resharding throttlers on the server.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ThrottlerSetMaxRate -server &lt;vtworker or vttablet&gt; &lt;rate&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">vtworker or vttablet to connect to</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
-<li><code>&lt;rate&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;rate&gt;</code> argument is required for the <code>&lt;ThrottlerSetMaxRate&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>failed to parse rate &#39;%v&#39; as integer value: %v</li>
-<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-<li>failed to set the throttler rate on <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-</ul>
-
-<h3 id="updatethrottlerconfiguration">UpdateThrottlerConfiguration</h3>
-
-<p>Updates the configuration of the MaxReplicationLag module. The configuration must be specified as protobuf text. If a field is omitted or has a zero value, it will be ignored unless -copy_zero_values is specified. If no throttler name is specified, all throttlers will be updated.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">UpdateThrottlerConfiguration `-server &lt;vtworker or vttablet&gt; [-copy_zero_values] "&lt;configuration protobuf text&gt;" [&lt;throttler name&gt;]`</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">copy_zero_values</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">If true, fields with zero values will be copied as well</td>
-</tr>
-<tr>
-<td style="text-align: left">server</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">vtworker or vttablet to connect to</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
-<li><code>&lt;throttler name&gt;</code> &ndash; Optional.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>Failed to unmarshal the configuration protobuf text (%v) into a protobuf instance: %v</li>
-<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-<li>failed to update the throttler configuration on <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
-</ul>
-
-<h2 id="schema-version-permissions">Schema, Version, Permissions</h2>
-
-<ul>
-<li><a href="#applyschema">ApplySchema</a></li>
-<li><a href="#applyvschema">ApplyVSchema</a></li>
-<li><a href="#copyschemashard">CopySchemaShard</a></li>
-<li><a href="#getpermissions">GetPermissions</a></li>
-<li><a href="#getschema">GetSchema</a></li>
-<li><a href="#getvschema">GetVSchema</a></li>
-<li><a href="#rebuildvschemagraph">RebuildVSchemaGraph</a></li>
-<li><a href="#reloadschema">ReloadSchema</a></li>
-<li><a href="#reloadschemakeyspace">ReloadSchemaKeyspace</a></li>
-<li><a href="#reloadschemashard">ReloadSchemaShard</a></li>
-<li><a href="#validatepermissionskeyspace">ValidatePermissionsKeyspace</a></li>
-<li><a href="#validatepermissionsshard">ValidatePermissionsShard</a></li>
-<li><a href="#validateschemakeyspace">ValidateSchemaKeyspace</a></li>
-<li><a href="#validateschemashard">ValidateSchemaShard</a></li>
-<li><a href="#validateversionkeyspace">ValidateVersionKeyspace</a></li>
-<li><a href="#validateversionshard">ValidateVersionShard</a></li>
-</ul>
-
-<h3 id="applyschema">ApplySchema</h3>
-
-<p>Applies the schema change to the specified keyspace on every master, running in parallel on all shards. The changes are then propagated to slaves via replication. If -allow_long_unavailability is set, schema changes affecting a large number of rows (and possibly incurring a longer period of unavailability) will not be rejected.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ApplySchema [-allow_long_unavailability] [-wait_slave_timeout=10s] {-sql=&lt;sql&gt; || -sql-file=&lt;filename&gt;} &lt;keyspace&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">allow_long_unavailability</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Allow large schema changes which incur a longer unavailability of the database.</td>
-</tr>
-<tr>
-<td style="text-align: left">sql</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">A list of semicolon-delimited SQL commands</td>
-</tr>
-<tr>
-<td style="text-align: left">sql-file</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Identifies the file that contains the SQL commands</td>
-</tr>
-<tr>
-<td style="text-align: left">wait_slave_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">The amount of time to wait for slaves to receive the schema change via replication.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace&gt;</code> argument is required for the command<code>&lt;ApplySchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="applyvschema">ApplyVSchema</h3>
-
-<p>Applies the VTGate routing schema to the provided keyspace. Shows the result after application.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ApplyVSchema {-vschema=&lt;vschema&gt; || -vschema_file=&lt;vschema file&gt;} [-cells=c1,c2,...] [-skip_rebuild] &lt;keyspace&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">If specified, limits the rebuild to the cells, after upload. Ignored if skipRebuild is set.</td>
-</tr>
-<tr>
-<td style="text-align: left">skip_rebuild</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">If set, do no rebuild the SrvSchema objects.</td>
-</tr>
-<tr>
-<td style="text-align: left">vschema</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Identifies the VTGate routing schema</td>
-</tr>
-<tr>
-<td style="text-align: left">vschema_file</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Identifies the VTGate routing schema file</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;ApplyVSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>either the <code>&lt;vschema&gt;</code> or <code>&lt;vschema&gt;</code>File flag must be specified when calling the <code>&lt;ApplyVSchema&gt;</code> command</li>
-</ul>
-
-<h3 id="copyschemashard">CopySchemaShard</h3>
-
-<p>Copies the schema from a source shard&#39;s master (or a specific tablet) to a destination shard. The schema is applied directly on the master of the destination shard, and it is propagated to the replicas through binlogs.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">CopySchemaShard [-tables=&lt;table1&gt;,&lt;table2&gt;,...] [-exclude_tables=&lt;table1&gt;,&lt;table2&gt;,...] [-include-views] [-wait_slave_timeout=10s] {&lt;source keyspace/shard&gt; || &lt;source tablet alias&gt;} &lt;destination keyspace/shard&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">exclude_tables</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/</td>
-</tr>
-<tr>
-<td style="text-align: left">include-views</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Includes views in the output</td>
-</tr>
-<tr>
-<td style="text-align: left">tables</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of tables to copy. Each is either an exact match, or a regular expression of the form /regexp/</td>
-</tr>
-<tr>
-<td style="text-align: left">wait_slave_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">The amount of time to wait for slaves to receive the schema change via replication.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;source tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><code>&lt;destination keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;source keyspace/shard&gt;</code> and <code>&lt;destination keyspace/shard&gt;</code> arguments are both required for the <code>&lt;CopySchemaShard&gt;</code> command. Instead of the <code>&lt;source keyspace/shard&gt;</code> argument, you can also specify <code>&lt;tablet alias&gt;</code> which refers to a specific tablet of the shard in the source keyspace This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="getpermissions">GetPermissions</h3>
-
-<p>Displays the permissions for a tablet.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetPermissions &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;GetPermissions&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="getschema">GetSchema</h3>
-
-<p>Displays the full schema for a tablet, or just the schema for the specified tables in that tablet.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetSchema [-tables=&lt;table1&gt;,&lt;table2&gt;,...] [-exclude_tables=&lt;table1&gt;,&lt;table2&gt;,...] [-include-views] &lt;tablet alias&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">exclude_tables</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/</td>
-</tr>
-<tr>
-<td style="text-align: left">include-views</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Includes views in the output</td>
-</tr>
-<tr>
-<td style="text-align: left">table_names_only</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Only displays table names that match</td>
-</tr>
-<tr>
-<td style="text-align: left">tables</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of tables for which we should gather information. Each is either an exact match, or a regular expression of the form /regexp/</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;GetSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="getvschema">GetVSchema</h3>
-
-<p>Displays the VTGate routing schema.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetVSchema &lt;keyspace&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;GetVSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="rebuildvschemagraph">RebuildVSchemaGraph</h3>
-
-<p>Rebuilds the cell-specific SrvVSchema from the global VSchema objects in the provided cells (or all cells if none provided).</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RebuildVSchemaGraph [-cells=c1,c2,...]</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells to look for tablets</td>
-</tr>
-</tbody></table>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li><code>&lt;RebuildVSchemaGraph&gt;</code> doesn&#39;t take any arguments This error occurs if the command is not called with exactly 0 arguments.</li>
-</ul>
-
-<h3 id="reloadschema">ReloadSchema</h3>
-
-<p>Reloads the schema on a remote tablet.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ReloadSchema &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;ReloadSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="reloadschemakeyspace">ReloadSchemaKeyspace</h3>
-
-<p>Reloads the schema on all the tablets in a keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ReloadSchemaKeyspace [-concurrency=10] [-include_master=false] &lt;keyspace&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">concurrency</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">How many tablets to reload in parallel</td>
-</tr>
-<tr>
-<td style="text-align: left">include_master</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Include the master tablet(s)</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;ReloadSchemaKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="reloadschemashard">ReloadSchemaShard</h3>
-
-<p>Reloads the schema on all the tablets in a shard.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ReloadSchemaShard [-concurrency=10] [-include_master=false] &lt;keyspace/shard&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">concurrency</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">How many tablets to reload in parallel</td>
-</tr>
-<tr>
-<td style="text-align: left">include_master</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Include the master tablet</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ReloadSchemaShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="validatepermissionskeyspace">ValidatePermissionsKeyspace</h3>
-
-<p>Validates that the master permissions from shard 0 match those of all of the other tablets in the keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ValidatePermissionsKeyspace &lt;keyspace name&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;ValidatePermissionsKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="validatepermissionsshard">ValidatePermissionsShard</h3>
-
-<p>Validates that the master permissions match all the slaves.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ValidatePermissionsShard &lt;keyspace/shard&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ValidatePermissionsShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="validateschemakeyspace">ValidateSchemaKeyspace</h3>
-
-<p>Validates that the master schema from shard 0 matches the schema on all of the other tablets in the keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ValidateSchemaKeyspace [-exclude_tables=''] [-include-views] &lt;keyspace name&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">exclude_tables</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/</td>
-</tr>
-<tr>
-<td style="text-align: left">include-views</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Includes views in the validation</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;ValidateSchemaKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="validateschemashard">ValidateSchemaShard</h3>
-
-<p>Validates that the master schema matches all of the slaves.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ValidateSchemaShard [-exclude_tables=''] [-include-views] &lt;keyspace/shard&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">exclude_tables</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/</td>
-</tr>
-<tr>
-<td style="text-align: left">include-views</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Includes views in the validation</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ValidateSchemaShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="validateversionkeyspace">ValidateVersionKeyspace</h3>
-
-<p>Validates that the master version from shard 0 matches all of the other tablets in the keyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ValidateVersionKeyspace &lt;keyspace name&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;ValidateVersionKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="validateversionshard">ValidateVersionShard</h3>
-
-<p>Validates that the master version matches all of the slaves.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ValidateVersionShard &lt;keyspace/shard&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ValidateVersionShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h2 id="serving-graph">Serving Graph</h2>
-
-<ul>
-<li><a href="#getsrvkeyspace">GetSrvKeyspace</a></li>
-<li><a href="#getsrvkeyspacenames">GetSrvKeyspaceNames</a></li>
-<li><a href="#getsrvvschema">GetSrvVSchema</a></li>
-</ul>
-
-<h3 id="getsrvkeyspace">GetSrvKeyspace</h3>
-
-<p>Outputs a JSON structure that contains information about the SrvKeyspace.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetSrvKeyspace &lt;cell&gt; &lt;keyspace&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> and <code>&lt;keyspace&gt;</code> arguments are required for the <code>&lt;GetSrvKeyspace&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="getsrvkeyspacenames">GetSrvKeyspaceNames</h3>
-
-<p>Outputs a list of keyspace names.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetSrvKeyspaceNames &lt;cell&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;GetSrvKeyspaceNames&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="getsrvvschema">GetSrvVSchema</h3>
-
-<p>Outputs a JSON structure that contains information about the SrvVSchema.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetSrvVSchema &lt;cell&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;GetSrvVSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h2 id="shards">Shards</h2>
-
-<ul>
-<li><a href="#createshard">CreateShard</a></li>
-<li><a href="#deleteshard">DeleteShard</a></li>
-<li><a href="#emergencyreparentshard">EmergencyReparentShard</a></li>
-<li><a href="#getshard">GetShard</a></li>
-<li><a href="#initshardmaster">InitShardMaster</a></li>
-<li><a href="#listbackups">ListBackups</a></li>
-<li><a href="#listshardtablets">ListShardTablets</a></li>
-<li><a href="#plannedreparentshard">PlannedReparentShard</a></li>
-<li><a href="#removebackup">RemoveBackup</a></li>
-<li><a href="#removeshardcell">RemoveShardCell</a></li>
-<li><a href="#setshardservedtypes">SetShardServedTypes</a></li>
-<li><a href="#setshardtabletcontrol">SetShardTabletControl</a></li>
-<li><a href="#shardreplicationfix">ShardReplicationFix</a></li>
-<li><a href="#shardreplicationpositions">ShardReplicationPositions</a></li>
-<li><a href="#sourceshardadd">SourceShardAdd</a></li>
-<li><a href="#sourcesharddelete">SourceShardDelete</a></li>
-<li><a href="#tabletexternallyreparented">TabletExternallyReparented</a></li>
-<li><a href="#validateshard">ValidateShard</a></li>
-<li><a href="#waitforfilteredreplication">WaitForFilteredReplication</a></li>
-</ul>
-
-<h3 id="createshard">CreateShard</h3>
-
-<p>Creates the specified shard.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">CreateShard [-force] [-parent] &lt;keyspace/shard&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">force</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Proceeds with the command even if the keyspace already exists</td>
-</tr>
-<tr>
-<td style="text-align: left">parent</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Creates the parent keyspace if it doesn&#39;t already exist</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;CreateShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="deleteshard">DeleteShard</h3>
-
-<p>Deletes the specified shard(s). In recursive mode, it also deletes all tablets belonging to the shard. Otherwise, there must be no tablets left in the shard.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">DeleteShard [-recursive] [-even_if_serving] &lt;keyspace/shard&gt; ...</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">even_if_serving</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Remove the shard even if it is serving. Use with caution.</td>
-</tr>
-<tr>
-<td style="text-align: left">recursive</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Also delete all tablets belonging to the shard.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>. To specify multiple values for this argument, separate individual values with a space.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument must be used to identify at least one keyspace and shard when calling the <code>&lt;DeleteShard&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
-</ul>
-
-<h3 id="emergencyreparentshard">EmergencyReparentShard</h3>
-
-<p>Reparents the shard to the new master. Assumes the old master is dead and not responsding.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">EmergencyReparentShard -keyspace_shard=&lt;keyspace/shard&gt; -new_master=&lt;tablet alias&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">keyspace_shard</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">keyspace/shard of the shard that needs to be reparented</td>
-</tr>
-<tr>
-<td style="text-align: left">new_master</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">alias of a tablet that should be the new master</td>
-</tr>
-<tr>
-<td style="text-align: left">wait_slave_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">time to wait for slaves to catch up in reparenting</td>
-</tr>
-</tbody></table>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;EmergencyReparentShard&gt;</code> requires -keyspace_shard=<code>&lt;keyspace/shard&gt;</code> -new_master=<code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly 0 arguments.</li>
-<li>cannot use legacy syntax and flag -<code>&lt;new_master&gt;</code> for action <code>&lt;EmergencyReparentShard&gt;</code> at the same time</li>
-</ul>
-
-<h3 id="getshard">GetShard</h3>
-
-<p>Outputs a JSON structure that contains information about the Shard.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetShard &lt;keyspace/shard&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;GetShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="initshardmaster">InitShardMaster</h3>
-
-<p>Sets the initial master for a shard. Will make all other tablets in the shard slaves of the provided master. WARNING: this could cause data loss on an already replicating shard. PlannedReparentShard or EmergencyReparentShard should be used instead.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">InitShardMaster [-force] [-wait_slave_timeout=&lt;duration&gt;] &lt;keyspace/shard&gt; &lt;tablet alias&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">force</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">will force the reparent even if the provided tablet is not a master or the shard master</td>
-</tr>
-<tr>
-<td style="text-align: left">wait_slave_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">time to wait for slaves to catch up in reparenting</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;InitShardMaster&gt;</code> requires <code>&lt;keyspace/shard&gt;</code> <code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="listbackups">ListBackups</h3>
-
-<p>Lists all the backups for a shard.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ListBackups &lt;keyspace/shard&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;ListBackups&gt;</code> requires <code>&lt;keyspace/shard&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="listshardtablets">ListShardTablets</h3>
-
-<p>Lists all tablets in the specified shard.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ListShardTablets &lt;keyspace/shard&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ListShardTablets&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="plannedreparentshard">PlannedReparentShard</h3>
-
-<p>Reparents the shard to the new master, or away from old master. Both old and new master need to be up and running.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">PlannedReparentShard -keyspace_shard=&lt;keyspace/shard&gt; [-new_master=&lt;tablet alias&gt;] [-avoid_master=&lt;tablet alias&gt;]</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">avoid_master</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">alias of a tablet that should not be the master, i.e. reparent to any other tablet if this one is the master</td>
-</tr>
-<tr>
-<td style="text-align: left">keyspace_shard</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">keyspace/shard of the shard that needs to be reparented</td>
-</tr>
-<tr>
-<td style="text-align: left">new_master</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">alias of a tablet that should be the new master</td>
-</tr>
-<tr>
-<td style="text-align: left">wait_slave_timeout</td>
-<td style="text-align: left">Duration</td>
-<td style="text-align: left">time to wait for slaves to catch up in reparenting</td>
-</tr>
-</tbody></table>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;PlannedReparentShard&gt;</code> requires -keyspace_shard=<code>&lt;keyspace/shard&gt;</code> [-new_master=<code>&lt;tablet alias&gt;</code>] [-avoid_master=<code>&lt;tablet alias&gt;</code>] This error occurs if the command is not called with exactly 0 arguments.</li>
-<li>cannot use legacy syntax and flags -<code>&lt;keyspace_shard&gt;</code> and -<code>&lt;new_master&gt;</code> for action <code>&lt;PlannedReparentShard&gt;</code> at the same time</li>
-</ul>
-
-<h3 id="removebackup">RemoveBackup</h3>
-
-<p>Removes a backup for the BackupStorage.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RemoveBackup &lt;keyspace/shard&gt; &lt;backup name&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;backup name&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;RemoveBackup&gt;</code> requires <code>&lt;keyspace/shard&gt;</code> <code>&lt;backup name&gt;</code> This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="removeshardcell">RemoveShardCell</h3>
-
-<p>Removes the cell from the shard&#39;s Cells list.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RemoveShardCell [-force] [-recursive] &lt;keyspace/shard&gt; &lt;cell&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">force</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Proceeds even if the cell&#39;s topology server cannot be reached. The assumption is that you turned down the entire cell, and just need to update the global topo data.</td>
-</tr>
-<tr>
-<td style="text-align: left">recursive</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Also delete all tablets in that cell belonging to the specified shard.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;cell&gt;</code> arguments are required for the <code>&lt;RemoveShardCell&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="setshardservedtypes">SetShardServedTypes</h3>
-
-<p>Add or remove served type to/from a shard. This is meant as an emergency function. It does not rebuild any serving graph i.e. does not run &#39;RebuildKeyspaceGraph&#39;.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">SetShardServedTypes [--cells=c1,c2,...] [--remove] &lt;keyspace/shard&gt; &lt;served tablet type&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
-</tr>
-<tr>
-<td style="text-align: left">remove</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Removes the served tablet type</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><p><code>&lt;served tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
-
-<ul>
-<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
-<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
-<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
-<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
-<li><code>master</code> &ndash; A primary copy of data</li>
-<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
-<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
-<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
-<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
-<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
-<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
-</ul></li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;served tablet type&gt;</code> arguments are both required for the <code>&lt;SetShardServedTypes&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="setshardtabletcontrol">SetShardTabletControl</h3>
-
-<p>Sets the TabletControl record for a shard and type. Only use this for an emergency fix or after a finished vertical split. The <em>MigrateServedFrom</em> and <em>MigrateServedType</em> commands set this field appropriately already. Always specify the blacklisted_tables flag for vertical splits, but never for horizontal splits.<br><br>To set the DisableQueryServiceFlag, keep &#39;blacklisted_tables&#39; empty, and set &#39;disable_query_service&#39; to true or false. Useful to fix horizontal splits gone wrong.<br><br>To change the blacklisted tables list, specify the &#39;blacklisted_tables&#39; parameter with the new list. Useful to fix tables that are being blocked after a vertical split.<br><br>To just remove the ShardTabletControl entirely, use the &#39;remove&#39; flag, useful after a vertical split is finished to remove serving restrictions.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">SetShardTabletControl [--cells=c1,c2,...] [--blacklisted_tables=t1,t2,...] [--remove] [--disable_query_service] &lt;keyspace/shard&gt; &lt;tablet type&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">blacklisted_tables</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of tables to blacklist (used for vertical split). Each is either an exact match, or a regular expression of the form &#39;/regexp/&#39;.</td>
-</tr>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
-</tr>
-<tr>
-<td style="text-align: left">disable_query_service</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Disables query service on the provided nodes. This flag requires &#39;blacklisted_tables&#39; and &#39;remove&#39; to be unset, otherwise it&#39;s ignored.</td>
-</tr>
-<tr>
-<td style="text-align: left">remove</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Removes cells for vertical splits.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><p><code>&lt;tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
-
-<ul>
-<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
-<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
-<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
-<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
-<li><code>master</code> &ndash; A primary copy of data</li>
-<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
-<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
-<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
-<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
-<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
-<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
-</ul></li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;tablet type&gt;</code> arguments are both required for the <code>&lt;SetShardTabletControl&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="shardreplicationfix">ShardReplicationFix</h3>
-
-<p>Walks through a ShardReplication object and fixes the first error that it encounters.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ShardReplicationFix &lt;cell&gt; &lt;keyspace/shard&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;cell&gt;</code> and <code>&lt;keyspace/shard&gt;</code> arguments are required for the ShardReplicationRemove command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="shardreplicationpositions">ShardReplicationPositions</h3>
-
-<p>Shows the replication status of each slave machine in the shard graph. In this case, the status refers to the replication lag between the master vttablet and the slave vttablet. In Vitess, data is always written to the master vttablet first and then replicated to all slave vttablets. Output is sorted by tablet type, then replication position. Use ctrl-C to interrupt command and see partial result if needed.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ShardReplicationPositions &lt;keyspace/shard&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ShardReplicationPositions&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="sourceshardadd">SourceShardAdd</h3>
-
-<p>Adds the SourceShard record with the provided index. This is meant as an emergency function. It does not call RefreshState for the shard master.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">SourceShardAdd [--key_range=&lt;keyrange&gt;] [--tables=&lt;table1,table2,...&gt;] &lt;keyspace/shard&gt; &lt;uid&gt; &lt;source keyspace/shard&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">key_range</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Identifies the key range to use for the SourceShard</td>
-</tr>
-<tr>
-<td style="text-align: left">tables</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of tables to replicate (used for vertical split). Each is either an exact match, or a regular expression of the form /regexp/</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><code>&lt;uid&gt;</code> &ndash; Required.</li>
-<li><code>&lt;source keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code>, <code>&lt;uid&gt;</code>, and <code>&lt;source keyspace/shard&gt;</code> arguments are all required for the <code>&lt;SourceShardAdd&gt;</code> command This error occurs if the command is not called with exactly 3 arguments.</li>
-</ul>
-
-<h3 id="sourcesharddelete">SourceShardDelete</h3>
-
-<p>Deletes the SourceShard record with the provided index. This is meant as an emergency cleanup function. It does not call RefreshState for the shard master.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">SourceShardDelete &lt;keyspace/shard&gt; &lt;uid&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-<li><code>&lt;uid&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;uid&gt;</code> arguments are both required for the <code>&lt;SourceShardDelete&gt;</code> command This error occurs if the command is not called with at least 2 arguments.</li>
-</ul>
-
-<h3 id="tabletexternallyreparented">TabletExternallyReparented</h3>
-
-<p>Changes metadata in the topology server to acknowledge a shard master change performed by an external tool. See the Reparenting guide for more information:<a href="https://github.com/youtube/vitess/blob/master/doc/Reparenting.md#external-reparents">https://github.com/youtube/vitess/blob/master/doc/Reparenting.md#external-reparents</a>.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">TabletExternallyReparented &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;TabletExternallyReparented&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="validateshard">ValidateShard</h3>
-
-<p>Validates that all nodes that are reachable from this shard are consistent.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ValidateShard [-ping-tablets] &lt;keyspace/shard&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">ping-tablets</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Indicates whether all tablets should be pinged during the validation process</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ValidateShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="waitforfilteredreplication">WaitForFilteredReplication</h3>
-
-<p>Blocks until the specified shard has caught up with the filtered replication of its source shard.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WaitForFilteredReplication [-max_delay &lt;max_delay, default 30s&gt;] &lt;keyspace/shard&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;WaitForFilteredReplication&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h2 id="tablets">Tablets</h2>
-
-<ul>
-<li><a href="#backup">Backup</a></li>
-<li><a href="#changeslavetype">ChangeSlaveType</a></li>
-<li><a href="#deletetablet">DeleteTablet</a></li>
-<li><a href="#executefetchasdba">ExecuteFetchAsDba</a></li>
-<li><a href="#executehook">ExecuteHook</a></li>
-<li><a href="#gettablet">GetTablet</a></li>
-<li><a href="#ignorehealtherror">IgnoreHealthError</a></li>
-<li><a href="#inittablet">InitTablet</a></li>
-<li><a href="#ping">Ping</a></li>
-<li><a href="#refreshstate">RefreshState</a></li>
-<li><a href="#refreshstatebyshard">RefreshStateByShard</a></li>
-<li><a href="#reparenttablet">ReparentTablet</a></li>
-<li><a href="#restorefrombackup">RestoreFromBackup</a></li>
-<li><a href="#runhealthcheck">RunHealthCheck</a></li>
-<li><a href="#setreadonly">SetReadOnly</a></li>
-<li><a href="#setreadwrite">SetReadWrite</a></li>
-<li><a href="#sleep">Sleep</a></li>
-<li><a href="#startslave">StartSlave</a></li>
-<li><a href="#stopslave">StopSlave</a></li>
-<li><a href="#updatetabletaddrs">UpdateTabletAddrs</a></li>
-</ul>
-
-<h3 id="backup">Backup</h3>
-
-<p>Stops mysqld and uses the BackupStorage service to store a new backup. This function also remembers if the tablet was replicating so that it can restore the same state after the backup completes.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">Backup [-concurrency=4] &lt;tablet alias&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">concurrency</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">Specifies the number of compression/checksum jobs to run simultaneously</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;Backup&gt;</code> command requires the <code>&lt;tablet alias&gt;</code> argument This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="changeslavetype">ChangeSlaveType</h3>
-
-<p>Changes the db type for the specified tablet, if possible. This command is used primarily to arrange replicas, and it will not convert a master.<br><br>NOTE: This command automatically updates the serving graph.<br><br></p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ChangeSlaveType [-dry-run] &lt;tablet alias&gt; &lt;tablet type&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">dry-run</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Lists the proposed change without actually executing it</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><p><code>&lt;tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
-
-<ul>
-<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
-<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
-<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
-<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
-<li><code>master</code> &ndash; A primary copy of data</li>
-<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
-<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
-<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
-<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
-<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
-<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
-</ul></li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;db type&gt;</code> arguments are required for the <code>&lt;ChangeSlaveType&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-<li>failed reading tablet %v: %v</li>
-<li>invalid type transition %v: %v -&gt;</code> %v</li>
-</ul>
-
-<h3 id="deletetablet">DeleteTablet</h3>
-
-<p>Deletes tablet(s) from the topology.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">DeleteTablet [-allow_master] &lt;tablet alias&gt; ...</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">allow_master</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Allows for the master tablet of a shard to be deleted. Use with caution.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>. To specify multiple values for this argument, separate individual values with a space.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument must be used to specify at least one tablet when calling the <code>&lt;DeleteTablet&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
-</ul>
-
-<h3 id="executefetchasdba">ExecuteFetchAsDba</h3>
-
-<p>Runs the given SQL command as a DBA on the remote tablet.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ExecuteFetchAsDba [-max_rows=10000] [-disable_binlogs] [-json] &lt;tablet alias&gt; &lt;sql command&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">disable_binlogs</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Disables writing to binlogs during the query</td>
-</tr>
-<tr>
-<td style="text-align: left">json</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Output JSON instead of human-readable table</td>
-</tr>
-<tr>
-<td style="text-align: left">max_rows</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">Specifies the maximum number of rows to allow in reset</td>
-</tr>
-<tr>
-<td style="text-align: left">reload_schema</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Indicates whether the tablet schema will be reloaded after executing the SQL command. The default value is <code>false</code>, which indicates that the tablet schema will not be reloaded.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><code>&lt;sql command&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;sql command&gt;</code> arguments are required for the <code>&lt;ExecuteFetchAsDba&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="executehook">ExecuteHook</h3>
-
-<p>Runs the specified hook on the given tablet. A hook is a script that resides in the $VTROOT/vthook directory. You can put any script into that directory and use this command to run that script.<br><br>For this command, the param=value arguments are parameters that the command passes to the specified hook.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ExecuteHook &lt;tablet alias&gt; &lt;hook name&gt; [&lt;param1=value1&gt; &lt;param2=value2&gt; ...]</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><code>&lt;hook name&gt;</code> &ndash; Required.</li>
-<li><code>&lt;param1=value1&gt;</code> <code>&lt;param2=value2&gt;</code> . &ndash; Optional.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;hook name&gt;</code> arguments are required for the <code>&lt;ExecuteHook&gt;</code> command This error occurs if the command is not called with at least 2 arguments.</li>
-</ul>
-
-<h3 id="gettablet">GetTablet</h3>
-
-<p>Outputs a JSON structure that contains information about the Tablet.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">GetTablet &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;GetTablet&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="ignorehealtherror">IgnoreHealthError</h3>
-
-<p>Sets the regexp for health check errors to ignore on the specified tablet. The pattern has implicit ^$ anchors. Set to empty string or restart vttablet to stop ignoring anything.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">IgnoreHealthError &lt;tablet alias&gt; &lt;ignore regexp&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><code>&lt;ignore regexp&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;ignore regexp&gt;</code> arguments are required for the <code>&lt;IgnoreHealthError&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="inittablet">InitTablet</h3>
-
-<p>Initializes a tablet in the topology.<br><br></p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">InitTablet [-allow_update] [-allow_different_shard] [-allow_master_override] [-parent] [-db_name_override=&lt;db name&gt;] [-hostname=&lt;hostname&gt;] [-mysql_port=&lt;port&gt;] [-port=&lt;port&gt;] [-grpc_port=&lt;port&gt;] -keyspace=&lt;keyspace&gt; -shard=&lt;shard&gt; &lt;tablet alias&gt; &lt;tablet type&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">allow_master_override</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Use this flag to force initialization if a tablet is created as master, and a master for the keyspace/shard already exists. Use with caution.</td>
-</tr>
-<tr>
-<td style="text-align: left">allow_update</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Use this flag to force initialization if a tablet with the same name already exists. Use with caution.</td>
-</tr>
-<tr>
-<td style="text-align: left">db_name_override</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Overrides the name of the database that the vttablet uses</td>
-</tr>
-<tr>
-<td style="text-align: left">grpc_port</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">The gRPC port for the vttablet process</td>
-</tr>
-<tr>
-<td style="text-align: left">hostname</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The server on which the tablet is running</td>
-</tr>
-<tr>
-<td style="text-align: left">keyspace</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The keyspace to which this tablet belongs</td>
-</tr>
-<tr>
-<td style="text-align: left">mysql_port</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">The mysql port for the mysql daemon</td>
-</tr>
-<tr>
-<td style="text-align: left">parent</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">Creates the parent shard and keyspace if they don&#39;t yet exist</td>
-</tr>
-<tr>
-<td style="text-align: left">port</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">The main port for the vttablet process</td>
-</tr>
-<tr>
-<td style="text-align: left">shard</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The shard to which this tablet belongs</td>
-</tr>
-<tr>
-<td style="text-align: left">tags</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">A comma-separated list of key:value pairs that are used to tag the tablet</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><p><code>&lt;tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
-
-<ul>
-<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
-<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
-<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
-<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
-<li><code>master</code> &ndash; A primary copy of data</li>
-<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
-<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
-<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
-<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
-<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
-<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
-</ul></li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;tablet type&gt;</code> arguments are both required for the <code>&lt;InitTablet&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="ping">Ping</h3>
-
-<p>Checks that the specified tablet is awake and responding to RPCs. This command can be blocked by other in-flight operations.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">Ping &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;Ping&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="refreshstate">RefreshState</h3>
-
-<p>Reloads the tablet record on the specified tablet.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RefreshState &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;RefreshState&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="refreshstatebyshard">RefreshStateByShard</h3>
-
-<p>Runs &#39;RefreshState&#39; on all tablets in the given shard.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RefreshStateByShard [-cells=c1,c2,...] &lt;keyspace/shard&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">cells</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">Specifies a comma-separated list of cells whose tablets are included. If empty, all cells are considered.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;RefreshStateByShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="reparenttablet">ReparentTablet</h3>
-
-<p>Reparent a tablet to the current master in the shard. This only works if the current slave position matches the last known reparent action.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">ReparentTablet &lt;tablet alias&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;ReparentTablet&gt;</code> requires <code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="restorefrombackup">RestoreFromBackup</h3>
-
-<p>Stops mysqld and restores the data from the latest backup.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RestoreFromBackup &lt;tablet alias&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;RestoreFromBackup&gt;</code> command requires the <code>&lt;tablet alias&gt;</code> argument This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="runhealthcheck">RunHealthCheck</h3>
-
-<p>Runs a health check on a remote tablet.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">RunHealthCheck &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;RunHealthCheck&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-</ul>
-
-<h3 id="setreadonly">SetReadOnly</h3>
-
-<p>Sets the tablet as read-only.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">SetReadOnly &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;SetReadOnly&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>failed reading tablet %v: %v</li>
-</ul>
-
-<h3 id="setreadwrite">SetReadWrite</h3>
-
-<p>Sets the tablet as read-write.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">SetReadWrite &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;SetReadWrite&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>failed reading tablet %v: %v</li>
-</ul>
-
-<h3 id="sleep">Sleep</h3>
-
-<p>Blocks the action queue on the specified tablet for the specified amount of time. This is typically used for testing.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">Sleep &lt;tablet alias&gt; &lt;duration&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-<li><code>&lt;duration&gt;</code> &ndash; Required. The amount of time that the action queue should be blocked. The value is a string that contains a possibly signed sequence of decimal numbers, each with optional fraction and a unit suffix, such as &quot;300ms&quot; or &quot;1h45m&quot;. See the definition of the Go language&#39;s <a href="http://golang.org/pkg/time/#ParseDuration">ParseDuration</a> function for more details. Note that, in practice, the value should be a positively signed value.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;duration&gt;</code> arguments are required for the <code>&lt;Sleep&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-</ul>
-
-<h3 id="startslave">StartSlave</h3>
-
-<p>Starts replication on the specified slave.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">StartSlave &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;StartSlave&gt;</code> requires <code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
-<li>failed reading tablet %v: %v</li>
-</ul>
-
-<h3 id="stopslave">StopSlave</h3>
-
-<p>Stops replication on the specified slave.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">StopSlave &lt;tablet alias&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>action <code>&lt;StopSlave&gt;</code> requires <code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
-<li>failed reading tablet %v: %v</li>
-</ul>
-
-<h3 id="updatetabletaddrs">UpdateTabletAddrs</h3>
-
-<p>Updates the IP address and port numbers of a tablet.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">UpdateTabletAddrs [-hostname &lt;hostname&gt;] [-ip-addr &lt;ip addr&gt;] [-mysql-port &lt;mysql port&gt;] [-vt-port &lt;vt port&gt;] [-grpc-port &lt;grpc port&gt;] &lt;tablet alias&gt;</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">grpc-port</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">The gRPC port for the vttablet process</td>
-</tr>
-<tr>
-<td style="text-align: left">hostname</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">The fully qualified host name of the server on which the tablet is running.</td>
-</tr>
-<tr>
-<td style="text-align: left">ip-addr</td>
-<td style="text-align: left">string</td>
-<td style="text-align: left">IP address</td>
-</tr>
-<tr>
-<td style="text-align: left">mysql-port</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">The mysql port for the mysql daemon</td>
-</tr>
-<tr>
-<td style="text-align: left">vt-port</td>
-<td style="text-align: left">Int</td>
-<td style="text-align: left">The main port for the vttablet process</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;UpdateTabletAddrs&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>malformed address: %v</li>
-</ul>
-
-<h2 id="workflows">Workflows</h2>
-
-<ul>
-<li><a href="#workflowaction">WorkflowAction</a></li>
-<li><a href="#workflowcreate">WorkflowCreate</a></li>
-<li><a href="#workflowdelete">WorkflowDelete</a></li>
-<li><a href="#workflowstart">WorkflowStart</a></li>
-<li><a href="#workflowstop">WorkflowStop</a></li>
-<li><a href="#workflowtree">WorkflowTree</a></li>
-<li><a href="#workflowwait">WorkflowWait</a></li>
-</ul>
-
-<h3 id="workflowaction">WorkflowAction</h3>
-
-<p>Sends the provided action name on the specified path.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WorkflowAction &lt;path&gt; &lt;name&gt;</pre>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;name&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;path&gt;</code> and <code>&lt;name&gt;</code> arguments are required for the <code>&lt;WorkflowAction&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
-<li>no workflow.Manager registered</li>
-</ul>
-
-<h3 id="workflowcreate">WorkflowCreate</h3>
-
-<p>Creates the workflow with the provided parameters. The workflow is also started, unless -skip_start is specified.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WorkflowCreate [-skip_start] &lt;factoryName&gt; [parameters...]</pre>
-
-<h4 id="flags">Flags</h4>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Name</th>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Definition</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">skip_start</td>
-<td style="text-align: left">Boolean</td>
-<td style="text-align: left">If set, the workflow will not be started.</td>
-</tr>
-</tbody></table>
-
-<h4 id="arguments">Arguments</h4>
-
-<ul>
-<li><code>&lt;factoryName&gt;</code> &ndash; Required.</li>
-</ul>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;factoryName&gt;</code> argument is required for the <code>&lt;WorkflowCreate&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
-<li>no workflow.Manager registered</li>
-</ul>
-
-<h3 id="workflowdelete">WorkflowDelete</h3>
-
-<p>Deletes the finished or not started workflow.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WorkflowDelete &lt;uuid&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;uuid&gt;</code> argument is required for the <code>&lt;WorkflowDelete&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>no workflow.Manager registered</li>
-</ul>
-
-<h3 id="workflowstart">WorkflowStart</h3>
-
-<p>Starts the workflow.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WorkflowStart &lt;uuid&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;uuid&gt;</code> argument is required for the <code>&lt;WorkflowStart&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>no workflow.Manager registered</li>
-</ul>
-
-<h3 id="workflowstop">WorkflowStop</h3>
-
-<p>Stops the workflow.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WorkflowStop &lt;uuid&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;uuid&gt;</code> argument is required for the <code>&lt;WorkflowStop&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>no workflow.Manager registered</li>
-</ul>
-
-<h3 id="workflowtree">WorkflowTree</h3>
-
-<p>Displays a JSON representation of the workflow tree.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WorkflowTree </pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;WorkflowTree&gt;</code> command takes no parameter This error occurs if the command is not called with exactly 0 arguments.</li>
-<li>no workflow.Manager registered</li>
-</ul>
-
-<h3 id="workflowwait">WorkflowWait</h3>
-
-<p>Waits for the workflow to finish.</p>
-
-<h4 id="example">Example</h4>
-
-<pre class="command-example">WorkflowWait &lt;uuid&gt;</pre>
-
-<h4 id="errors">Errors</h4>
-
-<ul>
-<li>the <code>&lt;uuid&gt;</code> argument is required for the <code>&lt;WorkflowWait&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
-<li>no workflow.Manager registered</li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/reference/vtctl/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/reference/vtctl/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/reference/vtctl/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/reference/vtctl/"</script>
 </html>
diff --git a/docs/reference/vtctl/index.html b/docs/reference/vtctl/index.html
new file mode 100644
index 00000000000..16dfe57560e
--- /dev/null
+++ b/docs/reference/vtctl/index.html
@@ -0,0 +1,4060 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>vtctl Reference | Vitess</title>
+<meta property="og:title" content="vtctl Reference" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/reference/vtctl/" />
+<meta property="og:url" content="http://vitess.io/reference/vtctl/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/reference/vtctl/","headline":"vtctl Reference","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>vtctl Reference</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>This reference guide explains the commands that the <b>vtctl</b> tool supports. <strong>vtctl</strong> is a command-line tool used to administer a Vitess cluster, and it allows a human or application to easily interact with a Vitess implementation.</p>
+
+<p>Commands are listed in the following groups:</p>
+
+<ul>
+<li><a href="#cells">Cells</a></li>
+<li><a href="#generic">Generic</a></li>
+<li><a href="#keyspaces">Keyspaces</a></li>
+<li><a href="#queries">Queries</a></li>
+<li><a href="#replication-graph">Replication Graph</a></li>
+<li><a href="#resharding-throttler">Resharding Throttler</a></li>
+<li><a href="#schema-version-permissions">Schema, Version, Permissions</a></li>
+<li><a href="#serving-graph">Serving Graph</a></li>
+<li><a href="#shards">Shards</a></li>
+<li><a href="#tablets">Tablets</a></li>
+<li><a href="#workflows">Workflows</a></li>
+</ul>
+
+<h2 id="cells">Cells</h2>
+
+<ul>
+<li><a href="#addcellinfo">AddCellInfo</a></li>
+<li><a href="#deletecellinfo">DeleteCellInfo</a></li>
+<li><a href="#getcellinfo">GetCellInfo</a></li>
+<li><a href="#getcellinfonames">GetCellInfoNames</a></li>
+<li><a href="#updatecellinfo">UpdateCellInfo</a></li>
+</ul>
+
+<h3 id="addcellinfo">AddCellInfo</h3>
+
+<p>Registers a local topology service in a new cell by creating the CellInfo with the provided parameters. The address will be used to connect to the topology service, and we&#39;ll put Vitess data starting at the provided root.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">AddCellInfo [-server_address &lt;addr&gt;] [-root &lt;root&gt;] &lt;cell&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">root</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The root path the topology server is using for that cell.</td>
+</tr>
+<tr>
+<td style="text-align: left">server_address</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The address the topology server is using for that cell.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;addr&gt;</code> &ndash; Required.</li>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;AddCellInfo&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="deletecellinfo">DeleteCellInfo</h3>
+
+<p>Deletes the CellInfo for the provided cell. The cell cannot be referenced by any Shard record.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">DeleteCellInfo &lt;cell&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;DeleteCellInfo&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="getcellinfo">GetCellInfo</h3>
+
+<p>Prints a JSON representation of the CellInfo for a cell.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetCellInfo &lt;cell&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;GetCellInfo&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="getcellinfonames">GetCellInfoNames</h3>
+
+<p>Lists all the cells for which we have a CellInfo object, meaning we have a local topology service registered.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetCellInfoNames </pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li><code>&lt;GetCellInfoNames&gt;</code> command takes no parameter This error occurs if the command is not called with exactly 0 arguments.</li>
+</ul>
+
+<h3 id="updatecellinfo">UpdateCellInfo</h3>
+
+<p>Updates the content of a CellInfo with the provided parameters. If a value is empty, it is not updated. The CellInfo will be created if it doesn&#39;t exist.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">UpdateCellInfo [-server_address &lt;addr&gt;] [-root &lt;root&gt;] &lt;cell&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">root</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The root path the topology server is using for that cell.</td>
+</tr>
+<tr>
+<td style="text-align: left">server_address</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The address the topology server is using for that cell.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;addr&gt;</code> &ndash; Required.</li>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;UpdateCellInfo&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h2 id="generic">Generic</h2>
+
+<ul>
+<li><a href="#listalltablets">ListAllTablets</a></li>
+<li><a href="#listtablets">ListTablets</a></li>
+<li><a href="#pruneactionlogs">PruneActionLogs</a></li>
+<li><a href="#validate">Validate</a></li>
+</ul>
+
+<h3 id="listalltablets">ListAllTablets</h3>
+
+<p>Lists all tablets in an awk-friendly way.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ListAllTablets &lt;cell name&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;cell name&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell name&gt;</code> argument is required for the <code>&lt;ListAllTablets&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="listtablets">ListTablets</h3>
+
+<p>Lists specified tablets in an awk-friendly way.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ListTablets &lt;tablet alias&gt; ...</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>. To specify multiple values for this argument, separate individual values with a space.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;ListTablets&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
+</ul>
+
+<h3 id="pruneactionlogs">PruneActionLogs</h3>
+
+<p>(requires zktopo.Server)<br><br>e.g. PruneActionLogs -keep-count=10 /zk/global/vt/keyspaces/my_keyspace/shards/0/actionlog<br><br>Removes older actionlog entries until at most &lt;count to keep&gt; are left.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">PruneActionLogs [-keep-count=&lt;count to keep&gt;] &lt;zk actionlog path&gt; ...</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">keep-count</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">count to keep</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;zk actionlog path&gt;</code> &ndash; Required. To specify multiple values for this argument, separate individual values with a space.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;PruneActionLogs&gt;</code> requires <code>&lt;zk action log path&gt;</code> [...] This error occurs if the command is not called with at least one argument.</li>
+<li><code>&lt;PruneActionLogs&gt;</code> requires a zktopo.Server</li>
+<li>some errors occurred, check the log</li>
+</ul>
+
+<h3 id="validate">Validate</h3>
+
+<p>Validates that all nodes reachable from the global replication graph and that all tablets in all discoverable cells are consistent.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">Validate [-ping-tablets]</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">ping-tablets</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Indicates whether all tablets should be pinged during the validation process</td>
+</tr>
+</tbody></table>
+
+<h2 id="keyspaces">Keyspaces</h2>
+
+<ul>
+<li><a href="#createkeyspace">CreateKeyspace</a></li>
+<li><a href="#deletekeyspace">DeleteKeyspace</a></li>
+<li><a href="#findallshardsinkeyspace">FindAllShardsInKeyspace</a></li>
+<li><a href="#getkeyspace">GetKeyspace</a></li>
+<li><a href="#getkeyspaces">GetKeyspaces</a></li>
+<li><a href="#migrateservedfrom">MigrateServedFrom</a></li>
+<li><a href="#migrateservedtypes">MigrateServedTypes</a></li>
+<li><a href="#rebuildkeyspacegraph">RebuildKeyspaceGraph</a></li>
+<li><a href="#removekeyspacecell">RemoveKeyspaceCell</a></li>
+<li><a href="#setkeyspaceservedfrom">SetKeyspaceServedFrom</a></li>
+<li><a href="#setkeyspaceshardinginfo">SetKeyspaceShardingInfo</a></li>
+<li><a href="#validatekeyspace">ValidateKeyspace</a></li>
+<li><a href="#waitfordrain">WaitForDrain</a></li>
+</ul>
+
+<h3 id="createkeyspace">CreateKeyspace</h3>
+
+<p>Creates the specified keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">CreateKeyspace [-sharding_column_name=name] [-sharding_column_type=type] [-served_from=tablettype1:ks1,tablettype2,ks2,...] [-force] &lt;keyspace name&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">force</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Proceeds even if the keyspace already exists</td>
+</tr>
+<tr>
+<td style="text-align: left">served_from</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of dbtype:keyspace pairs used to serve traffic</td>
+</tr>
+<tr>
+<td style="text-align: left">sharding_column_name</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies the column to use for sharding operations</td>
+</tr>
+<tr>
+<td style="text-align: left">sharding_column_type</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies the type of the column to use for sharding operations</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;CreateKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="deletekeyspace">DeleteKeyspace</h3>
+
+<p>Deletes the specified keyspace. In recursive mode, it also recursively deletes all shards in the keyspace. Otherwise, there must be no shards left in the keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">DeleteKeyspace [-recursive] &lt;keyspace&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">recursive</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Also recursively delete all shards in the keyspace.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>must specify the <code>&lt;keyspace&gt;</code> argument for <code>&lt;DeleteKeyspace&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="findallshardsinkeyspace">FindAllShardsInKeyspace</h3>
+
+<p>Displays all of the shards in the specified keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">FindAllShardsInKeyspace &lt;keyspace&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;FindAllShardsInKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="getkeyspace">GetKeyspace</h3>
+
+<p>Outputs a JSON structure that contains information about the Keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetKeyspace &lt;keyspace&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;GetKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="getkeyspaces">GetKeyspaces</h3>
+
+<p>Outputs a sorted list of all keyspaces.</p>
+
+<h3 id="migrateservedfrom">MigrateServedFrom</h3>
+
+<p>Makes the &lt;destination keyspace/shard&gt; serve the given type. This command also rebuilds the serving graph.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">MigrateServedFrom [-cells=c1,c2,...] [-reverse] &lt;destination keyspace/shard&gt; &lt;served tablet type&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
+</tr>
+<tr>
+<td style="text-align: left">filtered_replication_wait_time</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Specifies the maximum time to wait, in seconds, for filtered replication to catch up on master migrations</td>
+</tr>
+<tr>
+<td style="text-align: left">reverse</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Moves the served tablet type backward instead of forward. Use in case of trouble</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;destination keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><p><code>&lt;served tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
+
+<ul>
+<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
+<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
+<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
+<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
+<li><code>master</code> &ndash; A primary copy of data</li>
+<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
+<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
+<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
+<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
+<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
+<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
+</ul></li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;destination keyspace/shard&gt;</code> and <code>&lt;served tablet type&gt;</code> arguments are both required for the <code>&lt;MigrateServedFrom&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="migrateservedtypes">MigrateServedTypes</h3>
+
+<p>Migrates a serving type from the source shard to the shards that it replicates to. This command also rebuilds the serving graph. The &lt;keyspace/shard&gt; argument can specify any of the shards involved in the migration.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">MigrateServedTypes [-cells=c1,c2,...] [-reverse] [-skip-refresh-state] &lt;keyspace/shard&gt; &lt;served tablet type&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
+</tr>
+<tr>
+<td style="text-align: left">filtered_replication_wait_time</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Specifies the maximum time to wait, in seconds, for filtered replication to catch up on master migrations</td>
+</tr>
+<tr>
+<td style="text-align: left">reverse</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Moves the served tablet type backward instead of forward. Use in case of trouble</td>
+</tr>
+<tr>
+<td style="text-align: left">skip-refresh-state</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Skips refreshing the state of the source tablets after the migration, meaning that the refresh will need to be done manually, replica and rdonly only)</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><p><code>&lt;served tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
+
+<ul>
+<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
+<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
+<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
+<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
+<li><code>master</code> &ndash; A primary copy of data</li>
+<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
+<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
+<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
+<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
+<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
+<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
+</ul></li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;source keyspace/shard&gt;</code> and <code>&lt;served tablet type&gt;</code> arguments are both required for the <code>&lt;MigrateServedTypes&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+<li>the <code>&lt;skip-refresh-state&gt;</code> flag can only be specified for non-master migrations</li>
+</ul>
+
+<h3 id="rebuildkeyspacegraph">RebuildKeyspaceGraph</h3>
+
+<p>Rebuilds the serving data for the keyspace. This command may trigger an update to all connected clients.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RebuildKeyspaceGraph [-cells=c1,c2,...] &lt;keyspace&gt; ...</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace. To specify multiple values for this argument, separate individual values with a space.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace&gt;</code> argument must be used to specify at least one keyspace when calling the <code>&lt;RebuildKeyspaceGraph&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
+</ul>
+
+<h3 id="removekeyspacecell">RemoveKeyspaceCell</h3>
+
+<p>Removes the cell from the Cells list for all shards in the keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RemoveKeyspaceCell [-force] [-recursive] &lt;keyspace&gt; &lt;cell&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">force</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Proceeds even if the cell&#39;s topology server cannot be reached. The assumption is that you turned down the entire cell, and just need to update the global topo data.</td>
+</tr>
+<tr>
+<td style="text-align: left">recursive</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Also delete all tablets in that cell belonging to the specified keyspace.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace&gt;</code> and <code>&lt;cell&gt;</code> arguments are required for the <code>&lt;RemoveKeyspaceCell&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="setkeyspaceservedfrom">SetKeyspaceServedFrom</h3>
+
+<p>Changes the ServedFromMap manually. This command is intended for emergency fixes. This field is automatically set when you call the <em>MigrateServedFrom</em> command. This command does not rebuild the serving graph.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">SetKeyspaceServedFrom [-source=&lt;source keyspace name&gt;] [-remove] [-cells=c1,c2,...] &lt;keyspace name&gt; &lt;tablet type&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells to affect</td>
+</tr>
+<tr>
+<td style="text-align: left">remove</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Indicates whether to add (default) or remove the served from record</td>
+</tr>
+<tr>
+<td style="text-align: left">source</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies the source keyspace name</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+<li><p><code>&lt;tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
+
+<ul>
+<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
+<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
+<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
+<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
+<li><code>master</code> &ndash; A primary copy of data</li>
+<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
+<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
+<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
+<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
+<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
+<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
+</ul></li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace name&gt;</code> and <code>&lt;tablet type&gt;</code> arguments are required for the <code>&lt;SetKeyspaceServedFrom&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="setkeyspaceshardinginfo">SetKeyspaceShardingInfo</h3>
+
+<p>Updates the sharding information for a keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">SetKeyspaceShardingInfo [-force] &lt;keyspace name&gt; [&lt;column name&gt;] [&lt;column type&gt;]</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">force</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Updates fields even if they are already set. Use caution before calling this command.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+<li><code>&lt;column name&gt;</code> &ndash; Optional.</li>
+<li><code>&lt;column type&gt;</code> &ndash; Optional.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;SetKeyspaceShardingInfo&gt;</code> command. The <code>&lt;column name&gt;</code> and <code>&lt;column type&gt;</code> arguments are both optional This error occurs if the command is not called with between 1 and 3 arguments.</li>
+<li>both <code>&lt;column name&gt;</code> and <code>&lt;column type&gt;</code> must be set, or both must be unset</li>
+</ul>
+
+<h3 id="validatekeyspace">ValidateKeyspace</h3>
+
+<p>Validates that all nodes reachable from the specified keyspace are consistent.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ValidateKeyspace [-ping-tablets] &lt;keyspace name&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">ping-tablets</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Specifies whether all tablets will be pinged during the validation process</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;ValidateKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="waitfordrain">WaitForDrain</h3>
+
+<p>Blocks until no new queries were observed on all tablets with the given tablet type in the specifed keyspace.  This can be used as sanity check to ensure that the tablets were drained after running vtctl MigrateServedTypes  and vtgate is no longer using them. If -timeout is set, it fails when the timeout is reached.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WaitForDrain [-timeout &lt;duration&gt;] [-retry_delay &lt;duration&gt;] [-initial_wait &lt;duration&gt;] &lt;keyspace/shard&gt; &lt;served tablet type&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells to look for tablets</td>
+</tr>
+<tr>
+<td style="text-align: left">initial_wait</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Time to wait for all tablets to check in</td>
+</tr>
+<tr>
+<td style="text-align: left">retry_delay</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Time to wait between two checks</td>
+</tr>
+<tr>
+<td style="text-align: left">timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Timeout after which the command fails</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><p><code>&lt;served tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
+
+<ul>
+<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
+<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
+<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
+<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
+<li><code>master</code> &ndash; A primary copy of data</li>
+<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
+<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
+<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
+<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
+<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
+<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
+</ul></li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;tablet type&gt;</code> arguments are both required for the <code>&lt;WaitForDrain&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h2 id="queries">Queries</h2>
+
+<ul>
+<li><a href="#vtgateexecute">VtGateExecute</a></li>
+<li><a href="#vtgateexecutekeyspaceids">VtGateExecuteKeyspaceIds</a></li>
+<li><a href="#vtgateexecuteshards">VtGateExecuteShards</a></li>
+<li><a href="#vtgatesplitquery">VtGateSplitQuery</a></li>
+<li><a href="#vttabletbegin">VtTabletBegin</a></li>
+<li><a href="#vttabletcommit">VtTabletCommit</a></li>
+<li><a href="#vttabletexecute">VtTabletExecute</a></li>
+<li><a href="#vttabletrollback">VtTabletRollback</a></li>
+<li><a href="#vttabletstreamhealth">VtTabletStreamHealth</a></li>
+<li><a href="#vttabletupdatestream">VtTabletUpdateStream</a></li>
+</ul>
+
+<h3 id="vtgateexecute">VtGateExecute</h3>
+
+<p>Executes the given SQL query with the provided bound variables against the vtgate server.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtGateExecute -server &lt;vtgate&gt; [-bind_variables &lt;JSON map&gt;] [-connect_timeout &lt;connect timeout&gt;] [-keyspace &lt;default keyspace&gt;] [-tablet_type &lt;tablet type&gt;] [-options &lt;proto text options&gt;] [-json] &lt;sql&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vtgate client</td>
+</tr>
+<tr>
+<td style="text-align: left">json</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Output JSON instead of human-readable table</td>
+</tr>
+<tr>
+<td style="text-align: left">keyspace</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">default keyspace to use</td>
+</tr>
+<tr>
+<td style="text-align: left">options</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">execute options values as a text encoded proto of the ExecuteOptions structure</td>
+</tr>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">VtGate server to connect to</td>
+</tr>
+<tr>
+<td style="text-align: left">tablet_type</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">tablet type to query</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtgate&gt;</code> &ndash; Required.</li>
+<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;sql&gt;</code> argument is required for the <code>&lt;VtGateExecute&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>error connecting to vtgate &#39;%v&#39;: %v</li>
+<li>Execute failed: %v</li>
+</ul>
+
+<h3 id="vtgateexecutekeyspaceids">VtGateExecuteKeyspaceIds</h3>
+
+<p>Executes the given SQL query with the provided bound variables against the vtgate server. It is routed to the shards that contain the provided keyspace ids.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtGateExecuteKeyspaceIds -server &lt;vtgate&gt; -keyspace &lt;keyspace&gt; -keyspace_ids &lt;ks1 in hex&gt;,&lt;k2 in hex&gt;,... [-bind_variables &lt;JSON map&gt;] [-connect_timeout &lt;connect timeout&gt;] [-tablet_type &lt;tablet type&gt;] [-options &lt;proto text options&gt;] [-json] &lt;sql&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vtgate client</td>
+</tr>
+<tr>
+<td style="text-align: left">json</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Output JSON instead of human-readable table</td>
+</tr>
+<tr>
+<td style="text-align: left">keyspace</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">keyspace to send query to</td>
+</tr>
+<tr>
+<td style="text-align: left">keyspace_ids</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">comma-separated list of keyspace ids (in hex) that will map into shards to send query to</td>
+</tr>
+<tr>
+<td style="text-align: left">options</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">execute options values as a text encoded proto of the ExecuteOptions structure</td>
+</tr>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">VtGate server to connect to</td>
+</tr>
+<tr>
+<td style="text-align: left">tablet_type</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">tablet type to query</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtgate&gt;</code> &ndash; Required.</li>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+<li><code>&lt;ks1 in hex&gt;</code> &ndash; Required. To specify multiple values for this argument, separate individual values with a comma.</li>
+<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;sql&gt;</code> argument is required for the <code>&lt;VtGateExecuteKeyspaceIds&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>cannot hex-decode value %v &#39;%v&#39;: %v</li>
+<li>error connecting to vtgate &#39;%v&#39;: %v</li>
+<li>Execute failed: %v</li>
+</ul>
+
+<h3 id="vtgateexecuteshards">VtGateExecuteShards</h3>
+
+<p>Executes the given SQL query with the provided bound variables against the vtgate server. It is routed to the provided shards.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtGateExecuteShards -server &lt;vtgate&gt; -keyspace &lt;keyspace&gt; -shards &lt;shard0&gt;,&lt;shard1&gt;,... [-bind_variables &lt;JSON map&gt;] [-connect_timeout &lt;connect timeout&gt;] [-tablet_type &lt;tablet type&gt;] [-options &lt;proto text options&gt;] [-json] &lt;sql&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vtgate client</td>
+</tr>
+<tr>
+<td style="text-align: left">json</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Output JSON instead of human-readable table</td>
+</tr>
+<tr>
+<td style="text-align: left">keyspace</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">keyspace to send query to</td>
+</tr>
+<tr>
+<td style="text-align: left">options</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">execute options values as a text encoded proto of the ExecuteOptions structure</td>
+</tr>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">VtGate server to connect to</td>
+</tr>
+<tr>
+<td style="text-align: left">shards</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">comma-separated list of shards to send query to</td>
+</tr>
+<tr>
+<td style="text-align: left">tablet_type</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">tablet type to query</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtgate&gt;</code> &ndash; Required.</li>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+<li><code>&lt;shard&gt;</code> &ndash; Required. The name of a shard. The argument value is typically in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>. To specify multiple values for this argument, separate individual values with a comma.</li>
+<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;sql&gt;</code> argument is required for the <code>&lt;VtGateExecuteShards&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>error connecting to vtgate &#39;%v&#39;: %v</li>
+<li>Execute failed: %v</li>
+</ul>
+
+<h3 id="vtgatesplitquery">VtGateSplitQuery</h3>
+
+<p>Executes the SplitQuery computation for the given SQL query with the provided bound variables against the vtgate server (this is the base query for Map-Reduce workloads, and is provided here for debug / test purposes).</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtGateSplitQuery -server &lt;vtgate&gt; -keyspace &lt;keyspace&gt; [-split_column &lt;split_column&gt;] -split_count &lt;split_count&gt; [-bind_variables &lt;JSON map&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;sql&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">algorithm</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The algorithm to</td>
+</tr>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vtgate client</td>
+</tr>
+<tr>
+<td style="text-align: left">keyspace</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">keyspace to send query to</td>
+</tr>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">VtGate server to connect to</td>
+</tr>
+<tr>
+<td style="text-align: left">split_count</td>
+<td style="text-align: left">Int64</td>
+<td style="text-align: left">number of splits to generate.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtgate&gt;</code> &ndash; Required.</li>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+<li><code>&lt;split_count&gt;</code> &ndash; Required.</li>
+<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;sql&gt;</code> argument is required for the <code>&lt;VtGateSplitQuery&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>Exactly one of <code>&lt;split_count&gt;</code> or num_rows_per_query_part</li>
+<li>Unknown split-query <code>&lt;algorithm&gt;</code>: %v</li>
+<li>error connecting to vtgate &#39;%v&#39;: %v</li>
+<li>SplitQuery failed: %v</li>
+</ul>
+
+<h3 id="vttabletbegin">VtTabletBegin</h3>
+
+<p>Starts a transaction on the provided server.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtTabletBegin [-username &lt;TableACL user&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;tablet alias&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vttablet client</td>
+</tr>
+<tr>
+<td style="text-align: left">username</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">If set, value is set as immediate caller id in the request and used by vttablet for TableACL check</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;TableACL user&gt;</code> &ndash; Required.</li>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet_alias&gt;</code> argument is required for the <code>&lt;VtTabletBegin&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>cannot connect to tablet %v: %v</li>
+<li>Begin failed: %v</li>
+</ul>
+
+<h3 id="vttabletcommit">VtTabletCommit</h3>
+
+<p>Commits the given transaction on the provided server.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtTabletCommit [-username &lt;TableACL user&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;transaction_id&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vttablet client</td>
+</tr>
+<tr>
+<td style="text-align: left">username</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">If set, value is set as immediate caller id in the request and used by vttablet for TableACL check</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;TableACL user&gt;</code> &ndash; Required.</li>
+<li><code>&lt;transaction_id&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet_alias&gt;</code> and <code>&lt;transaction_id&gt;</code> arguments are required for the <code>&lt;VtTabletCommit&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+<li>cannot connect to tablet %v: %v</li>
+</ul>
+
+<h3 id="vttabletexecute">VtTabletExecute</h3>
+
+<p>Executes the given query on the given tablet. -transaction_id is optional. Use VtTabletBegin to start a transaction.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtTabletExecute [-username &lt;TableACL user&gt;] [-connect_timeout &lt;connect timeout&gt;] [-transaction_id &lt;transaction_id&gt;] [-options &lt;proto text options&gt;] [-json] &lt;tablet alias&gt; &lt;sql&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vttablet client</td>
+</tr>
+<tr>
+<td style="text-align: left">json</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Output JSON instead of human-readable table</td>
+</tr>
+<tr>
+<td style="text-align: left">options</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">execute options values as a text encoded proto of the ExecuteOptions structure</td>
+</tr>
+<tr>
+<td style="text-align: left">transaction_id</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">transaction id to use, if inside a transaction.</td>
+</tr>
+<tr>
+<td style="text-align: left">username</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">If set, value is set as immediate caller id in the request and used by vttablet for TableACL check</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;TableACL user&gt;</code> &ndash; Required.</li>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><code>&lt;sql&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet_alias&gt;</code> and <code>&lt;sql&gt;</code> arguments are required for the <code>&lt;VtTabletExecute&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+<li>cannot connect to tablet %v: %v</li>
+<li>Execute failed: %v</li>
+</ul>
+
+<h3 id="vttabletrollback">VtTabletRollback</h3>
+
+<p>Rollbacks the given transaction on the provided server.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtTabletRollback [-username &lt;TableACL user&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;tablet alias&gt; &lt;transaction_id&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vttablet client</td>
+</tr>
+<tr>
+<td style="text-align: left">username</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">If set, value is set as immediate caller id in the request and used by vttablet for TableACL check</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;TableACL user&gt;</code> &ndash; Required.</li>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><code>&lt;transaction_id&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet_alias&gt;</code> and <code>&lt;transaction_id&gt;</code> arguments are required for the <code>&lt;VtTabletRollback&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+<li>cannot connect to tablet %v: %v</li>
+</ul>
+
+<h3 id="vttabletstreamhealth">VtTabletStreamHealth</h3>
+
+<p>Executes the StreamHealth streaming query to a vttablet process. Will stop after getting &lt;count&gt; answers.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtTabletStreamHealth [-count &lt;count, default 1&gt;] [-connect_timeout &lt;connect timeout&gt;] &lt;tablet alias&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vttablet client</td>
+</tr>
+<tr>
+<td style="text-align: left">count</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">number of responses to wait for</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;count default 1&gt;</code> &ndash; Required.</li>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;VtTabletStreamHealth&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>cannot connect to tablet %v: %v</li>
+</ul>
+
+<h3 id="vttabletupdatestream">VtTabletUpdateStream</h3>
+
+<p>Executes the UpdateStream streaming query to a vttablet process. Will stop after getting &lt;count&gt; answers.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">VtTabletUpdateStream [-count &lt;count, default 1&gt;] [-connect_timeout &lt;connect timeout&gt;] [-position &lt;position&gt;] [-timestamp &lt;timestamp&gt;] &lt;tablet alias&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">connect_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">Connection timeout for vttablet client</td>
+</tr>
+<tr>
+<td style="text-align: left">count</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">number of responses to wait for</td>
+</tr>
+<tr>
+<td style="text-align: left">position</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">position to start the stream from</td>
+</tr>
+<tr>
+<td style="text-align: left">timestamp</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">timestamp to start the stream from</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;count default 1&gt;</code> &ndash; Required.</li>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;VtTabletUpdateStream&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>cannot connect to tablet %v: %v</li>
+</ul>
+
+<h2 id="replication-graph">Replication Graph</h2>
+
+<ul>
+<li><a href="#getshardreplication">GetShardReplication</a></li>
+</ul>
+
+<h3 id="getshardreplication">GetShardReplication</h3>
+
+<p>Outputs a JSON structure that contains information about the ShardReplication.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetShardReplication &lt;cell&gt; &lt;keyspace/shard&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> and <code>&lt;keyspace/shard&gt;</code> arguments are required for the <code>&lt;GetShardReplication&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h2 id="resharding-throttler">Resharding Throttler</h2>
+
+<ul>
+<li><a href="#getthrottlerconfiguration">GetThrottlerConfiguration</a></li>
+<li><a href="#resetthrottlerconfiguration">ResetThrottlerConfiguration</a></li>
+<li><a href="#throttlermaxrates">ThrottlerMaxRates</a></li>
+<li><a href="#throttlersetmaxrate">ThrottlerSetMaxRate</a></li>
+<li><a href="#updatethrottlerconfiguration">UpdateThrottlerConfiguration</a></li>
+</ul>
+
+<h3 id="getthrottlerconfiguration">GetThrottlerConfiguration</h3>
+
+<p>Returns the current configuration of the MaxReplicationLag module. If no throttler name is specified, the configuration of all throttlers will be returned.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetThrottlerConfiguration -server &lt;vtworker or vttablet&gt; [&lt;throttler name&gt;]</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">vtworker or vttablet to connect to</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
+<li><code>&lt;throttler name&gt;</code> &ndash; Optional.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;GetThrottlerConfiguration&gt;</code> command accepts only <code>&lt;throttler name&gt;</code> as optional positional parameter This error occurs if the command is not called with more than 1 arguments.</li>
+<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+<li>failed to get the throttler configuration from <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+</ul>
+
+<h3 id="resetthrottlerconfiguration">ResetThrottlerConfiguration</h3>
+
+<p>Resets the current configuration of the MaxReplicationLag module. If no throttler name is specified, the configuration of all throttlers will be reset.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ResetThrottlerConfiguration -server &lt;vtworker or vttablet&gt; [&lt;throttler name&gt;]</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">vtworker or vttablet to connect to</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
+<li><code>&lt;throttler name&gt;</code> &ndash; Optional.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;ResetThrottlerConfiguration&gt;</code> command accepts only <code>&lt;throttler name&gt;</code> as optional positional parameter This error occurs if the command is not called with more than 1 arguments.</li>
+<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+<li>failed to get the throttler configuration from <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+</ul>
+
+<h3 id="throttlermaxrates">ThrottlerMaxRates</h3>
+
+<p>Returns the current max rate of all active resharding throttlers on the server.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ThrottlerMaxRates -server &lt;vtworker or vttablet&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">vtworker or vttablet to connect to</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the ThrottlerSetMaxRate command does not accept any positional parameters This error occurs if the command is not called with exactly 0 arguments.</li>
+<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+<li>failed to get the throttler rate from <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+</ul>
+
+<h3 id="throttlersetmaxrate">ThrottlerSetMaxRate</h3>
+
+<p>Sets the max rate for all active resharding throttlers on the server.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ThrottlerSetMaxRate -server &lt;vtworker or vttablet&gt; &lt;rate&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">vtworker or vttablet to connect to</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
+<li><code>&lt;rate&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;rate&gt;</code> argument is required for the <code>&lt;ThrottlerSetMaxRate&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>failed to parse rate &#39;%v&#39; as integer value: %v</li>
+<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+<li>failed to set the throttler rate on <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+</ul>
+
+<h3 id="updatethrottlerconfiguration">UpdateThrottlerConfiguration</h3>
+
+<p>Updates the configuration of the MaxReplicationLag module. The configuration must be specified as protobuf text. If a field is omitted or has a zero value, it will be ignored unless -copy_zero_values is specified. If no throttler name is specified, all throttlers will be updated.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">UpdateThrottlerConfiguration `-server &lt;vtworker or vttablet&gt; [-copy_zero_values] "&lt;configuration protobuf text&gt;" [&lt;throttler name&gt;]`</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">copy_zero_values</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">If true, fields with zero values will be copied as well</td>
+</tr>
+<tr>
+<td style="text-align: left">server</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">vtworker or vttablet to connect to</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;vtworker or vttablet&gt;</code> &ndash; Required.</li>
+<li><code>&lt;throttler name&gt;</code> &ndash; Optional.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>Failed to unmarshal the configuration protobuf text (%v) into a protobuf instance: %v</li>
+<li>error creating a throttler client for <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+<li>failed to update the throttler configuration on <code>&lt;server&gt;</code> &#39;%v&#39;: %v</li>
+</ul>
+
+<h2 id="schema-version-permissions">Schema, Version, Permissions</h2>
+
+<ul>
+<li><a href="#applyschema">ApplySchema</a></li>
+<li><a href="#applyvschema">ApplyVSchema</a></li>
+<li><a href="#copyschemashard">CopySchemaShard</a></li>
+<li><a href="#getpermissions">GetPermissions</a></li>
+<li><a href="#getschema">GetSchema</a></li>
+<li><a href="#getvschema">GetVSchema</a></li>
+<li><a href="#rebuildvschemagraph">RebuildVSchemaGraph</a></li>
+<li><a href="#reloadschema">ReloadSchema</a></li>
+<li><a href="#reloadschemakeyspace">ReloadSchemaKeyspace</a></li>
+<li><a href="#reloadschemashard">ReloadSchemaShard</a></li>
+<li><a href="#validatepermissionskeyspace">ValidatePermissionsKeyspace</a></li>
+<li><a href="#validatepermissionsshard">ValidatePermissionsShard</a></li>
+<li><a href="#validateschemakeyspace">ValidateSchemaKeyspace</a></li>
+<li><a href="#validateschemashard">ValidateSchemaShard</a></li>
+<li><a href="#validateversionkeyspace">ValidateVersionKeyspace</a></li>
+<li><a href="#validateversionshard">ValidateVersionShard</a></li>
+</ul>
+
+<h3 id="applyschema">ApplySchema</h3>
+
+<p>Applies the schema change to the specified keyspace on every master, running in parallel on all shards. The changes are then propagated to slaves via replication. If -allow_long_unavailability is set, schema changes affecting a large number of rows (and possibly incurring a longer period of unavailability) will not be rejected.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ApplySchema [-allow_long_unavailability] [-wait_slave_timeout=10s] {-sql=&lt;sql&gt; || -sql-file=&lt;filename&gt;} &lt;keyspace&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">allow_long_unavailability</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Allow large schema changes which incur a longer unavailability of the database.</td>
+</tr>
+<tr>
+<td style="text-align: left">sql</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">A list of semicolon-delimited SQL commands</td>
+</tr>
+<tr>
+<td style="text-align: left">sql-file</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Identifies the file that contains the SQL commands</td>
+</tr>
+<tr>
+<td style="text-align: left">wait_slave_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">The amount of time to wait for slaves to receive the schema change via replication.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace&gt;</code> argument is required for the command<code>&lt;ApplySchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="applyvschema">ApplyVSchema</h3>
+
+<p>Applies the VTGate routing schema to the provided keyspace. Shows the result after application.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ApplyVSchema {-vschema=&lt;vschema&gt; || -vschema_file=&lt;vschema file&gt;} [-cells=c1,c2,...] [-skip_rebuild] &lt;keyspace&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">If specified, limits the rebuild to the cells, after upload. Ignored if skipRebuild is set.</td>
+</tr>
+<tr>
+<td style="text-align: left">skip_rebuild</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">If set, do no rebuild the SrvSchema objects.</td>
+</tr>
+<tr>
+<td style="text-align: left">vschema</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Identifies the VTGate routing schema</td>
+</tr>
+<tr>
+<td style="text-align: left">vschema_file</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Identifies the VTGate routing schema file</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;ApplyVSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>either the <code>&lt;vschema&gt;</code> or <code>&lt;vschema&gt;</code>File flag must be specified when calling the <code>&lt;ApplyVSchema&gt;</code> command</li>
+</ul>
+
+<h3 id="copyschemashard">CopySchemaShard</h3>
+
+<p>Copies the schema from a source shard&#39;s master (or a specific tablet) to a destination shard. The schema is applied directly on the master of the destination shard, and it is propagated to the replicas through binlogs.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">CopySchemaShard [-tables=&lt;table1&gt;,&lt;table2&gt;,...] [-exclude_tables=&lt;table1&gt;,&lt;table2&gt;,...] [-include-views] [-wait_slave_timeout=10s] {&lt;source keyspace/shard&gt; || &lt;source tablet alias&gt;} &lt;destination keyspace/shard&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">exclude_tables</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/</td>
+</tr>
+<tr>
+<td style="text-align: left">include-views</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Includes views in the output</td>
+</tr>
+<tr>
+<td style="text-align: left">tables</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of tables to copy. Each is either an exact match, or a regular expression of the form /regexp/</td>
+</tr>
+<tr>
+<td style="text-align: left">wait_slave_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">The amount of time to wait for slaves to receive the schema change via replication.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;source tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><code>&lt;destination keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;source keyspace/shard&gt;</code> and <code>&lt;destination keyspace/shard&gt;</code> arguments are both required for the <code>&lt;CopySchemaShard&gt;</code> command. Instead of the <code>&lt;source keyspace/shard&gt;</code> argument, you can also specify <code>&lt;tablet alias&gt;</code> which refers to a specific tablet of the shard in the source keyspace This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="getpermissions">GetPermissions</h3>
+
+<p>Displays the permissions for a tablet.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetPermissions &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;GetPermissions&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="getschema">GetSchema</h3>
+
+<p>Displays the full schema for a tablet, or just the schema for the specified tables in that tablet.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetSchema [-tables=&lt;table1&gt;,&lt;table2&gt;,...] [-exclude_tables=&lt;table1&gt;,&lt;table2&gt;,...] [-include-views] &lt;tablet alias&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">exclude_tables</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/</td>
+</tr>
+<tr>
+<td style="text-align: left">include-views</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Includes views in the output</td>
+</tr>
+<tr>
+<td style="text-align: left">table_names_only</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Only displays table names that match</td>
+</tr>
+<tr>
+<td style="text-align: left">tables</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of tables for which we should gather information. Each is either an exact match, or a regular expression of the form /regexp/</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;GetSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="getvschema">GetVSchema</h3>
+
+<p>Displays the VTGate routing schema.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetVSchema &lt;keyspace&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;GetVSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="rebuildvschemagraph">RebuildVSchemaGraph</h3>
+
+<p>Rebuilds the cell-specific SrvVSchema from the global VSchema objects in the provided cells (or all cells if none provided).</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RebuildVSchemaGraph [-cells=c1,c2,...]</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells to look for tablets</td>
+</tr>
+</tbody></table>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li><code>&lt;RebuildVSchemaGraph&gt;</code> doesn&#39;t take any arguments This error occurs if the command is not called with exactly 0 arguments.</li>
+</ul>
+
+<h3 id="reloadschema">ReloadSchema</h3>
+
+<p>Reloads the schema on a remote tablet.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ReloadSchema &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;ReloadSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="reloadschemakeyspace">ReloadSchemaKeyspace</h3>
+
+<p>Reloads the schema on all the tablets in a keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ReloadSchemaKeyspace [-concurrency=10] [-include_master=false] &lt;keyspace&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">concurrency</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">How many tablets to reload in parallel</td>
+</tr>
+<tr>
+<td style="text-align: left">include_master</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Include the master tablet(s)</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace&gt;</code> argument is required for the <code>&lt;ReloadSchemaKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="reloadschemashard">ReloadSchemaShard</h3>
+
+<p>Reloads the schema on all the tablets in a shard.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ReloadSchemaShard [-concurrency=10] [-include_master=false] &lt;keyspace/shard&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">concurrency</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">How many tablets to reload in parallel</td>
+</tr>
+<tr>
+<td style="text-align: left">include_master</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Include the master tablet</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ReloadSchemaShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="validatepermissionskeyspace">ValidatePermissionsKeyspace</h3>
+
+<p>Validates that the master permissions from shard 0 match those of all of the other tablets in the keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ValidatePermissionsKeyspace &lt;keyspace name&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;ValidatePermissionsKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="validatepermissionsshard">ValidatePermissionsShard</h3>
+
+<p>Validates that the master permissions match all the slaves.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ValidatePermissionsShard &lt;keyspace/shard&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ValidatePermissionsShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="validateschemakeyspace">ValidateSchemaKeyspace</h3>
+
+<p>Validates that the master schema from shard 0 matches the schema on all of the other tablets in the keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ValidateSchemaKeyspace [-exclude_tables=''] [-include-views] &lt;keyspace name&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">exclude_tables</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/</td>
+</tr>
+<tr>
+<td style="text-align: left">include-views</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Includes views in the validation</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;ValidateSchemaKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="validateschemashard">ValidateSchemaShard</h3>
+
+<p>Validates that the master schema matches all of the slaves.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ValidateSchemaShard [-exclude_tables=''] [-include-views] &lt;keyspace/shard&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">exclude_tables</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/</td>
+</tr>
+<tr>
+<td style="text-align: left">include-views</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Includes views in the validation</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ValidateSchemaShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="validateversionkeyspace">ValidateVersionKeyspace</h3>
+
+<p>Validates that the master version from shard 0 matches all of the other tablets in the keyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ValidateVersionKeyspace &lt;keyspace name&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace name&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace name&gt;</code> argument is required for the <code>&lt;ValidateVersionKeyspace&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="validateversionshard">ValidateVersionShard</h3>
+
+<p>Validates that the master version matches all of the slaves.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ValidateVersionShard &lt;keyspace/shard&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ValidateVersionShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h2 id="serving-graph">Serving Graph</h2>
+
+<ul>
+<li><a href="#getsrvkeyspace">GetSrvKeyspace</a></li>
+<li><a href="#getsrvkeyspacenames">GetSrvKeyspaceNames</a></li>
+<li><a href="#getsrvvschema">GetSrvVSchema</a></li>
+</ul>
+
+<h3 id="getsrvkeyspace">GetSrvKeyspace</h3>
+
+<p>Outputs a JSON structure that contains information about the SrvKeyspace.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetSrvKeyspace &lt;cell&gt; &lt;keyspace&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+<li><code>&lt;keyspace&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> and <code>&lt;keyspace&gt;</code> arguments are required for the <code>&lt;GetSrvKeyspace&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="getsrvkeyspacenames">GetSrvKeyspaceNames</h3>
+
+<p>Outputs a list of keyspace names.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetSrvKeyspaceNames &lt;cell&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;GetSrvKeyspaceNames&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="getsrvvschema">GetSrvVSchema</h3>
+
+<p>Outputs a JSON structure that contains information about the SrvVSchema.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetSrvVSchema &lt;cell&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> argument is required for the <code>&lt;GetSrvVSchema&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h2 id="shards">Shards</h2>
+
+<ul>
+<li><a href="#createshard">CreateShard</a></li>
+<li><a href="#deleteshard">DeleteShard</a></li>
+<li><a href="#emergencyreparentshard">EmergencyReparentShard</a></li>
+<li><a href="#getshard">GetShard</a></li>
+<li><a href="#initshardmaster">InitShardMaster</a></li>
+<li><a href="#listbackups">ListBackups</a></li>
+<li><a href="#listshardtablets">ListShardTablets</a></li>
+<li><a href="#plannedreparentshard">PlannedReparentShard</a></li>
+<li><a href="#removebackup">RemoveBackup</a></li>
+<li><a href="#removeshardcell">RemoveShardCell</a></li>
+<li><a href="#setshardservedtypes">SetShardServedTypes</a></li>
+<li><a href="#setshardtabletcontrol">SetShardTabletControl</a></li>
+<li><a href="#shardreplicationfix">ShardReplicationFix</a></li>
+<li><a href="#shardreplicationpositions">ShardReplicationPositions</a></li>
+<li><a href="#sourceshardadd">SourceShardAdd</a></li>
+<li><a href="#sourcesharddelete">SourceShardDelete</a></li>
+<li><a href="#tabletexternallyreparented">TabletExternallyReparented</a></li>
+<li><a href="#validateshard">ValidateShard</a></li>
+<li><a href="#waitforfilteredreplication">WaitForFilteredReplication</a></li>
+</ul>
+
+<h3 id="createshard">CreateShard</h3>
+
+<p>Creates the specified shard.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">CreateShard [-force] [-parent] &lt;keyspace/shard&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">force</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Proceeds with the command even if the keyspace already exists</td>
+</tr>
+<tr>
+<td style="text-align: left">parent</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Creates the parent keyspace if it doesn&#39;t already exist</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;CreateShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="deleteshard">DeleteShard</h3>
+
+<p>Deletes the specified shard(s). In recursive mode, it also deletes all tablets belonging to the shard. Otherwise, there must be no tablets left in the shard.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">DeleteShard [-recursive] [-even_if_serving] &lt;keyspace/shard&gt; ...</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">even_if_serving</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Remove the shard even if it is serving. Use with caution.</td>
+</tr>
+<tr>
+<td style="text-align: left">recursive</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Also delete all tablets belonging to the shard.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>. To specify multiple values for this argument, separate individual values with a space.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument must be used to identify at least one keyspace and shard when calling the <code>&lt;DeleteShard&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
+</ul>
+
+<h3 id="emergencyreparentshard">EmergencyReparentShard</h3>
+
+<p>Reparents the shard to the new master. Assumes the old master is dead and not responsding.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">EmergencyReparentShard -keyspace_shard=&lt;keyspace/shard&gt; -new_master=&lt;tablet alias&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">keyspace_shard</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">keyspace/shard of the shard that needs to be reparented</td>
+</tr>
+<tr>
+<td style="text-align: left">new_master</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">alias of a tablet that should be the new master</td>
+</tr>
+<tr>
+<td style="text-align: left">wait_slave_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">time to wait for slaves to catch up in reparenting</td>
+</tr>
+</tbody></table>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;EmergencyReparentShard&gt;</code> requires -keyspace_shard=<code>&lt;keyspace/shard&gt;</code> -new_master=<code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly 0 arguments.</li>
+<li>cannot use legacy syntax and flag -<code>&lt;new_master&gt;</code> for action <code>&lt;EmergencyReparentShard&gt;</code> at the same time</li>
+</ul>
+
+<h3 id="getshard">GetShard</h3>
+
+<p>Outputs a JSON structure that contains information about the Shard.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetShard &lt;keyspace/shard&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;GetShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="initshardmaster">InitShardMaster</h3>
+
+<p>Sets the initial master for a shard. Will make all other tablets in the shard slaves of the provided master. WARNING: this could cause data loss on an already replicating shard. PlannedReparentShard or EmergencyReparentShard should be used instead.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">InitShardMaster [-force] [-wait_slave_timeout=&lt;duration&gt;] &lt;keyspace/shard&gt; &lt;tablet alias&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">force</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">will force the reparent even if the provided tablet is not a master or the shard master</td>
+</tr>
+<tr>
+<td style="text-align: left">wait_slave_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">time to wait for slaves to catch up in reparenting</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;InitShardMaster&gt;</code> requires <code>&lt;keyspace/shard&gt;</code> <code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="listbackups">ListBackups</h3>
+
+<p>Lists all the backups for a shard.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ListBackups &lt;keyspace/shard&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;ListBackups&gt;</code> requires <code>&lt;keyspace/shard&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="listshardtablets">ListShardTablets</h3>
+
+<p>Lists all tablets in the specified shard.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ListShardTablets &lt;keyspace/shard&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ListShardTablets&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="plannedreparentshard">PlannedReparentShard</h3>
+
+<p>Reparents the shard to the new master, or away from old master. Both old and new master need to be up and running.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">PlannedReparentShard -keyspace_shard=&lt;keyspace/shard&gt; [-new_master=&lt;tablet alias&gt;] [-avoid_master=&lt;tablet alias&gt;]</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">avoid_master</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">alias of a tablet that should not be the master, i.e. reparent to any other tablet if this one is the master</td>
+</tr>
+<tr>
+<td style="text-align: left">keyspace_shard</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">keyspace/shard of the shard that needs to be reparented</td>
+</tr>
+<tr>
+<td style="text-align: left">new_master</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">alias of a tablet that should be the new master</td>
+</tr>
+<tr>
+<td style="text-align: left">wait_slave_timeout</td>
+<td style="text-align: left">Duration</td>
+<td style="text-align: left">time to wait for slaves to catch up in reparenting</td>
+</tr>
+</tbody></table>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;PlannedReparentShard&gt;</code> requires -keyspace_shard=<code>&lt;keyspace/shard&gt;</code> [-new_master=<code>&lt;tablet alias&gt;</code>] [-avoid_master=<code>&lt;tablet alias&gt;</code>] This error occurs if the command is not called with exactly 0 arguments.</li>
+<li>cannot use legacy syntax and flags -<code>&lt;keyspace_shard&gt;</code> and -<code>&lt;new_master&gt;</code> for action <code>&lt;PlannedReparentShard&gt;</code> at the same time</li>
+</ul>
+
+<h3 id="removebackup">RemoveBackup</h3>
+
+<p>Removes a backup for the BackupStorage.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RemoveBackup &lt;keyspace/shard&gt; &lt;backup name&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;backup name&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;RemoveBackup&gt;</code> requires <code>&lt;keyspace/shard&gt;</code> <code>&lt;backup name&gt;</code> This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="removeshardcell">RemoveShardCell</h3>
+
+<p>Removes the cell from the shard&#39;s Cells list.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RemoveShardCell [-force] [-recursive] &lt;keyspace/shard&gt; &lt;cell&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">force</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Proceeds even if the cell&#39;s topology server cannot be reached. The assumption is that you turned down the entire cell, and just need to update the global topo data.</td>
+</tr>
+<tr>
+<td style="text-align: left">recursive</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Also delete all tablets in that cell belonging to the specified shard.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;cell&gt;</code> arguments are required for the <code>&lt;RemoveShardCell&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="setshardservedtypes">SetShardServedTypes</h3>
+
+<p>Add or remove served type to/from a shard. This is meant as an emergency function. It does not rebuild any serving graph i.e. does not run &#39;RebuildKeyspaceGraph&#39;.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">SetShardServedTypes [--cells=c1,c2,...] [--remove] &lt;keyspace/shard&gt; &lt;served tablet type&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
+</tr>
+<tr>
+<td style="text-align: left">remove</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Removes the served tablet type</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><p><code>&lt;served tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
+
+<ul>
+<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
+<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
+<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
+<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
+<li><code>master</code> &ndash; A primary copy of data</li>
+<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
+<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
+<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
+<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
+<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
+<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
+</ul></li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;served tablet type&gt;</code> arguments are both required for the <code>&lt;SetShardServedTypes&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="setshardtabletcontrol">SetShardTabletControl</h3>
+
+<p>Sets the TabletControl record for a shard and type. Only use this for an emergency fix or after a finished vertical split. The <em>MigrateServedFrom</em> and <em>MigrateServedType</em> commands set this field appropriately already. Always specify the blacklisted_tables flag for vertical splits, but never for horizontal splits.<br><br>To set the DisableQueryServiceFlag, keep &#39;blacklisted_tables&#39; empty, and set &#39;disable_query_service&#39; to true or false. Useful to fix horizontal splits gone wrong.<br><br>To change the blacklisted tables list, specify the &#39;blacklisted_tables&#39; parameter with the new list. Useful to fix tables that are being blocked after a vertical split.<br><br>To just remove the ShardTabletControl entirely, use the &#39;remove&#39; flag, useful after a vertical split is finished to remove serving restrictions.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">SetShardTabletControl [--cells=c1,c2,...] [--blacklisted_tables=t1,t2,...] [--remove] [--disable_query_service] &lt;keyspace/shard&gt; &lt;tablet type&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">blacklisted_tables</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of tables to blacklist (used for vertical split). Each is either an exact match, or a regular expression of the form &#39;/regexp/&#39;.</td>
+</tr>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells to update</td>
+</tr>
+<tr>
+<td style="text-align: left">disable_query_service</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Disables query service on the provided nodes. This flag requires &#39;blacklisted_tables&#39; and &#39;remove&#39; to be unset, otherwise it&#39;s ignored.</td>
+</tr>
+<tr>
+<td style="text-align: left">remove</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Removes cells for vertical splits.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><p><code>&lt;tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
+
+<ul>
+<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
+<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
+<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
+<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
+<li><code>master</code> &ndash; A primary copy of data</li>
+<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
+<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
+<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
+<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
+<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
+<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
+</ul></li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;tablet type&gt;</code> arguments are both required for the <code>&lt;SetShardTabletControl&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="shardreplicationfix">ShardReplicationFix</h3>
+
+<p>Walks through a ShardReplication object and fixes the first error that it encounters.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ShardReplicationFix &lt;cell&gt; &lt;keyspace/shard&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;cell&gt;</code> &ndash; Required. A cell is a location for a service. Generally, a cell resides in only one cluster. In Vitess, the terms &quot;cell&quot; and &quot;data center&quot; are interchangeable. The argument value is a string that does not contain whitespace.</li>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;cell&gt;</code> and <code>&lt;keyspace/shard&gt;</code> arguments are required for the ShardReplicationRemove command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="shardreplicationpositions">ShardReplicationPositions</h3>
+
+<p>Shows the replication status of each slave machine in the shard graph. In this case, the status refers to the replication lag between the master vttablet and the slave vttablet. In Vitess, data is always written to the master vttablet first and then replicated to all slave vttablets. Output is sorted by tablet type, then replication position. Use ctrl-C to interrupt command and see partial result if needed.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ShardReplicationPositions &lt;keyspace/shard&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ShardReplicationPositions&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="sourceshardadd">SourceShardAdd</h3>
+
+<p>Adds the SourceShard record with the provided index. This is meant as an emergency function. It does not call RefreshState for the shard master.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">SourceShardAdd [--key_range=&lt;keyrange&gt;] [--tables=&lt;table1,table2,...&gt;] &lt;keyspace/shard&gt; &lt;uid&gt; &lt;source keyspace/shard&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">key_range</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Identifies the key range to use for the SourceShard</td>
+</tr>
+<tr>
+<td style="text-align: left">tables</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of tables to replicate (used for vertical split). Each is either an exact match, or a regular expression of the form /regexp/</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><code>&lt;uid&gt;</code> &ndash; Required.</li>
+<li><code>&lt;source keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code>, <code>&lt;uid&gt;</code>, and <code>&lt;source keyspace/shard&gt;</code> arguments are all required for the <code>&lt;SourceShardAdd&gt;</code> command This error occurs if the command is not called with exactly 3 arguments.</li>
+</ul>
+
+<h3 id="sourcesharddelete">SourceShardDelete</h3>
+
+<p>Deletes the SourceShard record with the provided index. This is meant as an emergency cleanup function. It does not call RefreshState for the shard master.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">SourceShardDelete &lt;keyspace/shard&gt; &lt;uid&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+<li><code>&lt;uid&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> and <code>&lt;uid&gt;</code> arguments are both required for the <code>&lt;SourceShardDelete&gt;</code> command This error occurs if the command is not called with at least 2 arguments.</li>
+</ul>
+
+<h3 id="tabletexternallyreparented">TabletExternallyReparented</h3>
+
+<p>Changes metadata in the topology server to acknowledge a shard master change performed by an external tool. See the Reparenting guide for more information:<a href="https://github.com/youtube/vitess/blob/master/doc/Reparenting.md#external-reparents">https://github.com/youtube/vitess/blob/master/doc/Reparenting.md#external-reparents</a>.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">TabletExternallyReparented &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;TabletExternallyReparented&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="validateshard">ValidateShard</h3>
+
+<p>Validates that all nodes that are reachable from this shard are consistent.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ValidateShard [-ping-tablets] &lt;keyspace/shard&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">ping-tablets</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Indicates whether all tablets should be pinged during the validation process</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;ValidateShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="waitforfilteredreplication">WaitForFilteredReplication</h3>
+
+<p>Blocks until the specified shard has caught up with the filtered replication of its source shard.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WaitForFilteredReplication [-max_delay &lt;max_delay, default 30s&gt;] &lt;keyspace/shard&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;WaitForFilteredReplication&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h2 id="tablets">Tablets</h2>
+
+<ul>
+<li><a href="#backup">Backup</a></li>
+<li><a href="#changeslavetype">ChangeSlaveType</a></li>
+<li><a href="#deletetablet">DeleteTablet</a></li>
+<li><a href="#executefetchasdba">ExecuteFetchAsDba</a></li>
+<li><a href="#executehook">ExecuteHook</a></li>
+<li><a href="#gettablet">GetTablet</a></li>
+<li><a href="#ignorehealtherror">IgnoreHealthError</a></li>
+<li><a href="#inittablet">InitTablet</a></li>
+<li><a href="#ping">Ping</a></li>
+<li><a href="#refreshstate">RefreshState</a></li>
+<li><a href="#refreshstatebyshard">RefreshStateByShard</a></li>
+<li><a href="#reparenttablet">ReparentTablet</a></li>
+<li><a href="#restorefrombackup">RestoreFromBackup</a></li>
+<li><a href="#runhealthcheck">RunHealthCheck</a></li>
+<li><a href="#setreadonly">SetReadOnly</a></li>
+<li><a href="#setreadwrite">SetReadWrite</a></li>
+<li><a href="#sleep">Sleep</a></li>
+<li><a href="#startslave">StartSlave</a></li>
+<li><a href="#stopslave">StopSlave</a></li>
+<li><a href="#updatetabletaddrs">UpdateTabletAddrs</a></li>
+</ul>
+
+<h3 id="backup">Backup</h3>
+
+<p>Stops mysqld and uses the BackupStorage service to store a new backup. This function also remembers if the tablet was replicating so that it can restore the same state after the backup completes.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">Backup [-concurrency=4] &lt;tablet alias&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">concurrency</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">Specifies the number of compression/checksum jobs to run simultaneously</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;Backup&gt;</code> command requires the <code>&lt;tablet alias&gt;</code> argument This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="changeslavetype">ChangeSlaveType</h3>
+
+<p>Changes the db type for the specified tablet, if possible. This command is used primarily to arrange replicas, and it will not convert a master.<br><br>NOTE: This command automatically updates the serving graph.<br><br></p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ChangeSlaveType [-dry-run] &lt;tablet alias&gt; &lt;tablet type&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">dry-run</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Lists the proposed change without actually executing it</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><p><code>&lt;tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
+
+<ul>
+<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
+<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
+<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
+<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
+<li><code>master</code> &ndash; A primary copy of data</li>
+<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
+<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
+<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
+<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
+<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
+<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
+</ul></li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;db type&gt;</code> arguments are required for the <code>&lt;ChangeSlaveType&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+<li>failed reading tablet %v: %v</li>
+<li>invalid type transition %v: %v -&gt;</code> %v</li>
+</ul>
+
+<h3 id="deletetablet">DeleteTablet</h3>
+
+<p>Deletes tablet(s) from the topology.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">DeleteTablet [-allow_master] &lt;tablet alias&gt; ...</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">allow_master</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Allows for the master tablet of a shard to be deleted. Use with caution.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>. To specify multiple values for this argument, separate individual values with a space.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument must be used to specify at least one tablet when calling the <code>&lt;DeleteTablet&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
+</ul>
+
+<h3 id="executefetchasdba">ExecuteFetchAsDba</h3>
+
+<p>Runs the given SQL command as a DBA on the remote tablet.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ExecuteFetchAsDba [-max_rows=10000] [-disable_binlogs] [-json] &lt;tablet alias&gt; &lt;sql command&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">disable_binlogs</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Disables writing to binlogs during the query</td>
+</tr>
+<tr>
+<td style="text-align: left">json</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Output JSON instead of human-readable table</td>
+</tr>
+<tr>
+<td style="text-align: left">max_rows</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">Specifies the maximum number of rows to allow in reset</td>
+</tr>
+<tr>
+<td style="text-align: left">reload_schema</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Indicates whether the tablet schema will be reloaded after executing the SQL command. The default value is <code>false</code>, which indicates that the tablet schema will not be reloaded.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><code>&lt;sql command&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;sql command&gt;</code> arguments are required for the <code>&lt;ExecuteFetchAsDba&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="executehook">ExecuteHook</h3>
+
+<p>Runs the specified hook on the given tablet. A hook is a script that resides in the $VTROOT/vthook directory. You can put any script into that directory and use this command to run that script.<br><br>For this command, the param=value arguments are parameters that the command passes to the specified hook.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ExecuteHook &lt;tablet alias&gt; &lt;hook name&gt; [&lt;param1=value1&gt; &lt;param2=value2&gt; ...]</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><code>&lt;hook name&gt;</code> &ndash; Required.</li>
+<li><code>&lt;param1=value1&gt;</code> <code>&lt;param2=value2&gt;</code> . &ndash; Optional.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;hook name&gt;</code> arguments are required for the <code>&lt;ExecuteHook&gt;</code> command This error occurs if the command is not called with at least 2 arguments.</li>
+</ul>
+
+<h3 id="gettablet">GetTablet</h3>
+
+<p>Outputs a JSON structure that contains information about the Tablet.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">GetTablet &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;GetTablet&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="ignorehealtherror">IgnoreHealthError</h3>
+
+<p>Sets the regexp for health check errors to ignore on the specified tablet. The pattern has implicit ^$ anchors. Set to empty string or restart vttablet to stop ignoring anything.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">IgnoreHealthError &lt;tablet alias&gt; &lt;ignore regexp&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><code>&lt;ignore regexp&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;ignore regexp&gt;</code> arguments are required for the <code>&lt;IgnoreHealthError&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="inittablet">InitTablet</h3>
+
+<p>Initializes a tablet in the topology.<br><br></p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">InitTablet [-allow_update] [-allow_different_shard] [-allow_master_override] [-parent] [-db_name_override=&lt;db name&gt;] [-hostname=&lt;hostname&gt;] [-mysql_port=&lt;port&gt;] [-port=&lt;port&gt;] [-grpc_port=&lt;port&gt;] -keyspace=&lt;keyspace&gt; -shard=&lt;shard&gt; &lt;tablet alias&gt; &lt;tablet type&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">allow_master_override</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Use this flag to force initialization if a tablet is created as master, and a master for the keyspace/shard already exists. Use with caution.</td>
+</tr>
+<tr>
+<td style="text-align: left">allow_update</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Use this flag to force initialization if a tablet with the same name already exists. Use with caution.</td>
+</tr>
+<tr>
+<td style="text-align: left">db_name_override</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Overrides the name of the database that the vttablet uses</td>
+</tr>
+<tr>
+<td style="text-align: left">grpc_port</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">The gRPC port for the vttablet process</td>
+</tr>
+<tr>
+<td style="text-align: left">hostname</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The server on which the tablet is running</td>
+</tr>
+<tr>
+<td style="text-align: left">keyspace</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The keyspace to which this tablet belongs</td>
+</tr>
+<tr>
+<td style="text-align: left">mysql_port</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">The mysql port for the mysql daemon</td>
+</tr>
+<tr>
+<td style="text-align: left">parent</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">Creates the parent shard and keyspace if they don&#39;t yet exist</td>
+</tr>
+<tr>
+<td style="text-align: left">port</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">The main port for the vttablet process</td>
+</tr>
+<tr>
+<td style="text-align: left">shard</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The shard to which this tablet belongs</td>
+</tr>
+<tr>
+<td style="text-align: left">tags</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">A comma-separated list of key:value pairs that are used to tag the tablet</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><p><code>&lt;tablet type&gt;</code> &ndash; Required. The vttablet&#39;s role. Valid values are:</p>
+
+<ul>
+<li><code>backup</code> &ndash; A slaved copy of data that is offline to queries other than for backup purposes</li>
+<li><code>batch</code> &ndash; A slaved copy of data for OLAP load patterns (typically for MapReduce jobs)</li>
+<li><code>drained</code> &ndash; A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication.</li>
+<li><code>experimental</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting.</li>
+<li><code>master</code> &ndash; A primary copy of data</li>
+<li><code>rdonly</code> &ndash; A slaved copy of data for OLAP load patterns</li>
+<li><code>replica</code> &ndash; A slaved copy of data ready to be promoted to master</li>
+<li><code>restore</code> &ndash; A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state.</li>
+<li><code>schema_apply</code> &ndash; A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type.</li>
+<li><code>snapshot_source</code> &ndash; A slaved copy of data where mysqld is <b>not</b> running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: <pre>vtctl Snapshot -server-mode ...</pre> Use this command to exit this mode: <pre>vtctl SnapshotSourceEnd ...</pre></li>
+<li><code>spare</code> &ndash; A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet.</li>
+</ul></li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;tablet type&gt;</code> arguments are both required for the <code>&lt;InitTablet&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="ping">Ping</h3>
+
+<p>Checks that the specified tablet is awake and responding to RPCs. This command can be blocked by other in-flight operations.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">Ping &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;Ping&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="refreshstate">RefreshState</h3>
+
+<p>Reloads the tablet record on the specified tablet.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RefreshState &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;RefreshState&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="refreshstatebyshard">RefreshStateByShard</h3>
+
+<p>Runs &#39;RefreshState&#39; on all tablets in the given shard.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RefreshStateByShard [-cells=c1,c2,...] &lt;keyspace/shard&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">cells</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">Specifies a comma-separated list of cells whose tablets are included. If empty, all cells are considered.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;keyspace/shard&gt;</code> &ndash; Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitepace, while the shard is typically identified by a string in the format <code>&lt;range start&gt;-&lt;range end&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;keyspace/shard&gt;</code> argument is required for the <code>&lt;RefreshStateByShard&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="reparenttablet">ReparentTablet</h3>
+
+<p>Reparent a tablet to the current master in the shard. This only works if the current slave position matches the last known reparent action.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">ReparentTablet &lt;tablet alias&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;ReparentTablet&gt;</code> requires <code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="restorefrombackup">RestoreFromBackup</h3>
+
+<p>Stops mysqld and restores the data from the latest backup.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RestoreFromBackup &lt;tablet alias&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;RestoreFromBackup&gt;</code> command requires the <code>&lt;tablet alias&gt;</code> argument This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="runhealthcheck">RunHealthCheck</h3>
+
+<p>Runs a health check on a remote tablet.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">RunHealthCheck &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;RunHealthCheck&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+</ul>
+
+<h3 id="setreadonly">SetReadOnly</h3>
+
+<p>Sets the tablet as read-only.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">SetReadOnly &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;SetReadOnly&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>failed reading tablet %v: %v</li>
+</ul>
+
+<h3 id="setreadwrite">SetReadWrite</h3>
+
+<p>Sets the tablet as read-write.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">SetReadWrite &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;SetReadWrite&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>failed reading tablet %v: %v</li>
+</ul>
+
+<h3 id="sleep">Sleep</h3>
+
+<p>Blocks the action queue on the specified tablet for the specified amount of time. This is typically used for testing.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">Sleep &lt;tablet alias&gt; &lt;duration&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+<li><code>&lt;duration&gt;</code> &ndash; Required. The amount of time that the action queue should be blocked. The value is a string that contains a possibly signed sequence of decimal numbers, each with optional fraction and a unit suffix, such as &quot;300ms&quot; or &quot;1h45m&quot;. See the definition of the Go language&#39;s <a href="http://golang.org/pkg/time/#ParseDuration">ParseDuration</a> function for more details. Note that, in practice, the value should be a positively signed value.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> and <code>&lt;duration&gt;</code> arguments are required for the <code>&lt;Sleep&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+</ul>
+
+<h3 id="startslave">StartSlave</h3>
+
+<p>Starts replication on the specified slave.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">StartSlave &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;StartSlave&gt;</code> requires <code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
+<li>failed reading tablet %v: %v</li>
+</ul>
+
+<h3 id="stopslave">StopSlave</h3>
+
+<p>Stops replication on the specified slave.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">StopSlave &lt;tablet alias&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>action <code>&lt;StopSlave&gt;</code> requires <code>&lt;tablet alias&gt;</code> This error occurs if the command is not called with exactly one argument.</li>
+<li>failed reading tablet %v: %v</li>
+</ul>
+
+<h3 id="updatetabletaddrs">UpdateTabletAddrs</h3>
+
+<p>Updates the IP address and port numbers of a tablet.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">UpdateTabletAddrs [-hostname &lt;hostname&gt;] [-ip-addr &lt;ip addr&gt;] [-mysql-port &lt;mysql port&gt;] [-vt-port &lt;vt port&gt;] [-grpc-port &lt;grpc port&gt;] &lt;tablet alias&gt;</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">grpc-port</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">The gRPC port for the vttablet process</td>
+</tr>
+<tr>
+<td style="text-align: left">hostname</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">The fully qualified host name of the server on which the tablet is running.</td>
+</tr>
+<tr>
+<td style="text-align: left">ip-addr</td>
+<td style="text-align: left">string</td>
+<td style="text-align: left">IP address</td>
+</tr>
+<tr>
+<td style="text-align: left">mysql-port</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">The mysql port for the mysql daemon</td>
+</tr>
+<tr>
+<td style="text-align: left">vt-port</td>
+<td style="text-align: left">Int</td>
+<td style="text-align: left">The main port for the vttablet process</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;tablet alias&gt;</code> &ndash; Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;tablet alias&gt;</code> argument is required for the <code>&lt;UpdateTabletAddrs&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>malformed address: %v</li>
+</ul>
+
+<h2 id="workflows">Workflows</h2>
+
+<ul>
+<li><a href="#workflowaction">WorkflowAction</a></li>
+<li><a href="#workflowcreate">WorkflowCreate</a></li>
+<li><a href="#workflowdelete">WorkflowDelete</a></li>
+<li><a href="#workflowstart">WorkflowStart</a></li>
+<li><a href="#workflowstop">WorkflowStop</a></li>
+<li><a href="#workflowtree">WorkflowTree</a></li>
+<li><a href="#workflowwait">WorkflowWait</a></li>
+</ul>
+
+<h3 id="workflowaction">WorkflowAction</h3>
+
+<p>Sends the provided action name on the specified path.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WorkflowAction &lt;path&gt; &lt;name&gt;</pre>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;name&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;path&gt;</code> and <code>&lt;name&gt;</code> arguments are required for the <code>&lt;WorkflowAction&gt;</code> command This error occurs if the command is not called with exactly 2 arguments.</li>
+<li>no workflow.Manager registered</li>
+</ul>
+
+<h3 id="workflowcreate">WorkflowCreate</h3>
+
+<p>Creates the workflow with the provided parameters. The workflow is also started, unless -skip_start is specified.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WorkflowCreate [-skip_start] &lt;factoryName&gt; [parameters...]</pre>
+
+<h4 id="flags">Flags</h4>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Name</th>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Definition</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">skip_start</td>
+<td style="text-align: left">Boolean</td>
+<td style="text-align: left">If set, the workflow will not be started.</td>
+</tr>
+</tbody></table>
+
+<h4 id="arguments">Arguments</h4>
+
+<ul>
+<li><code>&lt;factoryName&gt;</code> &ndash; Required.</li>
+</ul>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;factoryName&gt;</code> argument is required for the <code>&lt;WorkflowCreate&gt;</code> command This error occurs if the command is not called with at least one argument.</li>
+<li>no workflow.Manager registered</li>
+</ul>
+
+<h3 id="workflowdelete">WorkflowDelete</h3>
+
+<p>Deletes the finished or not started workflow.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WorkflowDelete &lt;uuid&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;uuid&gt;</code> argument is required for the <code>&lt;WorkflowDelete&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>no workflow.Manager registered</li>
+</ul>
+
+<h3 id="workflowstart">WorkflowStart</h3>
+
+<p>Starts the workflow.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WorkflowStart &lt;uuid&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;uuid&gt;</code> argument is required for the <code>&lt;WorkflowStart&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>no workflow.Manager registered</li>
+</ul>
+
+<h3 id="workflowstop">WorkflowStop</h3>
+
+<p>Stops the workflow.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WorkflowStop &lt;uuid&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;uuid&gt;</code> argument is required for the <code>&lt;WorkflowStop&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>no workflow.Manager registered</li>
+</ul>
+
+<h3 id="workflowtree">WorkflowTree</h3>
+
+<p>Displays a JSON representation of the workflow tree.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WorkflowTree </pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;WorkflowTree&gt;</code> command takes no parameter This error occurs if the command is not called with exactly 0 arguments.</li>
+<li>no workflow.Manager registered</li>
+</ul>
+
+<h3 id="workflowwait">WorkflowWait</h3>
+
+<p>Waits for the workflow to finish.</p>
+
+<h4 id="example">Example</h4>
+
+<pre class="command-example">WorkflowWait &lt;uuid&gt;</pre>
+
+<h4 id="errors">Errors</h4>
+
+<ul>
+<li>the <code>&lt;uuid&gt;</code> argument is required for the <code>&lt;WorkflowWait&gt;</code> command This error occurs if the command is not called with exactly one argument.</li>
+<li>no workflow.Manager registered</li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/resources/presentations.html b/docs/resources/presentations.html
index 8789397f933..503c98dc1bf 100644
--- a/docs/resources/presentations.html
+++ b/docs/resources/presentations.html
@@ -1,399 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Presentations and Videos</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Presentations and Videos"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Presentations and Videos</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h2 id="percona-live-2016">Percona Live 2016</h2>
-
-<p><a href="https://github.com/sougou">Sugu</a> and <a href="https://github.com/enisoc">Anthony</a>
-showed what it looks like to use Vitess now that
-<a href="http://vitess.io/overview/concepts.html#keyspace-id">Keyspace IDs</a> can be
-completely hidden from the application. They gave a live demo of
-<a href="http://vitess.io/user-guide/sharding-kubernetes.html">resharding the Guestbook sample app</a>,
-which now knows nothing about shards, and explained how new features in VTGate
-make all of this possible.</p>
-
-<iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/percona-2016.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
-
-<div style="text-align: right; width: 100%; margin-bottom:20px"><a href="http://vitess.io/resources/percona-2016.pdf">download slides</a></div>
-
-<h2 id="coreos-meetup-january-2016">CoreOS Meetup, January 2016</h2>
-
-<p>Vitess team member <a href="https://github.com/enisoc">Anthony Yeh</a>&#39;s talk at
-the <a href="http://www.meetup.com/coreos/events/228233948/">January 2016 CoreOS Meetup</a>
-discussed challenges and techniques for running distributed databases
-within Kubernetes, followed by a deep dive into the design trade-offs
-of the <a href="https://github.com/youtube/vitess/tree/master/examples/kubernetes">Vitess on Kubernetes</a>
-deployment templates.</p>
-
-<iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/coreos-meetup-2016-01-27.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
-
-<div style="text-align: right; width: 100%; margin-bottom:20px"><a href="http://vitess.io/resources/coreos-meetup-2016-01-27.pdf">download slides</a></div>
-
-<h2 id="oracle-openworld-2015">Oracle OpenWorld 2015</h2>
-
-<p>Vitess team member <a href="https://github.com/enisoc">Anthony Yeh</a>&#39;s talk at
-Oracle OpenWorld 2015 focused on
-what the <a href="http://cncf.io">Cloud Native Computing</a> paradigm means when
-applied to MySQL in the cloud. The talk also included a deep dive into
-<a href="http://vitess.io/user-guide/sharding.html#resharding">transparent, live resharding</a>, one of the key
-features of Vitess that makes it well-adapted for a Cloud Native environment.</p>
-
-<iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/openworld-2015-vitess.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
-
-<div style="text-align: right; width: 100%; margin-bottom:20px"><a href="http://vitess.io/resources/openworld-2015-vitess.pdf">download slides</a></div>
-
-<h2 id="percona-live-2015">Percona Live 2015</h2>
-
-<p>Vitess team member <a href="https://github.com/enisoc">Anthony Yeh</a>&#39;s talk at
-Percona Live 2015 provided an overview of Vitess as well as an explanation
-of how Vitess has evolved to live in a containerized world with
-Kubernetes and Docker.</p>
-
-<iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/percona-2015-vitess-and-kubernetes.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
-
-<div style="text-align: right; width: 100%; margin-bottom:20px"><a href="https://github.com/youtube/vitess/blob/master/doc/slides/Percona2015.pptx?raw=true">download slides</a></div>
-
-<h2 id="google-i-o-2014-scaling-with-go-youtube-39-s-vitess">Google I/O 2014 - Scaling with Go: YouTube&#39;s Vitess</h2>
-
-<p>In this talk, <a href="https://github.com/sougou">Sugu Sougoumarane</a>
-from the Vitess team talks about how Vitess
-solved YouTube&#39;s scalability problems as well as about tips and techniques
-used to scale with Go.<br><br></p>
-
-<iframe width="640" height="360" src="https://www.youtube.com/embed/midJ6b1LkA0" frameborder="0" allowfullscreen></iframe>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/resources/presentations/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/resources/presentations/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/resources/presentations/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/resources/presentations/"</script>
 </html>
diff --git a/docs/resources/presentations/index.html b/docs/resources/presentations/index.html
new file mode 100644
index 00000000000..bc7346635e3
--- /dev/null
+++ b/docs/resources/presentations/index.html
@@ -0,0 +1,408 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Presentations and Videos | Vitess</title>
+<meta property="og:title" content="Presentations and Videos" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Slides and videos from presentations about Vitess." />
+<meta property="og:description" content="Slides and videos from presentations about Vitess." />
+<link rel="canonical" href="http://vitess.io/resources/presentations/" />
+<meta property="og:url" content="http://vitess.io/resources/presentations/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Slides and videos from presentations about Vitess.","url":"http://vitess.io/resources/presentations/","headline":"Presentations and Videos","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Presentations and Videos</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h2 id="percona-live-2016">Percona Live 2016</h2>
+
+<p><a href="https://github.com/sougou">Sugu</a> and <a href="https://github.com/enisoc">Anthony</a>
+showed what it looks like to use Vitess now that
+<a href="/overview/concepts/#keyspace-id">Keyspace IDs</a> can be
+completely hidden from the application. They gave a live demo of
+<a href="/user-guide/sharding-kubernetes/">resharding the Guestbook sample app</a>,
+which now knows nothing about shards, and explained how new features in VTGate
+make all of this possible.</p>
+
+<iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/percona-2016.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
+
+<div style="text-align: right; width: 100%; margin-bottom:20px"><a href="http://vitess.io/resources/percona-2016.pdf">download slides</a></div>
+
+<h2 id="coreos-meetup-january-2016">CoreOS Meetup, January 2016</h2>
+
+<p>Vitess team member <a href="https://github.com/enisoc">Anthony Yeh</a>&#39;s talk at
+the <a href="http://www.meetup.com/coreos/events/228233948/">January 2016 CoreOS Meetup</a>
+discussed challenges and techniques for running distributed databases
+within Kubernetes, followed by a deep dive into the design trade-offs
+of the <a href="https://github.com/youtube/vitess/tree/master/examples/kubernetes">Vitess on Kubernetes</a>
+deployment templates.</p>
+
+<iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/coreos-meetup-2016-01-27.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
+
+<div style="text-align: right; width: 100%; margin-bottom:20px"><a href="http://vitess.io/resources/coreos-meetup-2016-01-27.pdf">download slides</a></div>
+
+<h2 id="oracle-openworld-2015">Oracle OpenWorld 2015</h2>
+
+<p>Vitess team member <a href="https://github.com/enisoc">Anthony Yeh</a>&#39;s talk at
+Oracle OpenWorld 2015 focused on
+what the <a href="http://cncf.io">Cloud Native Computing</a> paradigm means when
+applied to MySQL in the cloud. The talk also included a deep dive into
+<a href="/user-guide/sharding/#resharding">transparent, live resharding</a>, one of the key
+features of Vitess that makes it well-adapted for a Cloud Native environment.</p>
+
+<iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/openworld-2015-vitess.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
+
+<div style="text-align: right; width: 100%; margin-bottom:20px"><a href="http://vitess.io/resources/openworld-2015-vitess.pdf">download slides</a></div>
+
+<h2 id="percona-live-2015">Percona Live 2015</h2>
+
+<p>Vitess team member <a href="https://github.com/enisoc">Anthony Yeh</a>&#39;s talk at
+Percona Live 2015 provided an overview of Vitess as well as an explanation
+of how Vitess has evolved to live in a containerized world with
+Kubernetes and Docker.</p>
+
+<iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/percona-2015-vitess-and-kubernetes.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
+
+<div style="text-align: right; width: 100%; margin-bottom:20px"><a href="https://github.com/youtube/vitess/blob/master/doc/slides/Percona2015.pptx?raw=true">download slides</a></div>
+
+<h2 id="google-i-o-2014-scaling-with-go-youtube-39-s-vitess">Google I/O 2014 - Scaling with Go: YouTube&#39;s Vitess</h2>
+
+<p>In this talk, <a href="https://github.com/sougou">Sugu Sougoumarane</a>
+from the Vitess team talks about how Vitess
+solved YouTube&#39;s scalability problems as well as about tips and techniques
+used to scale with Go.<br><br></p>
+
+<iframe width="640" height="360" src="https://www.youtube.com/embed/midJ6b1LkA0" frameborder="0" allowfullscreen></iframe>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/resources/roadmap.html b/docs/resources/roadmap.html
index 29aae8e8b4e..98ef25e5947 100644
--- a/docs/resources/roadmap.html
+++ b/docs/resources/roadmap.html
@@ -1,461 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Vitess Roadmap</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Vitess Roadmap"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Vitess Roadmap</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>Vitess is an active open source project.  Here is a list of recent and upcoming
-features the team is focused on: Check with us on
-our <a href="https://groups.google.com/forum/#!forum/vitess">forums</a> for more
-information.</p>
-
-<h2 id="vitess-before-2-0-ga">Vitess before 2.0 GA</h2>
-
-<p>Vitess has been used internally by YouTube for a few years now, but the first
-public versions lacked polish and documentation. Version 1.0 was mostly an
-internal release.</p>
-
-<h2 id="vitess-2-0-ga">Vitess 2.0 GA</h2>
-
-<p><a href="https://github.com/youtube/vitess/releases/tag/v2.0.0">Vitess 2.0 GA</a> was
-created on July 11, 2016. It was the first major public release.</p>
-
-<p>It contains all the core features of the Vitess product:</p>
-
-<ul>
-<li><p>Advanced data access:</p>
-
-<ul>
-<li>Automatic query routing to actively serving instances.</li>
-<li>Scalability through sharding, with transparent access to sharded data,
-without need for proprietary API.</li>
-<li>Map-Reduce support for data warehousing queries.</li>
-<li>Limit the negative impact of bad queries.</li>
-</ul></li>
-<li><p>Advanced manageability features:</p>
-
-<ul>
-<li>Orchestrator integration, auto-reparent on master failure.</li>
-<li>Out-of-the-box support for Kubernetes</li>
-<li>No-downtime dynamic resharding.</li>
-<li>Expose data for advanced monitoring and bad query detection.</li>
-</ul></li>
-</ul>
-
-<h2 id="vitess-2-1">Vitess 2.1</h2>
-
-<p>Vitess 2.1 is actively being worked on. Apart from the multiple small changes
-we&#39;ve been making to address a number of small issues, we are adding the
-following core features:</p>
-
-<ul>
-<li><p>Support for distributed transactions, using 2 phase commit.</p></li>
-<li><p>Resharding workflow improvements, to increase manageability of the process.</p></li>
-<li><p>Online schema swap, to apply complex schema changes without any downtime.</p></li>
-<li><p>New dynamic UI (vtctld), rewritten from scratch in Angular 2. We will still
-have the old UI in Vitess 2.1 as a fallback, but it will be removed in Vitess
-2.2.</p></li>
-<li><p>Update Stream functionality, for applications to subscribe to a change stream
-(for cache invalidation, for instance).</p></li>
-<li><p>Improved Map-Reduce support, for tables with non-uniform distributions.</p></li>
-<li><p>Increase large installation scalability with two-layer vtgate pools (l2vtgate,
-applicable to 100+ shard installations).</p></li>
-<li><p>Better Kubernetes support (Helm support, better scripts, ...).</p></li>
-<li><p>New implementations of the topology services for Zookeeper (<code class="prettyprint">zk2</code>) and etcd
-(<code class="prettyprint">etcd2</code>).  In Vitess 2.1 they will become the recommended implementations and
-the old <code class="prettyprint">zookeeper</code> and <code class="prettyprint">etcd</code> will be deprecated. In Vitess 2.2 only the new
-<code class="prettyprint">zk2</code> and <code class="prettyprint">etcd2</code> implementations will remain, so please migrate after upgrade
-to Vitess 2.1.</p></li>
-<li><p>Added support for <a href="http://consul.io">Consul</a> topology service client.</p></li>
-<li><p>Initial version of the Master Buffering feature. It allows for buffering
-master traffic while a failover is in progress, and trade downtime with
-extra latency.</p></li>
-</ul>
-
-<p>We already cut
-the
-<a href="https://github.com/youtube/vitess/releases/tag/v2.1.0-alpha.1">2.1.0-alpha.1 release</a>,
-and we are finalizing the last details at the moment. Release ETA is around
-beginning of 2017.</p>
-
-<h2 id="vitess-moving-forward">Vitess Moving Forward</h2>
-
-<p>The following list contains areas where we want to focus next, after the current
-set of changes. Let us know if one of these areas is of particular interest to
-your application!</p>
-
-<h3 id="data-access">Data Access</h3>
-
-<ul>
-<li><p>Additional support for cross-shard constructs (IN clause, ordering and
-filtering, ...).</p></li>
-<li><p>ExecuteBatch improvements (to increase performance of bulk imports for
-instance).</p></li>
-<li><p>Multi-value inserts (across shards or not).</p></li>
-</ul>
-
-<h3 id="manageability">Manageability</h3>
-
-<ul>
-<li><p>Better support for MySQL DDL constructs.</p></li>
-<li><p>Support for MySQL 8.0.</p></li>
-<li><p>Additional Kubernetes integration.</p></li>
-<li><p>Include resharding workflows in the control panel UI (vtctld).</p></li>
-<li><p>Support vertical splits to an existing keyspace, so any table can be moved
-around to any keyspace. Only for unsharded keyspaces, at first.</p></li>
-<li><p>Out-of-the-box integration with Promotheus for monitoring.</p></li>
-</ul>
-
-<h3 id="scaling">Scaling</h3>
-
-<ul>
-<li>Better resource utilization / less CPU usage.</li>
-</ul>
-
-<h2 id="future-work">Future Work</h2>
-
-<p>We are considering integration/implementation of the following technologies in
-our roadmap.  For specific features, reach out to us to discuss opportunities to
-collaborate or prioritize some of the work:</p>
-
-<ul>
-<li><p>Integration with Mesos and DC/OS.</p></li>
-<li><p>Integration with Docker Swarm.</p></li>
-<li><p>Improved support for row-based replication (for Update Stream for instance).</p></li>
-<li><p>Better integration with Apache Spark (native instead of relying on Hadoop
-InputSource).</p></li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/resources/roadmap/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/resources/roadmap/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/resources/roadmap/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/resources/roadmap/"</script>
 </html>
diff --git a/docs/resources/roadmap/index.html b/docs/resources/roadmap/index.html
new file mode 100644
index 00000000000..65a94ad5aba
--- /dev/null
+++ b/docs/resources/roadmap/index.html
@@ -0,0 +1,470 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Vitess Roadmap | Vitess</title>
+<meta property="og:title" content="Vitess Roadmap" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Current version, what we are working on, what&#39;s planned." />
+<meta property="og:description" content="Current version, what we are working on, what&#39;s planned." />
+<link rel="canonical" href="http://vitess.io/resources/roadmap/" />
+<meta property="og:url" content="http://vitess.io/resources/roadmap/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Current version, what we are working on, what&#39;s planned.","url":"http://vitess.io/resources/roadmap/","headline":"Vitess Roadmap","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Vitess Roadmap</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>Vitess is an active open source project.  Here is a list of recent and upcoming
+features the team is focused on: Check with us on
+our <a href="https://groups.google.com/forum/#!forum/vitess">forums</a> for more
+information.</p>
+
+<h2 id="vitess-before-2-0-ga">Vitess before 2.0 GA</h2>
+
+<p>Vitess has been used internally by YouTube for a few years now, but the first
+public versions lacked polish and documentation. Version 1.0 was mostly an
+internal release.</p>
+
+<h2 id="vitess-2-0-ga">Vitess 2.0 GA</h2>
+
+<p><a href="https://github.com/youtube/vitess/releases/tag/v2.0.0">Vitess 2.0 GA</a> was
+created on July 11, 2016. It was the first major public release.</p>
+
+<p>It contains all the core features of the Vitess product:</p>
+
+<ul>
+<li><p>Advanced data access:</p>
+
+<ul>
+<li>Automatic query routing to actively serving instances.</li>
+<li>Scalability through sharding, with transparent access to sharded data,
+without need for proprietary API.</li>
+<li>Map-Reduce support for data warehousing queries.</li>
+<li>Limit the negative impact of bad queries.</li>
+</ul></li>
+<li><p>Advanced manageability features:</p>
+
+<ul>
+<li>Orchestrator integration, auto-reparent on master failure.</li>
+<li>Out-of-the-box support for Kubernetes</li>
+<li>No-downtime dynamic resharding.</li>
+<li>Expose data for advanced monitoring and bad query detection.</li>
+</ul></li>
+</ul>
+
+<h2 id="vitess-2-1">Vitess 2.1</h2>
+
+<p>Vitess 2.1 is actively being worked on. Apart from the multiple small changes
+we&#39;ve been making to address a number of small issues, we are adding the
+following core features:</p>
+
+<ul>
+<li><p>Support for distributed transactions, using 2 phase commit.</p></li>
+<li><p>Resharding workflow improvements, to increase manageability of the process.</p></li>
+<li><p>Online schema swap, to apply complex schema changes without any downtime.</p></li>
+<li><p>New dynamic UI (vtctld), rewritten from scratch in Angular 2. We will still
+have the old UI in Vitess 2.1 as a fallback, but it will be removed in Vitess
+2.2.</p></li>
+<li><p>Update Stream functionality, for applications to subscribe to a change stream
+(for cache invalidation, for instance).</p></li>
+<li><p>Improved Map-Reduce support, for tables with non-uniform distributions.</p></li>
+<li><p>Increase large installation scalability with two-layer vtgate pools (l2vtgate,
+applicable to 100+ shard installations).</p></li>
+<li><p>Better Kubernetes support (Helm support, better scripts, ...).</p></li>
+<li><p>New implementations of the topology services for Zookeeper (<code class="prettyprint">zk2</code>) and etcd
+(<code class="prettyprint">etcd2</code>).  In Vitess 2.1 they will become the recommended implementations and
+the old <code class="prettyprint">zookeeper</code> and <code class="prettyprint">etcd</code> will be deprecated. In Vitess 2.2 only the new
+<code class="prettyprint">zk2</code> and <code class="prettyprint">etcd2</code> implementations will remain, so please migrate after upgrade
+to Vitess 2.1.</p></li>
+<li><p>Added support for <a href="http://consul.io">Consul</a> topology service client.</p></li>
+<li><p>Initial version of the Master Buffering feature. It allows for buffering
+master traffic while a failover is in progress, and trade downtime with
+extra latency.</p></li>
+</ul>
+
+<p>We already cut
+the
+<a href="https://github.com/youtube/vitess/releases/tag/v2.1.0-alpha.1">2.1.0-alpha.1 release</a>,
+and we are finalizing the last details at the moment. Release ETA is around
+beginning of 2017.</p>
+
+<h2 id="vitess-moving-forward">Vitess Moving Forward</h2>
+
+<p>The following list contains areas where we want to focus next, after the current
+set of changes. Let us know if one of these areas is of particular interest to
+your application!</p>
+
+<h3 id="data-access">Data Access</h3>
+
+<ul>
+<li><p>Additional support for cross-shard constructs (IN clause, ordering and
+filtering, ...).</p></li>
+<li><p>ExecuteBatch improvements (to increase performance of bulk imports for
+instance).</p></li>
+<li><p>Multi-value inserts (across shards or not).</p></li>
+</ul>
+
+<h3 id="manageability">Manageability</h3>
+
+<ul>
+<li><p>Better support for MySQL DDL constructs.</p></li>
+<li><p>Support for MySQL 8.0.</p></li>
+<li><p>Additional Kubernetes integration.</p></li>
+<li><p>Include resharding workflows in the control panel UI (vtctld).</p></li>
+<li><p>Support vertical splits to an existing keyspace, so any table can be moved
+around to any keyspace. Only for unsharded keyspaces, at first.</p></li>
+<li><p>Out-of-the-box integration with Promotheus for monitoring.</p></li>
+</ul>
+
+<h3 id="scaling">Scaling</h3>
+
+<ul>
+<li>Better resource utilization / less CPU usage.</li>
+</ul>
+
+<h2 id="future-work">Future Work</h2>
+
+<p>We are considering integration/implementation of the following technologies in
+our roadmap.  For specific features, reach out to us to discuss opportunities to
+collaborate or prioritize some of the work:</p>
+
+<ul>
+<li><p>Integration with Mesos and DC/OS.</p></li>
+<li><p>Integration with Docker Swarm.</p></li>
+<li><p>Improved support for row-based replication (for Update Stream for instance).</p></li>
+<li><p>Better integration with Apache Spark (native instead of relying on Hadoop
+InputSource).</p></li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/robots.txt b/docs/robots.txt
new file mode 100644
index 00000000000..6166b4b0476
--- /dev/null
+++ b/docs/robots.txt
@@ -0,0 +1 @@
+Sitemap: http://vitess.io/sitemap.xml
diff --git a/docs/search/index.html b/docs/search/index.html
index 96a9cd0c999..f42bbaea1da 100644
--- a/docs/search/index.html
+++ b/docs/search/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Search</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Search"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Search | Vitess</title>
+<meta property="og:title" content="Search" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/search/" />
+<meta property="og:url" content="http://vitess.io/search/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/search/","headline":"Search","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Search</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
diff --git a/docs/sitemap.xml b/docs/sitemap.xml
index 954e01a9952..e1c8094a40b 100644
--- a/docs/sitemap.xml
+++ b/docs/sitemap.xml
@@ -1,141 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url>
-    <loc>http://vitess.io/user-guide/backup-and-restore.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/client-libraries.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/contributing/code-reviews.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/overview/concepts.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/getting-started/docker-build.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/contributing/github-workflow.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/horizontal-sharding-workflow.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/horizontal-sharding.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/internal/</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/overview/</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/about/</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/terms/</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/search/</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/getting-started/</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/contributing/</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/introduction.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/launching.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/getting-started/local-instance.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/mysql-server-protocol.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/resources/presentations.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/production-planning.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/internal/publish-website.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/internal/release-instructions.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/reparenting.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/resources/roadmap.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/row-based-replication.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/scalability-philosophy.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/overview/scaling-mysql.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/schema-management.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/schema-swap.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/server-configuration.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/sharding-kubernetes-workflow.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/sharding-kubernetes.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/sharding.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/topology-service.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/transport-security-model.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/troubleshooting.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/twopc.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/update-stream.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/upgrading.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/reference/vitess-api.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/vitess-replication.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/vitess-sequences.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/user-guide/vschema.html</loc>
-  </url>
-  <url>
-    <loc>http://vitess.io/reference/vtctl.html</loc>
-  </url>
+<url>
+<loc>http://vitess.io/user-guide/backup-and-restore/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/client-libraries/</loc>
+</url>
+<url>
+<loc>http://vitess.io/contributing/code-reviews/</loc>
+</url>
+<url>
+<loc>http://vitess.io/overview/concepts/</loc>
+</url>
+<url>
+<loc>http://vitess.io/getting-started/docker-build/</loc>
+</url>
+<url>
+<loc>http://vitess.io/contributing/github-workflow/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/horizontal-sharding-workflow/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/horizontal-sharding/</loc>
+</url>
+<url>
+<loc>http://vitess.io/internal/</loc>
+</url>
+<url>
+<loc>http://vitess.io/overview/</loc>
+</url>
+<url>
+<loc>http://vitess.io/terms/</loc>
+</url>
+<url>
+<loc>http://vitess.io/search/</loc>
+</url>
+<url>
+<loc>http://vitess.io/getting-started/</loc>
+</url>
+<url>
+<loc>http://vitess.io/contributing/</loc>
+</url>
+<url>
+<loc>http://vitess.io/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/introduction/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/launching/</loc>
+</url>
+<url>
+<loc>http://vitess.io/getting-started/local-instance/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/mysql-server-protocol/</loc>
+</url>
+<url>
+<loc>http://vitess.io/resources/presentations/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/production-planning/</loc>
+</url>
+<url>
+<loc>http://vitess.io/internal/publish-website/</loc>
+</url>
+<url>
+<loc>http://vitess.io/internal/release-instructions/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/reparenting/</loc>
+</url>
+<url>
+<loc>http://vitess.io/resources/roadmap/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/row-based-replication/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/scalability-philosophy/</loc>
+</url>
+<url>
+<loc>http://vitess.io/overview/scaling-mysql/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/schema-management/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/schema-swap/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/server-configuration/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/sharding-kubernetes-workflow/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/sharding-kubernetes/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/sharding/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/topology-service/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/transport-security-model/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/troubleshooting/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/twopc/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/update-stream/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/upgrading/</loc>
+</url>
+<url>
+<loc>http://vitess.io/reference/vitess-api/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/vitess-replication/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/vitess-sequences/</loc>
+</url>
+<url>
+<loc>http://vitess.io/user-guide/vschema/</loc>
+</url>
+<url>
+<loc>http://vitess.io/reference/vtctl/</loc>
+</url>
+<url>
+<loc>http://vitess.io/resources/coreos-meetup-2016-01-27.pdf</loc>
+<lastmod>2016-11-30T19:42:18-08:00</lastmod>
+</url>
+<url>
+<loc>http://vitess.io/resources/openworld-2015-vitess.pdf</loc>
+<lastmod>2016-11-30T19:42:18-08:00</lastmod>
+</url>
+<url>
+<loc>http://vitess.io/resources/percona-2015-vitess-and-kubernetes.pdf</loc>
+<lastmod>2016-11-05T18:17:07-07:00</lastmod>
+</url>
+<url>
+<loc>http://vitess.io/resources/percona-2016.pdf</loc>
+<lastmod>2016-11-30T19:42:18-08:00</lastmod>
+</url>
+<url>
+<loc>http://vitess.io/resources/vitess-2014.pdf</loc>
+<lastmod>2016-11-05T18:17:07-07:00</lastmod>
+</url>
 </urlset>
diff --git a/docs/terms/index.html b/docs/terms/index.html
index 65c7a41174a..4d62a22bffc 100644
--- a/docs/terms/index.html
+++ b/docs/terms/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Terms & Conditions</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Terms & Conditions"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Terms &amp; Conditions | Vitess</title>
+<meta property="og:title" content="Terms &amp; Conditions" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Terms &amp; conditions, privacy policy, license, and other legal stuff you won’t read." />
+<meta property="og:description" content="Terms &amp; conditions, privacy policy, license, and other legal stuff you won’t read." />
+<link rel="canonical" href="http://vitess.io/terms/" />
+<meta property="og:url" content="http://vitess.io/terms/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Terms &amp; conditions, privacy policy, license, and other legal stuff you won’t read.","url":"http://vitess.io/terms/","headline":"Terms &amp; Conditions","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
diff --git a/docs/user-guide/backup-and-restore.html b/docs/user-guide/backup-and-restore/index.html
similarity index 74%
rename from docs/user-guide/backup-and-restore.html
rename to docs/user-guide/backup-and-restore/index.html
index 462edb179ef..6dd0c34abce 100644
--- a/docs/user-guide/backup-and-restore.html
+++ b/docs/user-guide/backup-and-restore/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Backing Up Data</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Backing Up Data"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Backing Up Data | Vitess</title>
+<meta property="og:title" content="Backing Up Data" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/backup-and-restore/" />
+<meta property="og:url" content="http://vitess.io/user-guide/backup-and-restore/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/backup-and-restore/","headline":"Backing Up Data","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Backing Up Data</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -433,7 +442,7 @@ <h3 id="authentication">Authentication</h3>
 the <a href="https://cloud.google.com/compute/docs/authentication#using">scope</a> that
 grants read-write access to Cloud Storage. When using Container Engine, you can
 do this for all the instances it creates by adding <code class="prettyprint">--scopes storage-rw</code> to the
-<code class="prettyprint">gcloud container clusters create</code> command as shown in the <a href="http://vitess.io/getting-started/#start-a-container-engine-cluster">Vitess on Kubernetes
+<code class="prettyprint">gcloud container clusters create</code> command as shown in the <a href="/getting-started/#start-a-container-engine-cluster">Vitess on Kubernetes
 guide</a>.</p>
 
 <h2 id="creating-a-backup">Creating a backup</h2>
@@ -488,11 +497,11 @@ <h2 id="managing-backups">Managing backups</h2>
 <p><strong>vtctl</strong> provides two commands for managing backups:</p>
 
 <ul>
-<li><p><a href="/reference/vtctl.html#listbackups">ListBackups</a> displays the
+<li><p><a href="/reference/vtctl/#listbackups">ListBackups</a> displays the
 existing backups for a keyspace/shard in chronological order.</p>
 <div class="highlight"><pre><code class="language-sh" data-lang="sh">vtctl ListBackups &lt;keyspace/shard&gt;
 </code></pre></div></li>
-<li><p><a href="/reference/vtctl.html#removebackup">RemoveBackup</a> deletes a
+<li><p><a href="/reference/vtctl/#removebackup">RemoveBackup</a> deletes a
 specified backup for a keyspace/shard.</p>
 <div class="highlight"><pre><code class="language-sh" data-lang="sh">RemoveBackup &lt;keyspace/shard&gt; &lt;backup name&gt;
 </code></pre></div></li>
@@ -533,7 +542,7 @@ <h2 id="concurrency">Concurrency</h2>
 can control the concurrency using command-line flags:</p>
 
 <ul>
-<li>The vtctl <a href="/reference/vtctl.html#backup">Backup</a> command uses the
+<li>The vtctl <a href="/reference/vtctl/#backup">Backup</a> command uses the
 <code class="prettyprint">-concurrency</code> flag.</li>
 <li>vttablet uses the <code class="prettyprint">-restore_concurrency</code> flag.</li>
 </ul>
diff --git a/docs/user-guide/client-libraries.html b/docs/user-guide/client-libraries.html
index 9c08e852614..8683c6a85dd 100644
--- a/docs/user-guide/client-libraries.html
+++ b/docs/user-guide/client-libraries.html
@@ -1,462 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Client Libraries</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Client Libraries"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Client Libraries</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>You can access your Vitess cluster using a variety of clients and
-programming languages. Vitess client libraries help your client
-application to more easily talk to your storage system to query data.</p>
-
-<p>Vitess&#39; service is exposed through a
-<a href="https://developers.google.com/protocol-buffers/docs/proto3">proto3</a>
-service definition. Vitess supports <a href="http://www.grpc.io/">gRPC</a>,
-and you can use the 
-<a href="https://developers.google.com/protocol-buffers/docs/proto?hl=en#generating">proto compiler</a>
-to generate stubs that can call the API in any language that the
-gRPC framework supports.</p>
-
-<p>This document explains the client library strategy for Vitess.</p>
-
-<h2 id="core-principles">Core Principles</h2>
-
-<p>Vitess client libraries follow these core principles:</p>
-
-<ul>
-<li>Libraries fully implement the server API and provide access to all
-API methods, which support the following types of functions:
-
-<ul>
-<li>Transactions (begin, commit, rollback)</li>
-<li>Queries targeted to a specific shards or groups of shards</li>
-<li>Queries targeted based on sharding key values</li>
-<li>Queries that monitor sharding configurations<br></li>
-<li>MapReduce operations</li>
-</ul></li>
-<li>Libraries expose an identical set of well-documented error codes.</li>
-<li>Libraries provide a single-connection abstraction to the
-<code>vtgate</code> service. The connection object should be
-thread-safe, if applicable, and should support multiplexing for
-streaming queries, transactions, and other operations that rely
-on multiple queries.</li>
-<li>A low-level plug-in abstraction enables the transport to be plugged
-in so that the application can use different RPC frameworks. For
-instance, within Google, we use proto2 objects with an internal
-RPC system.<br class="bigbreak"><strong>Note:</strong> If the proto3 library is available in
-your language, we recommend that your API calls use the data types
-generated from our .proto files.</li>
-<li>A high-level object abstraction allows the user to execute transactions
-without having to keep track of the database session.</li>
-<li>Libraries support <code>vtgateclienttest</code>, enabling you to
-fully unit-test all API calls. <code>vtgateclienttest</code> is
-a small server that simulates a real <code>vtgate</code> server
-and returns specific responses to allow for full client feature
-coverage.</li>
-</ul>
-
-<h2 id="language-specific-considerations">Language-specific considerations</h2>
-
-<ul>
-<li>Each client library should support language-specific, idiomatic
-constructs to simplify application development in that language.</li>
-<li>Client libraries should integrate with the following language-specific
-database drivers. For example, current languages implement the following:
-
-<ul>
-<li>Go: <a href="http://golang.org/pkg/database/sql/">database/sql package</a></li>
-<li>Java: <a href="https://docs.oracle.com/javase/tutorial/jdbc/index.html">JDBC</a></li>
-<li>PHP: <a href="http://php.net/manual/en/intro.pdo.php">PHP Data Objects (PDO)</a></li>
-<li>Python: <a href="https://www.python.org/dev/peps/pep-0249/">PEP 0249 DB API</a></li>
-</ul></li>
-<li>Libraries provide a thin wrapper around the proto3 service definitions.
-Those wrappers could be extended with adapters to higher level libraries
-like SQLAlchemy (Python) or JDBC (Java), with other object-based helper
-classes in the relevant language, or both.</li>
-<li>If a well-known MapReduce framework exists for the language, the client
-library should provide a data source and a data sink. For example, you
-can read data from Vitess inside a Hadoop MapReduce job and save the
-output into Vitess.</li>
-</ul>
-
-<h2 id="available-libraries">Available libraries</h2>
-
-<h3 id="go">Go</h3>
-
-<p>The Go client interface is in the
-<a href="https://godoc.org/github.com/youtube/vitess/go/vt/vtgate/vtgateconn">&quot;vtgateconn&quot; package</a>.</p>
-
-<p>There are multiple implementations available. We recommend to use the
-<a href="https://godoc.org/github.com/youtube/vitess/go/vt/vtgate/grpcvtgateconn">&quot;grpc&quot; implementation</a>.
-Load it by importing its package:</p>
-<div class="highlight"><pre><code class="language-go" data-lang="go"><span class="kn">import</span> <span class="s">&quot;github.com/youtube/vitess/go/vt/vtgate/grpcvtgateconn&quot;</span>
-</code></pre></div>
-<p>When you connect to vtgate, use the
-<a href="https://godoc.org/github.com/youtube/vitess/go/vt/vtgate/vtgateconn#DialProtocol"><code class="prettyprint">DialProtocol</code> method</a>
-and specify &quot;grpc&quot; as protocol.
-Alternatively, you can set the
-<a href="https://github.com/youtube/vitess/blob/ff800b2a1801f0bb8b0c29a701d9c0988bf827e2/go/vt/vtgate/vtgateconn/vtgateconn.go#L27">command line flag &quot;vtgate_protocol&quot;</a>
-to &quot;grpc&quot;.</p>
-
-<p>The Go client interface has multiple <code class="prettyprint">Execute*()</code> methods for different use-cases
-and sharding configurations. When you start off with an unsharded database, we
-recommend to use the
-<a href="https://godoc.org/github.com/youtube/vitess/go/vt/vtgate/vtgateconn#VTGateConn.ExecuteShards">ExecuteShards method</a>
-and pass &quot;0&quot; as only shard.</p>
-
-<p>For an example how to use the Go client, see the end-to-end test
-<a href="https://github.com/youtube/vitess/blob/master/go/vt/vttest/local_cluster_test.go">local_cluster_test.go</a>.
-From this test file, you can also reuse the &quot;LaunchVitess&quot; call to
-instantiate a minimal Vitess setup (including a MySQL server). This way you can
-test your application against an actual instance.</p>
-
-<h3 id="java">Java</h3>
-
-<ul>
-<li><a href="https://github.com/youtube/vitess/blob/master/java/client/src/main/java/io/vitess/client/VTGateConn.java">Java client</a></li>
-</ul>
-
-<h3 id="php">PHP</h3>
-
-<ul>
-<li><a href="https://github.com/youtube/vitess/tree/master/php">PHP client</a></li>
-</ul>
-
-<h3 id="python">Python</h3>
-
-<ul>
-<li><a href="https://github.com/youtube/vitess/blob/master/py/vtdb/vtgate_client.py">Python client</a></li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/client-libraries/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/client-libraries/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/client-libraries/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/client-libraries/"</script>
 </html>
diff --git a/docs/user-guide/client-libraries/index.html b/docs/user-guide/client-libraries/index.html
new file mode 100644
index 00000000000..4b244a2345b
--- /dev/null
+++ b/docs/user-guide/client-libraries/index.html
@@ -0,0 +1,471 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Client Libraries | Vitess</title>
+<meta property="og:title" content="Client Libraries" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/client-libraries/" />
+<meta property="og:url" content="http://vitess.io/user-guide/client-libraries/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/client-libraries/","headline":"Client Libraries","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Client Libraries</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>You can access your Vitess cluster using a variety of clients and
+programming languages. Vitess client libraries help your client
+application to more easily talk to your storage system to query data.</p>
+
+<p>Vitess&#39; service is exposed through a
+<a href="https://developers.google.com/protocol-buffers/docs/proto3">proto3</a>
+service definition. Vitess supports <a href="http://www.grpc.io/">gRPC</a>,
+and you can use the 
+<a href="https://developers.google.com/protocol-buffers/docs/proto?hl=en#generating">proto compiler</a>
+to generate stubs that can call the API in any language that the
+gRPC framework supports.</p>
+
+<p>This document explains the client library strategy for Vitess.</p>
+
+<h2 id="core-principles">Core Principles</h2>
+
+<p>Vitess client libraries follow these core principles:</p>
+
+<ul>
+<li>Libraries fully implement the server API and provide access to all
+API methods, which support the following types of functions:
+
+<ul>
+<li>Transactions (begin, commit, rollback)</li>
+<li>Queries targeted to a specific shards or groups of shards</li>
+<li>Queries targeted based on sharding key values</li>
+<li>Queries that monitor sharding configurations<br></li>
+<li>MapReduce operations</li>
+</ul></li>
+<li>Libraries expose an identical set of well-documented error codes.</li>
+<li>Libraries provide a single-connection abstraction to the
+<code>vtgate</code> service. The connection object should be
+thread-safe, if applicable, and should support multiplexing for
+streaming queries, transactions, and other operations that rely
+on multiple queries.</li>
+<li>A low-level plug-in abstraction enables the transport to be plugged
+in so that the application can use different RPC frameworks. For
+instance, within Google, we use proto2 objects with an internal
+RPC system.<br class="bigbreak"><strong>Note:</strong> If the proto3 library is available in
+your language, we recommend that your API calls use the data types
+generated from our .proto files.</li>
+<li>A high-level object abstraction allows the user to execute transactions
+without having to keep track of the database session.</li>
+<li>Libraries support <code>vtgateclienttest</code>, enabling you to
+fully unit-test all API calls. <code>vtgateclienttest</code> is
+a small server that simulates a real <code>vtgate</code> server
+and returns specific responses to allow for full client feature
+coverage.</li>
+</ul>
+
+<h2 id="language-specific-considerations">Language-specific considerations</h2>
+
+<ul>
+<li>Each client library should support language-specific, idiomatic
+constructs to simplify application development in that language.</li>
+<li>Client libraries should integrate with the following language-specific
+database drivers. For example, current languages implement the following:
+
+<ul>
+<li>Go: <a href="http://golang.org/pkg/database/sql/">database/sql package</a></li>
+<li>Java: <a href="https://docs.oracle.com/javase/tutorial/jdbc/index.html">JDBC</a></li>
+<li>PHP: <a href="http://php.net/manual/en/intro.pdo.php">PHP Data Objects (PDO)</a></li>
+<li>Python: <a href="https://www.python.org/dev/peps/pep-0249/">PEP 0249 DB API</a></li>
+</ul></li>
+<li>Libraries provide a thin wrapper around the proto3 service definitions.
+Those wrappers could be extended with adapters to higher level libraries
+like SQLAlchemy (Python) or JDBC (Java), with other object-based helper
+classes in the relevant language, or both.</li>
+<li>If a well-known MapReduce framework exists for the language, the client
+library should provide a data source and a data sink. For example, you
+can read data from Vitess inside a Hadoop MapReduce job and save the
+output into Vitess.</li>
+</ul>
+
+<h2 id="available-libraries">Available libraries</h2>
+
+<h3 id="go">Go</h3>
+
+<p>The Go client interface is in the
+<a href="https://godoc.org/github.com/youtube/vitess/go/vt/vtgate/vtgateconn">&quot;vtgateconn&quot; package</a>.</p>
+
+<p>There are multiple implementations available. We recommend to use the
+<a href="https://godoc.org/github.com/youtube/vitess/go/vt/vtgate/grpcvtgateconn">&quot;grpc&quot; implementation</a>.
+Load it by importing its package:</p>
+<div class="highlight"><pre><code class="language-go" data-lang="go"><span class="kn">import</span> <span class="s">&quot;github.com/youtube/vitess/go/vt/vtgate/grpcvtgateconn&quot;</span>
+</code></pre></div>
+<p>When you connect to vtgate, use the
+<a href="https://godoc.org/github.com/youtube/vitess/go/vt/vtgate/vtgateconn#DialProtocol"><code class="prettyprint">DialProtocol</code> method</a>
+and specify &quot;grpc&quot; as protocol.
+Alternatively, you can set the
+<a href="https://github.com/youtube/vitess/blob/ff800b2a1801f0bb8b0c29a701d9c0988bf827e2/go/vt/vtgate/vtgateconn/vtgateconn.go#L27">command line flag &quot;vtgate_protocol&quot;</a>
+to &quot;grpc&quot;.</p>
+
+<p>The Go client interface has multiple <code class="prettyprint">Execute*()</code> methods for different use-cases
+and sharding configurations. When you start off with an unsharded database, we
+recommend to use the
+<a href="https://godoc.org/github.com/youtube/vitess/go/vt/vtgate/vtgateconn#VTGateConn.ExecuteShards">ExecuteShards method</a>
+and pass &quot;0&quot; as only shard.</p>
+
+<p>For an example how to use the Go client, see the end-to-end test
+<a href="https://github.com/youtube/vitess/blob/master/go/vt/vttest/local_cluster_test.go">local_cluster_test.go</a>.
+From this test file, you can also reuse the &quot;LaunchVitess&quot; call to
+instantiate a minimal Vitess setup (including a MySQL server). This way you can
+test your application against an actual instance.</p>
+
+<h3 id="java">Java</h3>
+
+<ul>
+<li><a href="https://github.com/youtube/vitess/blob/master/java/client/src/main/java/io/vitess/client/VTGateConn.java">Java client</a></li>
+</ul>
+
+<h3 id="php">PHP</h3>
+
+<ul>
+<li><a href="https://github.com/youtube/vitess/tree/master/php">PHP client</a></li>
+</ul>
+
+<h3 id="python">Python</h3>
+
+<ul>
+<li><a href="https://github.com/youtube/vitess/blob/master/py/vtdb/vtgate_client.py">Python client</a></li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/horizontal-resharding-workflow.html b/docs/user-guide/horizontal-resharding-workflow.html
new file mode 100644
index 00000000000..bda5d618ae6
--- /dev/null
+++ b/docs/user-guide/horizontal-resharding-workflow.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/horizontal-sharding-workflow/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/horizontal-sharding-workflow/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/horizontal-sharding-workflow/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/horizontal-sharding-workflow/"</script>
+</html>
diff --git a/docs/user-guide/horizontal-resharding.html b/docs/user-guide/horizontal-resharding.html
new file mode 100644
index 00000000000..97309d2248b
--- /dev/null
+++ b/docs/user-guide/horizontal-resharding.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/horizontal-sharding/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/horizontal-sharding/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/horizontal-sharding/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/horizontal-sharding/"</script>
+</html>
diff --git a/docs/user-guide/horizontal-sharding-workflow.html b/docs/user-guide/horizontal-sharding-workflow/index.html
similarity index 76%
rename from docs/user-guide/horizontal-sharding-workflow.html
rename to docs/user-guide/horizontal-sharding-workflow/index.html
index 4eb8b86c174..d32824168d9 100644
--- a/docs/user-guide/horizontal-sharding-workflow.html
+++ b/docs/user-guide/horizontal-sharding-workflow/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Horizontal Sharding (Tutorial, automated)</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Horizontal Sharding (Tutorial, automated)"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Horizontal Sharding (Tutorial, automated) | Vitess</title>
+<meta property="og:title" content="Horizontal Sharding (Tutorial, automated)" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/horizontal-sharding-workflow/" />
+<meta property="og:url" content="http://vitess.io/user-guide/horizontal-sharding-workflow/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/horizontal-sharding-workflow/","headline":"Horizontal Sharding (Tutorial, automated)","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Horizontal Sharding (Tutorial, automated)</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -309,7 +318,7 @@ <h4 class="arrow-r">Internal</h4>
     <div class="col-md-7" id="centerCol">
       <div id="centerTextCol">
         <p>This guide shows you an example about how to apply range-based sharding
-process in an existing unsharded Vitess <a href="http://vitess.io/overview/concepts.html#keyspace">keyspace</a>
+process in an existing unsharded Vitess <a href="/overview/concepts/#keyspace">keyspace</a>
 using the horizontal resharding workflow. In this example, we will reshard
 from 1 shard &quot;0&quot; into 2 shards &quot;-80&quot; and &quot;80-&quot;.</p>
 
@@ -323,9 +332,9 @@ <h2 id="overview">Overview</h2>
 (<strong>Phase: CopySchemaShard</strong>) </li>
 <li> Copy the data with a batch process called <em>vtworker</em>
 (<strong>Phase: SplitClone</strong>).
-<a href="horizontal-sharding-workflow.html#details-in-splitclone-phase">more details</a></li>
+<a href="#details-in-splitclone-phase">more details</a></li>
 <li> Check filtered replication (<strong>Phase: WaitForFilteredReplication</strong>).
-<a href="horizontal-sharding-workflow.html#details-in-waitforfilteredreplication-phase">more details</a> </li>
+<a href="#details-in-waitforfilteredreplication-phase">more details</a></li>
 <li> Check copied data integrity using <em>vtworker</em> batch process in the mode
 to compare the source and destination data. (<strong>Phase: SplitDiff</strong>)</li>
 <li> Migrate all the serving rdonly tablets in the original shards.
@@ -334,12 +343,12 @@ <h2 id="overview">Overview</h2>
 (<strong>Phase: MigrateServedTypeReplica</strong>)</li>
 <li> Migrate all the serving master tablets in the original shards.
 (<strong>Phase: MigrateServedTypeMaster</strong>)
-<a href="horizontal-sharding-workflow.html#details-in-migrateservedtypemaste-phase">more details</a> </li>
+<a href="#details-in-migrateservedtypemaste-phase">more details</a></li>
 </ol>
 
 <h2 id="prerequisites">Prerequisites</h2>
 
-<p>You should complete the <a href="http://vitess.io/getting-started/local-instance.html">Getting Started</a> guide
+<p>You should complete the <a href="/getting-started/local-instance/">Getting Started</a> guide
 (please finish all the steps before Try Vitess resharding) and have left
 the cluster running. Then, please follow these steps before running
 the resharding process:</p>
@@ -351,7 +360,7 @@ <h2 id="prerequisites">Prerequisites</h2>
 </code></pre></div></li>
 <li><p>Bring up tablets for 2 additional shards:  <em>test_keyspace/-80</em> and
 <em>test_keyspace/80-</em> (you can learn more about sharding key range
-<a href="http://vitess.io/user-guide/sharding.html#key-ranges-and-partitions">here</a>):</p>
+<a href="/user-guide/sharding/#key-ranges-and-partitions">here</a>):</p>
 <div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./sharded-vttablet-up.sh
 </code></pre></div>
 <p>Initialize replication by electing the first master for each of the new shards:</p>
@@ -410,7 +419,7 @@ <h3 id="create-the-workflow">Create the workflow</h3>
 source shards and destination shards and create tasks for the resharding
 process. After the creation, click the workflow node, you can see a list of
 child nodes. Each child node represents a phase in the workflow (each phase
-represents a step mentioned in <a href="http://vitess.io/user-guide/horizontal-sharding-workflow.html#overview">Overview</a>).
+represents a step mentioned in <a href="/user-guide/horizontal-sharding-workflow/#overview">Overview</a>).
 Further click a phase node, you can inspect tasks in this phase.
 For example, in the &quot;CopySchemaShard&quot; phase, it includes tasks to copy schema
 to 2 destination shards, therefore you can see task node &quot;Shard -80&quot; and
@@ -474,7 +483,7 @@ <h2 id="verify-results-and-clean-up">Verify Results and Clean up</h2>
 <em>0</em> becomes non-serving and shard <em>-80</em> and shard <em>80-</em> are serving shards.
 Verify this for yourself: inspect the database content using following commands,
 then add messages to the guestbook page (you can use script client.sh mentioned
-<a href="http://vitess.io/getting-started/local-instance.html#run-a-client-application">here</a>)
+<a href="/getting-started/local-instance/#run-a-client-application">here</a>)
 and inspect using same commands:</p>
 <div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># See what&#39;s on shard test_keyspace/0</span>
 <span class="c"># (no updates visible since we migrated away from it):</span>
@@ -516,7 +525,7 @@ <h2 id="tear-down-and-clean-up">Tear down and clean up</h2>
 </code></pre></div>
 <h2 id="reference">Reference</h2>
 
-<p>You can checkout the old version tutorial <a href="http://vitess.io/user-guide/horizontal-sharding.html">here</a>.
+<p>You can checkout the old version tutorial <a href="/user-guide/horizontal-sharding/">here</a>.
 It walks you through the resharding process by manually executing commands.</p>
 
 <h3 id="details-in-splitclone-phase">Details in SplitClone phase</h3>
@@ -538,7 +547,7 @@ <h3 id="details-in-splitclone-phase">Details in SplitClone phase</h3>
 <h3 id="details-in-waitforfilteredreplication-phase">Details in WaitForFilteredReplication phase</h3>
 
 <p>Once the copying from a paused snapshot (phase SplitClone) has finished,
-<em>vtworker</em> turns on <a href="http://vitess.io/user-guide/sharding.html#filtered-replication">filtered replication</a>,
+<em>vtworker</em> turns on <a href="/user-guide/sharding/#filtered-replication">filtered replication</a>,
 which allows the destination shards to catch up on updates that have continued
 to flow in from the app since the time of the snapshot. After the destination
 shards are caught up, they will continue to replicate new updates. </p>
diff --git a/docs/user-guide/horizontal-sharding.html b/docs/user-guide/horizontal-sharding/index.html
similarity index 77%
rename from docs/user-guide/horizontal-sharding.html
rename to docs/user-guide/horizontal-sharding/index.html
index 0df6c343ebe..e1dd59449e4 100644
--- a/docs/user-guide/horizontal-sharding.html
+++ b/docs/user-guide/horizontal-sharding/index.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Horizontal Sharding (Tutorial, manual)</title>
 
         <!-- Webfont -->
     <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
@@ -34,11 +33,6 @@
     <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
 
 
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Horizontal Sharding (Tutorial, manual)"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
     <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
 
     
@@ -52,6 +46,21 @@
 </script>
 
     
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Horizontal Sharding (Tutorial, manual) | Vitess</title>
+<meta property="og:title" content="Horizontal Sharding (Tutorial, manual)" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/horizontal-sharding/" />
+<meta property="og:url" content="http://vitess.io/user-guide/horizontal-sharding/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/horizontal-sharding/","headline":"Horizontal Sharding (Tutorial, manual)","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
   </head>
   <body class="docs" id="top_of_page">
 
@@ -77,8 +86,8 @@
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
         <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
@@ -89,8 +98,8 @@
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -98,80 +107,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -207,8 +216,8 @@ <h1>Horizontal Sharding (Tutorial, manual)</h1>
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
             <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
@@ -216,80 +225,80 @@ <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
             <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="/resources/presentations/">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
             <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
             <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
           </ul>
         </li>
 
@@ -309,12 +318,12 @@ <h4 class="arrow-r">Internal</h4>
     <div class="col-md-7" id="centerCol">
       <div id="centerTextCol">
         <p>This guide walks you through the process of sharding an existing unsharded
-Vitess <a href="http://vitess.io/overview/concepts.html#keyspace">keyspace</a>.</p>
+Vitess <a href="/overview/concepts/#keyspace">keyspace</a>.</p>
 
 <h2 id="prerequisites">Prerequisites</h2>
 
 <p>We begin by assuming you&#39;ve completed the
-<a href="http://vitess.io/getting-started/local-instance.html">Getting Started</a> guide,
+<a href="/getting-started/local-instance/">Getting Started</a> guide,
 and have left the cluster running.</p>
 
 <h2 id="overview">Overview</h2>
@@ -377,7 +386,7 @@ <h2 id="bring-up-tablets-for-new-shards">Bring up tablets for new shards</h2>
 <p>Since the sharding key is the page number,
 this will result in half the pages going to each shard,
 since <em>0x80</em> is the midpoint of the
-<a href="http://vitess.io/user-guide/sharding.html#key-ranges-and-partitions">sharding key range</a>.</p>
+<a href="/user-guide/sharding/#key-ranges-and-partitions">sharding key range</a>.</p>
 
 <p>These new shards will run in parallel with the original shard during the
 transition, but actual traffic will be served only by the original shard
@@ -436,7 +445,7 @@ <h2 id="copy-data-from-original-shard">Copy data from original shard</h2>
 <h2 id="check-filtered-replication">Check filtered replication</h2>
 
 <p>Once the copy from the paused snapshot finishes, <em>vtworker</em> turns on
-<a href="http://vitess.io/user-guide/sharding.html#filtered-replication">filtered replication</a>
+<a href="/user-guide/sharding/#filtered-replication">filtered replication</a>
 from the source shard to each destination shard. This allows the destination
 shards to catch up on updates that have continued to flow in from the app since
 the time of the snapshot.</p>
@@ -471,10 +480,10 @@ <h2 id="check-copied-data-integrity">Check copied data integrity</h2>
 <h2 id="switch-over-to-new-shards">Switch over to new shards</h2>
 
 <p>Now we&#39;re ready to switch over to serving from the new shards.
-The <a href="http://vitess.io/reference/vtctl.html#migrateservedtypes">MigrateServedTypes</a>
+The <a href="/reference/vtctl/#migrateservedtypes">MigrateServedTypes</a>
 command lets you do this one
-<a href="http://vitess.io/overview/concepts.html#tablet">tablet type</a> at a time,
-and even one <a href="http://vitess.io/overview/concepts.html#cell-data-center">cell</a>
+<a href="/overview/concepts/#tablet">tablet type</a> at a time,
+and even one <a href="/overview/concepts/#cell-data-center">cell</a>
 at a time. The process can be rolled back at any point <em>until</em> the master is
 switched over.</p>
 <div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh MigrateServedTypes test_keyspace/0 rdonly
diff --git a/docs/user-guide/introduction.html b/docs/user-guide/introduction.html
index 39006d5480e..4d3b4d41b9e 100644
--- a/docs/user-guide/introduction.html
+++ b/docs/user-guide/introduction.html
@@ -1,437 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Vitess User Guide - Introduction</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Vitess User Guide - Introduction"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Vitess User Guide - Introduction</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h2 id="platform-support">Platform support</h2>
-
-<p>We continuously test against Ubuntu 14.04 (Trusty) and Debian 8 (Jessie).
-Other Linux distributions should work as well.</p>
-
-<h2 id="database-support">Database support</h2>
-
-<p>Vitess supports <a href="http://dev.mysql.com/doc/refman/5.6/en/">MySQL 5.6</a>,
-<a href="http://dev.mysql.com/doc/refman/5.7/en/">MySQL 5.7</a>,
-and <a href="https://downloads.mariadb.org/mariadb/10.0.21/">MariaDB 10.0</a>.</p>
-
-<h3 id="data-types-and-sql-support">Data types and SQL support</h3>
-
-<p>In Vitess, database tables are like MySQL relational tables, and you
-can use relational modeling schemes (normalization) to structure your
-schema. Vitess supports both primary and secondary indexes.</p>
-
-<p>Vitess supports almost all MySQL scalar data types.
-It also provides full SQL support within a
-<a href="/overview/concepts.html#shard">shard</a>, including JOIN statements.</p>
-
-<p>Vitess does not currently support encoded protobufs or protocol buffer
-querying. (The latter is also known as cracking.) Protocol buffers can
-be stored as a blob in MySQL, but must be decoded and interpreted at
-the application layer.</p>
-
-<h3 id="schema-management">Schema management</h3>
-
-<p>Vitess supports several functions for looking at your schema and
-validating its consistency across tablets in a shard or across all
-shards in a keyspace.</p>
-
-<p>In addition, Vitess supports 
-<a href="https://dev.mysql.com/doc/refman/5.6/en/sql-syntax-data-definition.html">data definition statements</a>
-that create, modify, or delete database tables. Vitess executes
-schema changes on the master tablet within each shard, and those
-changes then propagate to slave tablets via replication. Vitess does
-not support other types of DDL statements, such as those that affect
-stored procedures or grants.</p>
-
-<p>Before executing a schema change, Vitess validates the SQL syntax
-and determines the impact of the change. It also does a pre-flight
-check to ensure that the update can be applied to your schema. In
-addition, to avoid reducing the availability of your entire system,
-Vitess rejects changes that exceed a certain scope.</p>
-
-<p>See the <a href="/user-guide/schema-management.html">Schema Management</a>
-section of this guide for more information.</p>
-
-<h2 id="supported-clients">Supported clients</h2>
-
-<p>You can access your Vitess cluster using a variety of clients and
-programming languages.</p>
-
-<p>Vitess&#39; service is exposed through a
-<a href="https://developers.google.com/protocol-buffers/docs/proto3">proto3</a>
-service definition. Vitess supports <a href="http://www.grpc.io/">gRPC</a>,
-and you can use the 
-<a href="https://developers.google.com/protocol-buffers/docs/proto?hl=en#generating">proto compiler</a>
-to generate stubs that can call the API in any language that the
-gRPC framework supports.</p>
-
-<h3 id="client-libraries">Client libraries</h3>
-
-<p>Client libraries that support a richer set of functionality are
-available for some languages. Client libraries help your application
-to more easily talk to your storage system to query data.</p>
-
-<p>The following table lists those
-client libraries and other clients that Vitess supports.</p>
-
-<table><thead>
-<tr>
-<th style="text-align: left">Type</th>
-<th style="text-align: left">Options</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">Client library</td>
-<td style="text-align: left"><a href="http://www.grpc.io/">gRPC</a><br class="bigbreak">Go<br class="bigbreak">Java<br class="bigbreak">Python<br class="bigbreak">PHP</td>
-</tr>
-<tr>
-<td style="text-align: left">MapReduce</td>
-<td style="text-align: left"><a href="https://hadoop.apache.org/docs/r2.7.0/api/org/apache/hadoop/mapreduce/InputFormat.html">Hadoop input</a></td>
-</tr>
-</tbody></table>
-
-<h2 id="backups">Backups</h2>
-
-<p>Vitess supports data backups to either a network mount (e.g. NFS) or to a blob store.
-Backup storage is implemented through a pluggable interface,
-and we currently have plugins available for Google Cloud Storage, Amazon S3,
-and Ceph.</p>
-
-<p>See the <a href="/user-guide/backup-and-restore.html">Backing Up Data</a> section
-of this guide for more information about creating and restoring data
-backups with Vitess. </p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/introduction/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/introduction/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/introduction/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/introduction/"</script>
 </html>
diff --git a/docs/user-guide/introduction/index.html b/docs/user-guide/introduction/index.html
new file mode 100644
index 00000000000..a155431f289
--- /dev/null
+++ b/docs/user-guide/introduction/index.html
@@ -0,0 +1,446 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Vitess User Guide - Introduction | Vitess</title>
+<meta property="og:title" content="Vitess User Guide - Introduction" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/introduction/" />
+<meta property="og:url" content="http://vitess.io/user-guide/introduction/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/introduction/","headline":"Vitess User Guide - Introduction","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Vitess User Guide - Introduction</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h2 id="platform-support">Platform support</h2>
+
+<p>We continuously test against Ubuntu 14.04 (Trusty) and Debian 8 (Jessie).
+Other Linux distributions should work as well.</p>
+
+<h2 id="database-support">Database support</h2>
+
+<p>Vitess supports <a href="http://dev.mysql.com/doc/refman/5.6/en/">MySQL 5.6</a>,
+<a href="http://dev.mysql.com/doc/refman/5.7/en/">MySQL 5.7</a>,
+and <a href="https://downloads.mariadb.org/mariadb/10.0.21/">MariaDB 10.0</a>.</p>
+
+<h3 id="data-types-and-sql-support">Data types and SQL support</h3>
+
+<p>In Vitess, database tables are like MySQL relational tables, and you
+can use relational modeling schemes (normalization) to structure your
+schema. Vitess supports both primary and secondary indexes.</p>
+
+<p>Vitess supports almost all MySQL scalar data types.
+It also provides full SQL support within a
+<a href="/overview/concepts/#shard">shard</a>, including JOIN statements.</p>
+
+<p>Vitess does not currently support encoded protobufs or protocol buffer
+querying. (The latter is also known as cracking.) Protocol buffers can
+be stored as a blob in MySQL, but must be decoded and interpreted at
+the application layer.</p>
+
+<h3 id="schema-management">Schema management</h3>
+
+<p>Vitess supports several functions for looking at your schema and
+validating its consistency across tablets in a shard or across all
+shards in a keyspace.</p>
+
+<p>In addition, Vitess supports 
+<a href="https://dev.mysql.com/doc/refman/5.6/en/sql-syntax-data-definition.html">data definition statements</a>
+that create, modify, or delete database tables. Vitess executes
+schema changes on the master tablet within each shard, and those
+changes then propagate to slave tablets via replication. Vitess does
+not support other types of DDL statements, such as those that affect
+stored procedures or grants.</p>
+
+<p>Before executing a schema change, Vitess validates the SQL syntax
+and determines the impact of the change. It also does a pre-flight
+check to ensure that the update can be applied to your schema. In
+addition, to avoid reducing the availability of your entire system,
+Vitess rejects changes that exceed a certain scope.</p>
+
+<p>See the <a href="/user-guide/schema-management/">Schema Management</a>
+section of this guide for more information.</p>
+
+<h2 id="supported-clients">Supported clients</h2>
+
+<p>You can access your Vitess cluster using a variety of clients and
+programming languages.</p>
+
+<p>Vitess&#39; service is exposed through a
+<a href="https://developers.google.com/protocol-buffers/docs/proto3">proto3</a>
+service definition. Vitess supports <a href="http://www.grpc.io/">gRPC</a>,
+and you can use the 
+<a href="https://developers.google.com/protocol-buffers/docs/proto?hl=en#generating">proto compiler</a>
+to generate stubs that can call the API in any language that the
+gRPC framework supports.</p>
+
+<h3 id="client-libraries">Client libraries</h3>
+
+<p>Client libraries that support a richer set of functionality are
+available for some languages. Client libraries help your application
+to more easily talk to your storage system to query data.</p>
+
+<p>The following table lists those
+client libraries and other clients that Vitess supports.</p>
+
+<table><thead>
+<tr>
+<th style="text-align: left">Type</th>
+<th style="text-align: left">Options</th>
+</tr>
+</thead><tbody>
+<tr>
+<td style="text-align: left">Client library</td>
+<td style="text-align: left"><a href="http://www.grpc.io/">gRPC</a><br class="bigbreak">Go<br class="bigbreak">Java<br class="bigbreak">Python<br class="bigbreak">PHP</td>
+</tr>
+<tr>
+<td style="text-align: left">MapReduce</td>
+<td style="text-align: left"><a href="https://hadoop.apache.org/docs/r2.7.0/api/org/apache/hadoop/mapreduce/InputFormat.html">Hadoop input</a></td>
+</tr>
+</tbody></table>
+
+<h2 id="backups">Backups</h2>
+
+<p>Vitess supports data backups to either a network mount (e.g. NFS) or to a blob store.
+Backup storage is implemented through a pluggable interface,
+and we currently have plugins available for Google Cloud Storage, Amazon S3,
+and Ceph.</p>
+
+<p>See the <a href="/user-guide/backup-and-restore/">Backing Up Data</a> section
+of this guide for more information about creating and restoring data
+backups with Vitess. </p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/launching.html b/docs/user-guide/launching.html
index f8ac9f92817..9f85d61df29 100644
--- a/docs/user-guide/launching.html
+++ b/docs/user-guide/launching.html
@@ -1,350 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Launching Vitess</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Launching Vitess"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Launching Vitess</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>This section offers guidelines on how to configure and manage Vitess
-in a production environment.</p>
-
-<ul>
-<li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-<li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-<li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-<li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-<li><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/launching/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/launching/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/launching/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/launching/"</script>
 </html>
diff --git a/docs/user-guide/launching/index.html b/docs/user-guide/launching/index.html
new file mode 100644
index 00000000000..72520d03fe4
--- /dev/null
+++ b/docs/user-guide/launching/index.html
@@ -0,0 +1,359 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Launching Vitess | Vitess</title>
+<meta property="og:title" content="Launching Vitess" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/launching/" />
+<meta property="og:url" content="http://vitess.io/user-guide/launching/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/launching/","headline":"Launching Vitess","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Launching Vitess</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>This section offers guidelines on how to configure and manage Vitess
+in a production environment.</p>
+
+<ul>
+<li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+<li><a href="/user-guide/production-planning/">Production Planning</a></li>
+<li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+<li><a href="/user-guide/twopc/">2PC Guide</a></li>
+<li><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/mysql-server-protocol.html b/docs/user-guide/mysql-server-protocol.html
index 0e8ccd88db9..9aceeacec75 100644
--- a/docs/user-guide/mysql-server-protocol.html
+++ b/docs/user-guide/mysql-server-protocol.html
@@ -1,467 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / MySQL Server Protocol</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / MySQL Server Protocol"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>MySQL Server Protocol</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="mysql-binary-protocol">MySQL Binary Protocol</h1>
-
-<p>Vitess 2.1 is adding alpha support for the MySQL binary protocol (refered to as the
-<code class="prettyprint">protocol</code> in the rest of this document). This allows existing applications to
-connect to Vitess directly without any change, or new driver / connector.</p>
-
-<p>However, this also has limitations. The RPC protocol traditionnally exposed by
-Vitess is reacher in features, and allows finer grain control of the query
-behaviours.</p>
-
-<p>This document explores the limitations of using this protocol.</p>
-
-<h2 id="protocol-limitations">Protocol Limitations</h2>
-
-<p>The following features are not represented in the protocol.</p>
-
-<h3 id="bind-variables">Bind Variables</h3>
-
-<p>In the traditional connector, queries are sent as plain text to the server. This
-protocol does not support bind variable.</p>
-
-<p>The Prepared Statement part of the API can support bind variables, but it
-requires per-connection state, and using binary bind variables, which are much
-harder to implement. It is also not recommended.</p>
-
-<p>Most database drivers (JDBC, go, ...) support bind variables. These end up being
-implemented as client-side bind variables, where the values are printed in the
-SQL statement by the client, and re-interpreted by the server.</p>
-
-<p>A Vitess Connector, on the other end, can send the Bind Variable map to the
-server along with the query. The query plan is then cached by both vtgate and
-vttablet, providing much better execution times.</p>
-
-<p>Note we added the <code class="prettyprint">normalize_queries</code> command line parameter to vtgate to
-mitigate this problem. With this flag, vtgate will try to extract bind variables
-from full queries. This makes the vttablet side optimized, but still costs extra
-CPU on the vtgate side.</p>
-
-<h3 id="tablet-type">Tablet Type</h3>
-
-<p>The regular Vitess API provides the ability to specify the tablet type to
-target: <code class="prettyprint">master</code>, <code class="prettyprint">replica</code>, <code class="prettyprint">rdonly</code>. The current MySQL connector we created
-only uses the <code class="prettyprint">master</code> type.</p>
-
-<p>Note we could implement a different policy for this.</p>
-
-<h3 id="transaction-type">Transaction Type</h3>
-
-<p>The regular Vitess API provides the ability to specify the transaction type: one
-shard only, or 2PC. The current MYSQL connector uses the transaction type
-provided to vtgate by the <code class="prettyprint">transaction_mode</code>, which usually is the highest
-transaction level allowed by vtgate, not the default one.</p>
-
-<h3 id="streaming-queries">Streaming Queries</h3>
-
-<p>The Vitess RPC protocol supports both non-streaming queries (for web-like
-traffic), and streaming queries (for data analysis traffic). The current MySQL
-connector only uses non-streaming queries.</p>
-
-<p>This could be changed with a flag. Or we could try to be smart: anything within
-a transaction could be non-streaming query, anything outside a transaction could
-be streaming.</p>
-
-<h3 id="extra-query-features">Extra Query Features</h3>
-
-<p>There are even more Vitess specific features in the API, that are not
-represented in the MySQL server API. Event Tokens for cache invalidation, Update
-Stream, Messages, ... These seem somewhat impossible to implement using the
-MySQL binary protocol.</p>
-
-<h3 id="security">Security</h3>
-
-<p>The current RPC protocol uses the security provided by the RPC protocol, TLS for
-gRPC. We then use the certificate name as the user name for our authorization
-(table ACLs).</p>
-
-<p>The MySQL server connector requires user names and passwords, that need to
-maintained, rotated, ... We do not include TLS support yet, although it can be
-easily added. We also need to add the username as authenticated user to use for
-our authorization.</p>
-
-<p>We have plans to provide an LDAP plug-in to authenticate the users (but no firm
-development plan for it yet).</p>
-
-<h3 id="query-multiplexing">Query Multiplexing</h3>
-
-<p>gRPC can multiplex multiple request / responses on the same TCP connection. The
-MySQL server protocol is very synchronous, and can only have one request in
-flight at any given time.</p>
-
-<h2 id="recommended-use-cases">Recommended Use Cases</h2>
-
-<p>With all these limitations, why did we even bother implementing this? Well,
-there is something to be said for drop-in replacement and ease of use:</p>
-
-<ul>
-<li><p>When migrating an existing application to Vitess, it is useful to run Vitess
-on top of an existing database, and only change the server address in the
-client code to point at vtgate, and not change anything else. This allows for
-an easier transition, and then the client code can be update later to use a
-better connector.</p></li>
-<li><p>Some tools only support MySQL server protocol, and not connectors / not Vitess
-(yet!).</p></li>
-<li><p>Most of the mentioned limitations are going to affect production systems
-running at a somewhat high load. For smaller workloads, none of this really
-matters.</p></li>
-<li><p>A lot more programming languages have MySQL connectors than what we support
-already (we have connectors for Java, Python, PHP, Go). They can use the MySQL
-server protocol until a native connector for gRPC can be immplemented.</p></li>
-</ul>
-
-<h2 id="future-features">Future Features</h2>
-
-<p>We are thinking about the following features to make this connector more useful:</p>
-
-<ul>
-<li><p>Add SSL support.</p></li>
-<li><p>Provided more authentication schemes than <code class="prettyprint">mysql_native_password</code>. In
-particular, <code class="prettyprint">sha256</code> seems easy.</p></li>
-<li><p>Use an LDAP client to validate users and passwords on the server side.</p></li>
-<li><p>Implement a lot more DBA features in the protocol. Statements like <code class="prettyprint">SHOW
-TABLES</code> are not supported yet. They will make the MySQL binary protocol much
-more useful.</p></li>
-<li><p>Possibly add hints to the queries so they can use more advanced features. Like
-provide a <code class="prettyprint">commit 2pc</code> syntax to enable 2PC for some commits.</p></li>
-<li><p>Provide direct SQL access for some features like Vitess Messages.</p></li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/mysql-server-protocol/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/mysql-server-protocol/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/mysql-server-protocol/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/mysql-server-protocol/"</script>
 </html>
diff --git a/docs/user-guide/mysql-server-protocol/index.html b/docs/user-guide/mysql-server-protocol/index.html
new file mode 100644
index 00000000000..e260eda1acf
--- /dev/null
+++ b/docs/user-guide/mysql-server-protocol/index.html
@@ -0,0 +1,476 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>MySQL Server Protocol | Vitess</title>
+<meta property="og:title" content="MySQL Server Protocol" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/mysql-server-protocol/" />
+<meta property="og:url" content="http://vitess.io/user-guide/mysql-server-protocol/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/mysql-server-protocol/","headline":"MySQL Server Protocol","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>MySQL Server Protocol</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="mysql-binary-protocol">MySQL Binary Protocol</h1>
+
+<p>Vitess 2.1 is adding alpha support for the MySQL binary protocol (refered to as the
+<code class="prettyprint">protocol</code> in the rest of this document). This allows existing applications to
+connect to Vitess directly without any change, or new driver / connector.</p>
+
+<p>However, this also has limitations. The RPC protocol traditionnally exposed by
+Vitess is reacher in features, and allows finer grain control of the query
+behaviours.</p>
+
+<p>This document explores the limitations of using this protocol.</p>
+
+<h2 id="protocol-limitations">Protocol Limitations</h2>
+
+<p>The following features are not represented in the protocol.</p>
+
+<h3 id="bind-variables">Bind Variables</h3>
+
+<p>In the traditional connector, queries are sent as plain text to the server. This
+protocol does not support bind variable.</p>
+
+<p>The Prepared Statement part of the API can support bind variables, but it
+requires per-connection state, and using binary bind variables, which are much
+harder to implement. It is also not recommended.</p>
+
+<p>Most database drivers (JDBC, go, ...) support bind variables. These end up being
+implemented as client-side bind variables, where the values are printed in the
+SQL statement by the client, and re-interpreted by the server.</p>
+
+<p>A Vitess Connector, on the other end, can send the Bind Variable map to the
+server along with the query. The query plan is then cached by both vtgate and
+vttablet, providing much better execution times.</p>
+
+<p>Note we added the <code class="prettyprint">normalize_queries</code> command line parameter to vtgate to
+mitigate this problem. With this flag, vtgate will try to extract bind variables
+from full queries. This makes the vttablet side optimized, but still costs extra
+CPU on the vtgate side.</p>
+
+<h3 id="tablet-type">Tablet Type</h3>
+
+<p>The regular Vitess API provides the ability to specify the tablet type to
+target: <code class="prettyprint">master</code>, <code class="prettyprint">replica</code>, <code class="prettyprint">rdonly</code>. The current MySQL connector we created
+only uses the <code class="prettyprint">master</code> type.</p>
+
+<p>Note we could implement a different policy for this.</p>
+
+<h3 id="transaction-type">Transaction Type</h3>
+
+<p>The regular Vitess API provides the ability to specify the transaction type: one
+shard only, or 2PC. The current MYSQL connector uses the transaction type
+provided to vtgate by the <code class="prettyprint">transaction_mode</code>, which usually is the highest
+transaction level allowed by vtgate, not the default one.</p>
+
+<h3 id="streaming-queries">Streaming Queries</h3>
+
+<p>The Vitess RPC protocol supports both non-streaming queries (for web-like
+traffic), and streaming queries (for data analysis traffic). The current MySQL
+connector only uses non-streaming queries.</p>
+
+<p>This could be changed with a flag. Or we could try to be smart: anything within
+a transaction could be non-streaming query, anything outside a transaction could
+be streaming.</p>
+
+<h3 id="extra-query-features">Extra Query Features</h3>
+
+<p>There are even more Vitess specific features in the API, that are not
+represented in the MySQL server API. Event Tokens for cache invalidation, Update
+Stream, Messages, ... These seem somewhat impossible to implement using the
+MySQL binary protocol.</p>
+
+<h3 id="security">Security</h3>
+
+<p>The current RPC protocol uses the security provided by the RPC protocol, TLS for
+gRPC. We then use the certificate name as the user name for our authorization
+(table ACLs).</p>
+
+<p>The MySQL server connector requires user names and passwords, that need to
+maintained, rotated, ... We do not include TLS support yet, although it can be
+easily added. We also need to add the username as authenticated user to use for
+our authorization.</p>
+
+<p>We have plans to provide an LDAP plug-in to authenticate the users (but no firm
+development plan for it yet).</p>
+
+<h3 id="query-multiplexing">Query Multiplexing</h3>
+
+<p>gRPC can multiplex multiple request / responses on the same TCP connection. The
+MySQL server protocol is very synchronous, and can only have one request in
+flight at any given time.</p>
+
+<h2 id="recommended-use-cases">Recommended Use Cases</h2>
+
+<p>With all these limitations, why did we even bother implementing this? Well,
+there is something to be said for drop-in replacement and ease of use:</p>
+
+<ul>
+<li><p>When migrating an existing application to Vitess, it is useful to run Vitess
+on top of an existing database, and only change the server address in the
+client code to point at vtgate, and not change anything else. This allows for
+an easier transition, and then the client code can be update later to use a
+better connector.</p></li>
+<li><p>Some tools only support MySQL server protocol, and not connectors / not Vitess
+(yet!).</p></li>
+<li><p>Most of the mentioned limitations are going to affect production systems
+running at a somewhat high load. For smaller workloads, none of this really
+matters.</p></li>
+<li><p>A lot more programming languages have MySQL connectors than what we support
+already (we have connectors for Java, Python, PHP, Go). They can use the MySQL
+server protocol until a native connector for gRPC can be immplemented.</p></li>
+</ul>
+
+<h2 id="future-features">Future Features</h2>
+
+<p>We are thinking about the following features to make this connector more useful:</p>
+
+<ul>
+<li><p>Add SSL support.</p></li>
+<li><p>Provided more authentication schemes than <code class="prettyprint">mysql_native_password</code>. In
+particular, <code class="prettyprint">sha256</code> seems easy.</p></li>
+<li><p>Use an LDAP client to validate users and passwords on the server side.</p></li>
+<li><p>Implement a lot more DBA features in the protocol. Statements like <code class="prettyprint">SHOW
+TABLES</code> are not supported yet. They will make the MySQL binary protocol much
+more useful.</p></li>
+<li><p>Possibly add hints to the queries so they can use more advanced features. Like
+provide a <code class="prettyprint">commit 2pc</code> syntax to enable 2PC for some commits.</p></li>
+<li><p>Provide direct SQL access for some features like Vitess Messages.</p></li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/production-planning.html b/docs/user-guide/production-planning.html
index 5e977173aae..88e87c5dd57 100644
--- a/docs/user-guide/production-planning.html
+++ b/docs/user-guide/production-planning.html
@@ -1,414 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Production Planning</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Production Planning"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Production Planning</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h2 id="provisioning">Provisioning</h2>
-
-<h3 id="estimating-total-resources">Estimating total resources</h3>
-
-<p>Although Vitess helps you scale indefinitely, the various layers do consume CPU and memory. Currently, the cost of Vitess servers is dominated by the RPC framework which we use: gRPC (gRPC is a relatively young product). So, Vitess servers are expected to get more efficient over time as there are improvements in gRPC as well as the Go runtime. For now, you can use the following rules of thumb to budget resources for Vitess:</p>
-
-<p>Every MySQL instance that serves traffic requires one VTTablet, which is in turn expected to consume an equal amount of CPU. So, if MySQL consumes 8 CPUs, VTTablet is likely going to consume another 8.</p>
-
-<p>The memory consumed by VTTablet depends on QPS and result size, but you can start off with the rule of thumb of requesting 1 GB/CPU.</p>
-
-<p>As for VTGate, double the total number of CPUs you’ve allocated for VTTablet. That should be approximately how much the VTGates are expected to consume. In terms of memory, you should again budget about 1 GB/CPU (needs verification).</p>
-
-<p>Vitess servers will use disk space for their logs. A smoothly running server should create very little log spam. However, log files can grow big very quickly if there are too many errors. It will be wise to run a log purger daemon if you’re concerned about filling up disk.</p>
-
-<p>Vitess servers are also likely to add about 2 ms of round-trip latency per MySQL call. This may result in some hidden costs that may or may not be negligible. On the app side, if a significant time is spent making database calls, then you may have to run additional threads or workers to compensate for the delay, which may result in additional memory requirements.</p>
-
-<p>The client driver CPU usage may be different from a normal MySQL driver. That may require you to allocate more CPU per app thread.</p>
-
-<p>On the server side, this could result in longer running transactions, which could weigh down MySQL.</p>
-
-<p>With the above numbers as starting point, the next step will be to set up benchmarks that generate production representative load. If you cannot afford this luxury, you may have to go into production with some over-provisioning, just in case.</p>
-
-<h3 id="mapping-topology-to-hardware">Mapping topology to hardware</h3>
-
-<p>The different Vitess components have different resource requirements e.g. vtgate requires little disk in comparison to vttablet. Therefore, the components should be mapped to different machine classes for optimal resource usage. If you’re using a cluster manager (such as Kubernetes), the automatic scheduler will do this for you. Otherwise, you have to allocate physical machines and plan out how you’re going to map servers onto them.</p>
-
-<p>Machine classes needed:</p>
-
-<h4 id="mysql-vttablet">MySQL + vttablet</h4>
-
-<p>You’ll need database-class machines that are likely to have SSDs, and enough RAM to fit the MySQL working set in buffer cache. Make sure that there will be sufficient CPU left for VTTablet to run on them.</p>
-
-<p>The VTTablet provisioning will be dictated by the MySQL instances they run against. However, soon after launch, it’s recommended to shard these instances to a data size of 100-300 GB. This should also typically reduce the per-MySQL CPU usage to around 2-4 CPUS depending on the load pattern.</p>
-
-<h4 id="vtgate">VTGate</h4>
-
-<p>For VTGates, you’ll need a class of machines that would be CPU heavy, but may be light on memory usage, and should require normal hard disks, for binary and logs only.</p>
-
-<p>It’s advisable to run more instances than there are machines. VTGates are happiest when they’re consuming between 2-4 CPUs. So, if your total requirement was 400 CPUs, and your VTGate class machine has 48 cores each, you’ll need about 10 such machines and you’ll be running about 10 VTGates per box.</p>
-
-<p>You may have to add a few more app class machines to absorb any additional CPU and latency overheads.</p>
-
-<h2 id="lock-service-setup">Lock service setup</h2>
-
-<p>The Lock Service should be running, and both the global and local instances
-should be up. See the
-<a href="/user-guide/topology-service.html">Topology Service</a>
-document for more information.</p>
-
-<p>Each lock service implementation supports a couple configuration command line
-parameters, they need to be specified for each Vitess process.</p>
-
-<p>For sizing purposes, the Vitess processes do not access the lock service very
-much. Each <em>vtgate</em> process keeps a few watches on a few local nodes (VSchema
-and SrvKeyspace). Each <em>vttablet</em> process will keep its on Tablet record up to
-date, but it usually doesn&#39;t change. The <em>vtctld</em> process will access it a lot
-more, but only on demand to display web pages.</p>
-
-<p>As mentioned previously, if the setup is only in one cell, the global and local
-instances can be combined. Just use different top-level directories.</p>
-
-<h2 id="production-testing">Production testing</h2>
-
-<p>Before running Vitess in production, please make yourself comfortable first with the different operations. We recommend to go through the following scenarios on a non-production system.</p>
-
-<p>Here is a short list of all the basic workflows Vitess supports:</p>
-
-<ul>
-<li><a href="http://vitess.io/user-guide/reparenting.html">Failover / Reparents</a></li>
-<li><a href="http://vitess.io/user-guide/backup-and-restore.html">Backup/Restore</a></li>
-<li><a href="http://vitess.io/user-guide/schema-management.html">Schema Management</a> / <a href="http://vitess.io/user-guide/schema-swap.html">Schema Swap</a></li>
-<li><a href="http://vitess.io/user-guide/sharding.html">Resharding</a> / <a href="http://vitess.io/user-guide/horizontal-sharding.html">Horizontal Resharding Tutorial</a></li>
-<li><a href="http://vitess.io/user-guide/upgrading.html">Upgrading</a></li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/production-planning/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/production-planning/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/production-planning/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/production-planning/"</script>
 </html>
diff --git a/docs/user-guide/production-planning/index.html b/docs/user-guide/production-planning/index.html
new file mode 100644
index 00000000000..2cd42b06a79
--- /dev/null
+++ b/docs/user-guide/production-planning/index.html
@@ -0,0 +1,423 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Production Planning | Vitess</title>
+<meta property="og:title" content="Production Planning" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/production-planning/" />
+<meta property="og:url" content="http://vitess.io/user-guide/production-planning/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/production-planning/","headline":"Production Planning","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Production Planning</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h2 id="provisioning">Provisioning</h2>
+
+<h3 id="estimating-total-resources">Estimating total resources</h3>
+
+<p>Although Vitess helps you scale indefinitely, the various layers do consume CPU and memory. Currently, the cost of Vitess servers is dominated by the RPC framework which we use: gRPC (gRPC is a relatively young product). So, Vitess servers are expected to get more efficient over time as there are improvements in gRPC as well as the Go runtime. For now, you can use the following rules of thumb to budget resources for Vitess:</p>
+
+<p>Every MySQL instance that serves traffic requires one VTTablet, which is in turn expected to consume an equal amount of CPU. So, if MySQL consumes 8 CPUs, VTTablet is likely going to consume another 8.</p>
+
+<p>The memory consumed by VTTablet depends on QPS and result size, but you can start off with the rule of thumb of requesting 1 GB/CPU.</p>
+
+<p>As for VTGate, double the total number of CPUs you’ve allocated for VTTablet. That should be approximately how much the VTGates are expected to consume. In terms of memory, you should again budget about 1 GB/CPU (needs verification).</p>
+
+<p>Vitess servers will use disk space for their logs. A smoothly running server should create very little log spam. However, log files can grow big very quickly if there are too many errors. It will be wise to run a log purger daemon if you’re concerned about filling up disk.</p>
+
+<p>Vitess servers are also likely to add about 2 ms of round-trip latency per MySQL call. This may result in some hidden costs that may or may not be negligible. On the app side, if a significant time is spent making database calls, then you may have to run additional threads or workers to compensate for the delay, which may result in additional memory requirements.</p>
+
+<p>The client driver CPU usage may be different from a normal MySQL driver. That may require you to allocate more CPU per app thread.</p>
+
+<p>On the server side, this could result in longer running transactions, which could weigh down MySQL.</p>
+
+<p>With the above numbers as starting point, the next step will be to set up benchmarks that generate production representative load. If you cannot afford this luxury, you may have to go into production with some over-provisioning, just in case.</p>
+
+<h3 id="mapping-topology-to-hardware">Mapping topology to hardware</h3>
+
+<p>The different Vitess components have different resource requirements e.g. vtgate requires little disk in comparison to vttablet. Therefore, the components should be mapped to different machine classes for optimal resource usage. If you’re using a cluster manager (such as Kubernetes), the automatic scheduler will do this for you. Otherwise, you have to allocate physical machines and plan out how you’re going to map servers onto them.</p>
+
+<p>Machine classes needed:</p>
+
+<h4 id="mysql-vttablet">MySQL + vttablet</h4>
+
+<p>You’ll need database-class machines that are likely to have SSDs, and enough RAM to fit the MySQL working set in buffer cache. Make sure that there will be sufficient CPU left for VTTablet to run on them.</p>
+
+<p>The VTTablet provisioning will be dictated by the MySQL instances they run against. However, soon after launch, it’s recommended to shard these instances to a data size of 100-300 GB. This should also typically reduce the per-MySQL CPU usage to around 2-4 CPUS depending on the load pattern.</p>
+
+<h4 id="vtgate">VTGate</h4>
+
+<p>For VTGates, you’ll need a class of machines that would be CPU heavy, but may be light on memory usage, and should require normal hard disks, for binary and logs only.</p>
+
+<p>It’s advisable to run more instances than there are machines. VTGates are happiest when they’re consuming between 2-4 CPUs. So, if your total requirement was 400 CPUs, and your VTGate class machine has 48 cores each, you’ll need about 10 such machines and you’ll be running about 10 VTGates per box.</p>
+
+<p>You may have to add a few more app class machines to absorb any additional CPU and latency overheads.</p>
+
+<h2 id="lock-service-setup">Lock service setup</h2>
+
+<p>The Lock Service should be running, and both the global and local instances
+should be up. See the
+<a href="/user-guide/topology-service/">Topology Service</a>
+document for more information.</p>
+
+<p>Each lock service implementation supports a couple configuration command line
+parameters, they need to be specified for each Vitess process.</p>
+
+<p>For sizing purposes, the Vitess processes do not access the lock service very
+much. Each <em>vtgate</em> process keeps a few watches on a few local nodes (VSchema
+and SrvKeyspace). Each <em>vttablet</em> process will keep its on Tablet record up to
+date, but it usually doesn&#39;t change. The <em>vtctld</em> process will access it a lot
+more, but only on demand to display web pages.</p>
+
+<p>As mentioned previously, if the setup is only in one cell, the global and local
+instances can be combined. Just use different top-level directories.</p>
+
+<h2 id="production-testing">Production testing</h2>
+
+<p>Before running Vitess in production, please make yourself comfortable first with the different operations. We recommend to go through the following scenarios on a non-production system.</p>
+
+<p>Here is a short list of all the basic workflows Vitess supports:</p>
+
+<ul>
+<li><a href="/user-guide/reparenting/">Failover / Reparents</a></li>
+<li><a href="/user-guide/backup-and-restore/">Backup/Restore</a></li>
+<li><a href="/user-guide/schema-management/">Schema Management</a> / <a href="/user-guide/schema-swap/">Schema Swap</a></li>
+<li><a href="/user-guide/sharding/">Resharding</a> / <a href="/user-guide/horizontal-sharding/">Horizontal Resharding Tutorial</a></li>
+<li><a href="/user-guide/upgrading/">Upgrading</a></li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/reparenting.html b/docs/user-guide/reparenting.html
index bac8914c5ef..87fb095d822 100644
--- a/docs/user-guide/reparenting.html
+++ b/docs/user-guide/reparenting.html
@@ -1,549 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Reparenting</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Reparenting"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Reparenting</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p><strong>Reparenting</strong> is the process of changing a shard&#39;s master tablet
-from one host to another or changing a slave tablet to have a
-different master. Reparenting can be initiated manually
-or it can occur automatically in response to particular database
-conditions. As examples, you might reparent a shard or tablet during
-a maintenance exercise or automatically trigger reparenting when
-a master tablet dies.</p>
-
-<p>This document explains the types of reparenting that Vitess supports:</p>
-
-<ul>
-<li><em><a href="#active-reparenting">Active reparenting</a></em> occurs when the Vitess
-toolchain manages the entire reparenting process.</li>
-<li><em><a href="#external-reparenting">External reparenting</a></em> occurs when another tool
-handles the reparenting process, and the Vitess toolchain just updates its
-topology server, replication graph, and serving graph to accurately reflect
-master-slave relationships.</li>
-</ul>
-
-<p><strong>Note:</strong> The <code>InitShardMaster</code> command defines the initial
-parenting relationships within a shard. That command makes the specified
-tablet the master and makes the other tablets in the shard slaves that
-replicate from that master.</p>
-
-<h2 id="mysql-requirements">MySQL requirements</h2>
-
-<p>Vitess supports <a href="https://dev.mysql.com/doc/refman/5.6/en/replication-gtids-howto.html">MySQL 5.6</a>, <a href="https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-howto.html">MySQL 5.7</a> and <a href="https://mariadb.com/kb/en/mariadb/global-transaction-id/">MariaDB 10.0</a> implementations.</p>
-
-<h3 id="gtids">GTIDs</h3>
-
-<p>Vitess requires the use of global transaction identifiers
-(<a href="https://dev.mysql.com/doc/refman/5.6/en/replication-gtids-concepts.html">GTIDs</a>) for its operations:</p>
-
-<ul>
-<li>During active reparenting, Vitess uses GTIDs to initialize the
-replication process and then depends on the GTID stream to be
-correct when reparenting. (During external reparenting, Vitess
-assumes the external tool manages the replication process.)</li>
-<li>During resharding, Vitess uses GTIDs for
-<a href="/user-guide/sharding.html#filtered-replication">filtered replication</a>,
-the process by which source tablet data is transferred to the proper
-destination tablets.</li>
-</ul>
-
-<h3 id="semisynchronous-replication">Semisynchronous replication</h3>
-
-<p>Vitess does not depend on
-<a href="https://dev.mysql.com/doc/refman/5.6/en/replication-semisync.html">semisynchronous replication</a> but does work if it is implemented.
-Larger Vitess deployments typically do implement semisynchronous replication.</p>
-
-<h2 id="active-reparenting">Active Reparenting</h2>
-
-<p>You can use the following <code><a href="/reference/vtctl.html">vtctl</a></code>
-commands to perform reparenting operations:</p>
-
-<ul>
-<li><code><a href="#plannedreparentshard:-planned-reparenting">PlannedReparentShard</a></code></li>
-<li><code><a href="#emergencyreparentshard:-emergency-reparenting">EmergencyReparentShard</a></code></li>
-</ul>
-
-<p>Both commands lock the shard for write operations. The two commands
-cannot run in parallel, nor can either command run in parallel with the
-<code><a href="/reference/vtctl.html#initshardmaster">InitShardMaster</a></code>
-command.</p>
-
-<p>The two commands are both dependent on the global topology server being
-available, and they both insert rows in the topology server&#39;s
-<code>_vt.reparent_journal</code> table. As such, you can review
-your database&#39;s reparenting history by inspecting that table.</p>
-
-<h3 id="plannedreparentshard-planned-reparenting">PlannedReparentShard: Planned reparenting</h3>
-
-<p>The <code>PlannedReparentShard</code> command reparents a healthy master
-tablet to a new master. The current and new master must both be up and
-running.</p>
-
-<p>This command performs the following actions:</p>
-
-<ol>
-<li>Puts the current master tablet in read-only mode.</li>
-<li>Shuts down the current master&#39;s query service, which is the part of
-the system that handles user SQL queries. At this point, Vitess does
-not handle any user SQL queries until the new master is configured
-and can be used a few seconds later.</li>
-<li>Retrieves the current master&#39;s replication position.</li>
-<li>Instructs the master-elect tablet to wait for replication data and
-then begin functioning as the new master after that data is fully
-transferred.</li>
-<li>Ensures replication is functioning properly via the following steps:
-
-<ol>
-<li> On the master-elect tablet, insert an entry in a test table
-and then update the global <code>Shard</code> object&#39;s
-<code>MasterAlias</code> record.</li>
-<li> In parallel on each slave, including the old master, set the new
-master and wait for the test entry to replicate to the slave tablet.
-(Slave tablets that had not been replicating before the command was
-called are left in their current state and do not start replication
-after the reparenting process.)</li>
-<li> Start replication on the old master tablet so it catches up to the
-new master.</li>
-</ol></li>
-</ol>
-
-<p>In this scenario, the old master&#39;s tablet type transitions to
-<code>spare</code>. If health checking is enabled on the old master,
-it will likely rejoin the cluster as a replica on the next health
-check. To enable health checking, set the
-<code>target_tablet_type</code> parameter when starting a tablet.
-That parameter indicates what type of tablet that tablet tries to be
-when healthy. When it is not healthy, the tablet type changes to
-<code>spare</code>.</p>
-
-<h3 id="emergencyreparentshard-emergency-reparenting">EmergencyReparentShard: Emergency reparenting</h3>
-
-<p>The <code>EmergencyReparentShard</code> command is used to force
-a reparent to a new master when the current master is unavailable.
-The command assumes that data cannot be retrieved from the current
-master because it is dead or not working properly.</p>
-
-<p>As such, this command does not rely on the current master at all 
-to replicate data to the new master. Instead, it makes sure that
-the master-elect is the most advanced in replication within all
-of the available slaves.</p>
-
-<p><strong>Important:</strong> Before calling this command, you must first identify
-the slave with the most advanced replication position as that slave
-must be designated as the new master. You can use the 
-<code><a href="/reference/vtctl.html#shardreplicationpositions">vtctl ShardReplicationPositions</a></code>
-command to determine the current replication positions of a shard&#39;s slaves.</p>
-
-<p>This command performs the following actions:</p>
-
-<ol>
-<li>Determines the current replication position on all of the slave
-tablets and confirms that the master-elect tablet has the most
-advanced replication position.</li>
-<li>Promotes the master-elect tablet to be the new master. In addition to
-changing its tablet type to <code>master</code>, the master-elect
-performs any other changes that might be required for its new state.</li>
-<li>Ensures replication is functioning properly via the following steps:
-
-<ol>
-<li> On the master-elect tablet, Vitess inserts an entry in a test table
-and then updates the <code>MasterAlias</code> record of the global
-<code>Shard</code> object.</li>
-<li> In parallel on each slave, excluding the old master, Vitess sets the
-master and waits for the test entry to replicate to the slave tablet.
-(Slave tablets that had not been replicating before the command was
-called are left in their current state and do not start replication
-after the reparenting process.)</li>
-</ol></li>
-</ol>
-
-<h2 id="external-reparenting">External Reparenting</h2>
-
-<p>External reparenting occurs when another tool handles the process
-of changing a shard&#39;s master tablet. After that occurs, the tool
-needs to call the
-<code><a href="/reference/vtctl.html#tabletexternallyreparented">vtctl TabletExternallyReparented</a></code>
-command to ensure that the topology server, replication graph, and serving
-graph are updated accordingly.</p>
-
-<p>That command performs the following operations:</p>
-
-<ol>
-<li>Locks the shard in the global topology server.</li>
-<li>Reads the <code>Shard</code> object from the global topology server.</li>
-<li>Reads all of the tablets in the replication graph for the shard.
-Vitess does allow partial reads in this step, which means that Vitess
-will proceed even if a data center is down as long as the data center
-containing the new master is available.</li>
-<li>Ensures that the new master&#39;s state is updated correctly and that the
-new master is not a MySQL slave of another server. It runs the MySQL
-<code>show slave status</code> command, ultimately aiming to confirm
-that the MySQL <code>reset slave</code> command already executed on
-the tablet.</li>
-<li>Updates, for each slave, the topology server record and replication
-graph to reflect the new master. If the old master does not return
-successfully in this step, Vitess changes its tablet type to
-<code>spare</code> to ensure that it does not interfere with ongoing
-operations.</li>
-<li>Updates the <code>Shard</code> object to specify the new master.</li>
-</ol>
-
-<p>The <code>TabletExternallyReparented</code> command fails in the following
-cases:</p>
-
-<ul>
-<li>The global topology server is not available for locking and
-modification. In that case, the operation fails completely.</li>
-</ul>
-
-<p>Active reparenting might be a dangerous practice in any system
-that depends on external reparents. You can disable active reparents
-by starting <code>vtctld</code> with the
-<code>--disable_active_reparents</code> flag set to <code>true</code>.
-(You cannot set the flag after <code>vtctld</code> is started.)</p>
-
-<h2 id="fixing-replication">Fixing Replication</h2>
-
-<p>A tablet can be orphaned after a reparenting if it is unavailable
-when the reparent operation is running but then recovers later on.
-In that case, you can manually reset the tablet&#39;s master to the
-current shard master using the
-<code><a href="/reference/vtctl.html#reparenttablet">vtctl ReparentTablet</a></code>
-command. You can then restart replication on the tablet if it was stopped
-by calling the <code><a href="/reference/vtctl.html#startslave">vtctl StartSlave</a></code>
-command.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/reparenting/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/reparenting/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/reparenting/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/reparenting/"</script>
 </html>
diff --git a/docs/user-guide/reparenting/index.html b/docs/user-guide/reparenting/index.html
new file mode 100644
index 00000000000..ade3f4f9a20
--- /dev/null
+++ b/docs/user-guide/reparenting/index.html
@@ -0,0 +1,558 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Reparenting | Vitess</title>
+<meta property="og:title" content="Reparenting" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/reparenting/" />
+<meta property="og:url" content="http://vitess.io/user-guide/reparenting/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/reparenting/","headline":"Reparenting","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Reparenting</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p><strong>Reparenting</strong> is the process of changing a shard&#39;s master tablet
+from one host to another or changing a slave tablet to have a
+different master. Reparenting can be initiated manually
+or it can occur automatically in response to particular database
+conditions. As examples, you might reparent a shard or tablet during
+a maintenance exercise or automatically trigger reparenting when
+a master tablet dies.</p>
+
+<p>This document explains the types of reparenting that Vitess supports:</p>
+
+<ul>
+<li><em><a href="#active-reparenting">Active reparenting</a></em> occurs when the Vitess
+toolchain manages the entire reparenting process.</li>
+<li><em><a href="#external-reparenting">External reparenting</a></em> occurs when another tool
+handles the reparenting process, and the Vitess toolchain just updates its
+topology server, replication graph, and serving graph to accurately reflect
+master-slave relationships.</li>
+</ul>
+
+<p><strong>Note:</strong> The <code>InitShardMaster</code> command defines the initial
+parenting relationships within a shard. That command makes the specified
+tablet the master and makes the other tablets in the shard slaves that
+replicate from that master.</p>
+
+<h2 id="mysql-requirements">MySQL requirements</h2>
+
+<p>Vitess supports <a href="https://dev.mysql.com/doc/refman/5.6/en/replication-gtids-howto.html">MySQL 5.6</a>, <a href="https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-howto.html">MySQL 5.7</a> and <a href="https://mariadb.com/kb/en/mariadb/global-transaction-id/">MariaDB 10.0</a> implementations.</p>
+
+<h3 id="gtids">GTIDs</h3>
+
+<p>Vitess requires the use of global transaction identifiers
+(<a href="https://dev.mysql.com/doc/refman/5.6/en/replication-gtids-concepts.html">GTIDs</a>) for its operations:</p>
+
+<ul>
+<li>During active reparenting, Vitess uses GTIDs to initialize the
+replication process and then depends on the GTID stream to be
+correct when reparenting. (During external reparenting, Vitess
+assumes the external tool manages the replication process.)</li>
+<li>During resharding, Vitess uses GTIDs for
+<a href="/user-guide/sharding/#filtered-replication">filtered replication</a>,
+the process by which source tablet data is transferred to the proper
+destination tablets.</li>
+</ul>
+
+<h3 id="semisynchronous-replication">Semisynchronous replication</h3>
+
+<p>Vitess does not depend on
+<a href="https://dev.mysql.com/doc/refman/5.6/en/replication-semisync.html">semisynchronous replication</a> but does work if it is implemented.
+Larger Vitess deployments typically do implement semisynchronous replication.</p>
+
+<h2 id="active-reparenting">Active Reparenting</h2>
+
+<p>You can use the following <code><a href="/reference/vtctl/">vtctl</a></code>
+commands to perform reparenting operations:</p>
+
+<ul>
+<li><code><a href="#plannedreparentshard:-planned-reparenting">PlannedReparentShard</a></code></li>
+<li><code><a href="#emergencyreparentshard:-emergency-reparenting">EmergencyReparentShard</a></code></li>
+</ul>
+
+<p>Both commands lock the shard for write operations. The two commands
+cannot run in parallel, nor can either command run in parallel with the
+<code><a href="/reference/vtctl/#initshardmaster">InitShardMaster</a></code>
+command.</p>
+
+<p>The two commands are both dependent on the global topology server being
+available, and they both insert rows in the topology server&#39;s
+<code>_vt.reparent_journal</code> table. As such, you can review
+your database&#39;s reparenting history by inspecting that table.</p>
+
+<h3 id="plannedreparentshard-planned-reparenting">PlannedReparentShard: Planned reparenting</h3>
+
+<p>The <code>PlannedReparentShard</code> command reparents a healthy master
+tablet to a new master. The current and new master must both be up and
+running.</p>
+
+<p>This command performs the following actions:</p>
+
+<ol>
+<li>Puts the current master tablet in read-only mode.</li>
+<li>Shuts down the current master&#39;s query service, which is the part of
+the system that handles user SQL queries. At this point, Vitess does
+not handle any user SQL queries until the new master is configured
+and can be used a few seconds later.</li>
+<li>Retrieves the current master&#39;s replication position.</li>
+<li>Instructs the master-elect tablet to wait for replication data and
+then begin functioning as the new master after that data is fully
+transferred.</li>
+<li>Ensures replication is functioning properly via the following steps:
+
+<ol>
+<li> On the master-elect tablet, insert an entry in a test table
+and then update the global <code>Shard</code> object&#39;s
+<code>MasterAlias</code> record.</li>
+<li> In parallel on each slave, including the old master, set the new
+master and wait for the test entry to replicate to the slave tablet.
+(Slave tablets that had not been replicating before the command was
+called are left in their current state and do not start replication
+after the reparenting process.)</li>
+<li> Start replication on the old master tablet so it catches up to the
+new master.</li>
+</ol></li>
+</ol>
+
+<p>In this scenario, the old master&#39;s tablet type transitions to
+<code>spare</code>. If health checking is enabled on the old master,
+it will likely rejoin the cluster as a replica on the next health
+check. To enable health checking, set the
+<code>target_tablet_type</code> parameter when starting a tablet.
+That parameter indicates what type of tablet that tablet tries to be
+when healthy. When it is not healthy, the tablet type changes to
+<code>spare</code>.</p>
+
+<h3 id="emergencyreparentshard-emergency-reparenting">EmergencyReparentShard: Emergency reparenting</h3>
+
+<p>The <code>EmergencyReparentShard</code> command is used to force
+a reparent to a new master when the current master is unavailable.
+The command assumes that data cannot be retrieved from the current
+master because it is dead or not working properly.</p>
+
+<p>As such, this command does not rely on the current master at all 
+to replicate data to the new master. Instead, it makes sure that
+the master-elect is the most advanced in replication within all
+of the available slaves.</p>
+
+<p><strong>Important:</strong> Before calling this command, you must first identify
+the slave with the most advanced replication position as that slave
+must be designated as the new master. You can use the 
+<code><a href="/reference/vtctl/#shardreplicationpositions">vtctl ShardReplicationPositions</a></code>
+command to determine the current replication positions of a shard&#39;s slaves.</p>
+
+<p>This command performs the following actions:</p>
+
+<ol>
+<li>Determines the current replication position on all of the slave
+tablets and confirms that the master-elect tablet has the most
+advanced replication position.</li>
+<li>Promotes the master-elect tablet to be the new master. In addition to
+changing its tablet type to <code>master</code>, the master-elect
+performs any other changes that might be required for its new state.</li>
+<li>Ensures replication is functioning properly via the following steps:
+
+<ol>
+<li> On the master-elect tablet, Vitess inserts an entry in a test table
+and then updates the <code>MasterAlias</code> record of the global
+<code>Shard</code> object.</li>
+<li> In parallel on each slave, excluding the old master, Vitess sets the
+master and waits for the test entry to replicate to the slave tablet.
+(Slave tablets that had not been replicating before the command was
+called are left in their current state and do not start replication
+after the reparenting process.)</li>
+</ol></li>
+</ol>
+
+<h2 id="external-reparenting">External Reparenting</h2>
+
+<p>External reparenting occurs when another tool handles the process
+of changing a shard&#39;s master tablet. After that occurs, the tool
+needs to call the
+<code><a href="/reference/vtctl/#tabletexternallyreparented">vtctl TabletExternallyReparented</a></code>
+command to ensure that the topology server, replication graph, and serving
+graph are updated accordingly.</p>
+
+<p>That command performs the following operations:</p>
+
+<ol>
+<li>Locks the shard in the global topology server.</li>
+<li>Reads the <code>Shard</code> object from the global topology server.</li>
+<li>Reads all of the tablets in the replication graph for the shard.
+Vitess does allow partial reads in this step, which means that Vitess
+will proceed even if a data center is down as long as the data center
+containing the new master is available.</li>
+<li>Ensures that the new master&#39;s state is updated correctly and that the
+new master is not a MySQL slave of another server. It runs the MySQL
+<code>show slave status</code> command, ultimately aiming to confirm
+that the MySQL <code>reset slave</code> command already executed on
+the tablet.</li>
+<li>Updates, for each slave, the topology server record and replication
+graph to reflect the new master. If the old master does not return
+successfully in this step, Vitess changes its tablet type to
+<code>spare</code> to ensure that it does not interfere with ongoing
+operations.</li>
+<li>Updates the <code>Shard</code> object to specify the new master.</li>
+</ol>
+
+<p>The <code>TabletExternallyReparented</code> command fails in the following
+cases:</p>
+
+<ul>
+<li>The global topology server is not available for locking and
+modification. In that case, the operation fails completely.</li>
+</ul>
+
+<p>Active reparenting might be a dangerous practice in any system
+that depends on external reparents. You can disable active reparents
+by starting <code>vtctld</code> with the
+<code>--disable_active_reparents</code> flag set to <code>true</code>.
+(You cannot set the flag after <code>vtctld</code> is started.)</p>
+
+<h2 id="fixing-replication">Fixing Replication</h2>
+
+<p>A tablet can be orphaned after a reparenting if it is unavailable
+when the reparent operation is running but then recovers later on.
+In that case, you can manually reset the tablet&#39;s master to the
+current shard master using the
+<code><a href="/reference/vtctl/#reparenttablet">vtctl ReparentTablet</a></code>
+command. You can then restart replication on the tablet if it was stopped
+by calling the <code><a href="/reference/vtctl/#startslave">vtctl StartSlave</a></code>
+command.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/row-based-replication.html b/docs/user-guide/row-based-replication.html
index 1efdf03fd30..3221505d05e 100644
--- a/docs/user-guide/row-based-replication.html
+++ b/docs/user-guide/row-based-replication.html
@@ -1,509 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Row Based Replication</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Row Based Replication"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Row Based Replication</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="row-based-replication">Row Based Replication</h1>
-
-<p>In Vitess 2.2, we are adding preliminary support for Row Based Replication. This
-document explains how we are managing it and how it affects various Vitess
-features.</p>
-
-<p>See the <a href="/user-guide/vitess-replication.html">Vites and Replication</a> document
-for an introduction on various types of replication and how it affects Vitess.</p>
-
-<h2 id="mysql-row-based-replication">MySQL Row Based Replication</h2>
-
-<p>With Row Based replication, a more compact binary version of the rows affected
-are sent through the replication stream, instead of the SQL statements. The
-slaves then do not spend any time parsing the SQL, or performing any complex SQL
-operations (like <code class="prettyprint">where</code> clauses). They can just apply the new rows directly.</p>
-
-<p>A few binlog events are used:</p>
-
-<ul>
-<li><p>Table Map event: describes a table that is affected by the next
-events. Contains the database and table name, the number of columns, and the
-Type for each column. It does not contain the individual column names, nor the
-flags for each column (so it is impossible to differentiate signed vs unsigned
-integers for instance).</p></li>
-<li><p>Write Rows: equivalent of Insert.</p></li>
-<li><p>Update Rows: change the values of some rows.</p></li>
-<li><p>Delete Rows: delete the provided rows.</p></li>
-</ul>
-
-<p>The
-<a href="https://dev.mysql.com/doc/refman/5.7/en/replication-options-binary-log.html#sysvar_binlog_row_image"><code class="prettyprint">binlog-row-image</code> option</a> can
-be used to control which rows are used to identify the columns for the Update
-and Delete Rows events. The default setting for that option is to log all
-columns.</p>
-
-<h2 id="vitess-use-of-mysql-replication-stream">Vitess Use of MySQL Replication Stream</h2>
-
-<p>Vitess uses the Replication Stream in a number of places. This part explains how
-we use RBR for these.</p>
-
-<h3 id="vttablet-replication-stream-watcher">vttablet Replication Stream Watcher</h3>
-
-<p>This is enabled by the <code class="prettyprint">watch_replication_stream</code> option, and is used
-by <a href="/user-guide/update-stream.html">Update Stream</a>. It only cares about the
-GTIDs for the events, so it is unaffected by the use of RBR.</p>
-
-<p><em>Note</em>: the current vttablet also reloads the schema when it sees a DDL in the
-stream. See below for more information on this. DDLs are however not represented
-in RBR, so this is an orthogonal issue.</p>
-
-<h3 id="update-stream">Update Stream</h3>
-
-<p>The current implementation uses comments in the original SQL (in SQR) to provide
-the primary key of the column that is being changed.</p>
-
-<p>We are changing this to also parse the RBR events, and extract the primary key
-value.</p>
-
-<p><em>Note</em>: this means we need accurate schema information. See below.</p>
-
-<h3 id="filtered-replication">Filtered Replication</h3>
-
-<p>This is used during horizontal and vertical resharding, to keep source and
-destination shards up to date.</p>
-
-<p>We need to transform the RBR events into SQL statements, filter them based
-either on keyspace_id (horizontal resharding) or table name (vertical
-resharding), and apply them.</p>
-
-<p>For horizontal splits, we need to understand the VSchema to be able to find the
-primary VIndex used for sharding.</p>
-
-<p><em>Note</em>: this again means we need accurate schema information. We could do one of
-two things:</p>
-
-<ul>
-<li><p>Send all statements to all destination shards, and let them do the
-filtering. They can have accurate schema information if they receive and apply
-all schema changes through Filtered Replication.</p></li>
-<li><p>Have the filtering be done on the stream server side, and assume the schema
-doesn&#39;t change in incompatible ways. As this is simpler for now, that&#39;s the
-option we&#39;re going with.</p></li>
-</ul>
-
-<h2 id="database-schema-considerations">Database Schema Considerations</h2>
-
-<h3 id="interpreting-rbr-events">Interpreting RBR Events</h3>
-
-<p>A lot of the work to interpret RBR events correctly requires knowledge of the
-table&#39;s schema. However, this introduces the possibility of inconsistencies
-during schema changes: the current schema for a table might be newer than the
-schema an older replication stream event was using.</p>
-
-<p>For the short term, Vitess will not deal very gracefully with this scenario: we
-will only support the case where the current schema for a table has exactly the
-same columns as all events in the binlog, plus some other optional columns that
-are then unused. That way, it is possible to add columns to tables without
-breaking anything.</p>
-
-<p>Note if the main use case is Filtered Replicaiton for resharding, this
-limitation only exists while the resharding process is running. It is somewhat
-easy to not change the schema at the same time as resharding is on-going.</p>
-
-<h3 id="applying-schema-changes">Applying Schema Changes</h3>
-
-<p>When using
-RBR, <a href="/user-guide/vitess-replication.html#vitess-schema-swap">Schema Swap</a>
-becomes useless, as replication between hosts with different schemas will most
-likely break. This is however an existing limitation that is already known and
-handled by MySQL DBAs.</p>
-
-<p>Vitess at this point does not provide an integrated way of applying involved
-schema changes through RBR. A number of external tools however already exist to
-handle this case, like <a href="https://github.com/github/gh-ost">gh-ost</a>.</p>
-
-<p>We have future plans to:</p>
-
-<ul>
-<li><p>Integrate with a tool like gh-ost to provide a seamless schema change story.</p></li>
-<li><p>Maintain a history of the schema changes that happen on all shards, so events
-can be parsed correctly in all cases.</p></li>
-</ul>
-
-<h2 id="unsupported-features">Unsupported Features</h2>
-
-<p>This part describes the features that are not supported for RBR in Vitess as of
-March 2017:</p>
-
-<ul>
-<li><p><em>Fractional timestamps for MariaDB</em>: not supported. This affects the objects
-of type <code class="prettyprint">TIMESTAMP</code>, <code class="prettyprint">TIME</code> and <code class="prettyprint">DATETIME</code>. The way that feature is
-implemented in MariaDB, the binary logs do not contain enough information to
-be parsed, but instead MariaDB relies on the schema knowledge. This is very
-fragile. MySQL 5.6+ added new data types, and these are supported.</p></li>
-<li><p><em>JSON type in MySQL 5.7+</em>: the representation of these in the binlogs is a
-blob containing indexed binary data. Re-building the SQL version of the data,
-so it can be re-inserted during resharding, is not supported yet. It wouldn&#39;t
-however be a lot of work, with other libraries also supporting this, and the
-C++ MySQL code being well written and easy to read. See for instance
-<a href="https://github.com/shyiko/mysql-binlog-connector-java/pull/119">https://github.com/shyiko/mysql-binlog-connector-java/pull/119</a></p></li>
-<li><p><em>Timezones support</em>: the binary logs store timestamps in UTC. When converting
-these to SQL, we print the UTC value. If the server is not in UTC, that will
-result in data corruption. <em>Note</em>: we are working on a fix for that one.</p></li>
-</ul>
-
-<h2 id="update-stream-extensions">Update Stream Extensions</h2>
-
-<p><a href="/user-guide/update-stream.html">Update Stream</a> can be changed to contain both
-old and new values of the rows being changed. Again the values will depend on
-the schema. We will also make this feature optional, so if the client is using
-this for Primary Key based cache invalidation for instance, no extra unneeded
-data is sent.</p>
-
-<p>This can be used to re-populate a cache with Update Stream, instead of
-invalidating it, by putting the new values directly in there.</p>
-
-<p>Then, using this in conjunction with <code class="prettyprint">binlog-row-image</code> would help provide a
-feature-complete way of always getting all changes on rows. It would also help
-handle Update Stream corner cases that replay events during resharding, when
-switching traffic from old to new shards.</p>
-
-<h2 id="vttablet-simplifications">Vttablet Simplifications</h2>
-
-<p>A lot of the work done by vttablet now is to find the Primary Key of the
-modified rows, to rewrite the queries in an efficient way and tag each statement
-with the Primary Key. None of this may be necessary with RBR.</p>
-
-<p>We plan to eventually add a <code class="prettyprint">rbr_mode</code> flag to vttablet to disable all the
-things it can skip if RBR is used.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/row-based-replication/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/row-based-replication/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/row-based-replication/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/row-based-replication/"</script>
 </html>
diff --git a/docs/user-guide/row-based-replication/index.html b/docs/user-guide/row-based-replication/index.html
new file mode 100644
index 00000000000..96ba6949a23
--- /dev/null
+++ b/docs/user-guide/row-based-replication/index.html
@@ -0,0 +1,518 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Row Based Replication | Vitess</title>
+<meta property="og:title" content="Row Based Replication" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/row-based-replication/" />
+<meta property="og:url" content="http://vitess.io/user-guide/row-based-replication/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/row-based-replication/","headline":"Row Based Replication","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Row Based Replication</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="row-based-replication">Row Based Replication</h1>
+
+<p>In Vitess 2.2, we are adding preliminary support for Row Based Replication. This
+document explains how we are managing it and how it affects various Vitess
+features.</p>
+
+<p>See the <a href="/user-guide/vitess-replication/">Vites and Replication</a> document
+for an introduction on various types of replication and how it affects Vitess.</p>
+
+<h2 id="mysql-row-based-replication">MySQL Row Based Replication</h2>
+
+<p>With Row Based replication, a more compact binary version of the rows affected
+are sent through the replication stream, instead of the SQL statements. The
+slaves then do not spend any time parsing the SQL, or performing any complex SQL
+operations (like <code class="prettyprint">where</code> clauses). They can just apply the new rows directly.</p>
+
+<p>A few binlog events are used:</p>
+
+<ul>
+<li><p>Table Map event: describes a table that is affected by the next
+events. Contains the database and table name, the number of columns, and the
+Type for each column. It does not contain the individual column names, nor the
+flags for each column (so it is impossible to differentiate signed vs unsigned
+integers for instance).</p></li>
+<li><p>Write Rows: equivalent of Insert.</p></li>
+<li><p>Update Rows: change the values of some rows.</p></li>
+<li><p>Delete Rows: delete the provided rows.</p></li>
+</ul>
+
+<p>The
+<a href="https://dev.mysql.com/doc/refman/5.7/en/replication-options-binary-log.html#sysvar_binlog_row_image"><code class="prettyprint">binlog-row-image</code> option</a> can
+be used to control which rows are used to identify the columns for the Update
+and Delete Rows events. The default setting for that option is to log all
+columns.</p>
+
+<h2 id="vitess-use-of-mysql-replication-stream">Vitess Use of MySQL Replication Stream</h2>
+
+<p>Vitess uses the Replication Stream in a number of places. This part explains how
+we use RBR for these.</p>
+
+<h3 id="vttablet-replication-stream-watcher">vttablet Replication Stream Watcher</h3>
+
+<p>This is enabled by the <code class="prettyprint">watch_replication_stream</code> option, and is used
+by <a href="/user-guide/update-stream/">Update Stream</a>. It only cares about the
+GTIDs for the events, so it is unaffected by the use of RBR.</p>
+
+<p><em>Note</em>: the current vttablet also reloads the schema when it sees a DDL in the
+stream. See below for more information on this. DDLs are however not represented
+in RBR, so this is an orthogonal issue.</p>
+
+<h3 id="update-stream">Update Stream</h3>
+
+<p>The current implementation uses comments in the original SQL (in SQR) to provide
+the primary key of the column that is being changed.</p>
+
+<p>We are changing this to also parse the RBR events, and extract the primary key
+value.</p>
+
+<p><em>Note</em>: this means we need accurate schema information. See below.</p>
+
+<h3 id="filtered-replication">Filtered Replication</h3>
+
+<p>This is used during horizontal and vertical resharding, to keep source and
+destination shards up to date.</p>
+
+<p>We need to transform the RBR events into SQL statements, filter them based
+either on keyspace_id (horizontal resharding) or table name (vertical
+resharding), and apply them.</p>
+
+<p>For horizontal splits, we need to understand the VSchema to be able to find the
+primary VIndex used for sharding.</p>
+
+<p><em>Note</em>: this again means we need accurate schema information. We could do one of
+two things:</p>
+
+<ul>
+<li><p>Send all statements to all destination shards, and let them do the
+filtering. They can have accurate schema information if they receive and apply
+all schema changes through Filtered Replication.</p></li>
+<li><p>Have the filtering be done on the stream server side, and assume the schema
+doesn&#39;t change in incompatible ways. As this is simpler for now, that&#39;s the
+option we&#39;re going with.</p></li>
+</ul>
+
+<h2 id="database-schema-considerations">Database Schema Considerations</h2>
+
+<h3 id="interpreting-rbr-events">Interpreting RBR Events</h3>
+
+<p>A lot of the work to interpret RBR events correctly requires knowledge of the
+table&#39;s schema. However, this introduces the possibility of inconsistencies
+during schema changes: the current schema for a table might be newer than the
+schema an older replication stream event was using.</p>
+
+<p>For the short term, Vitess will not deal very gracefully with this scenario: we
+will only support the case where the current schema for a table has exactly the
+same columns as all events in the binlog, plus some other optional columns that
+are then unused. That way, it is possible to add columns to tables without
+breaking anything.</p>
+
+<p>Note if the main use case is Filtered Replicaiton for resharding, this
+limitation only exists while the resharding process is running. It is somewhat
+easy to not change the schema at the same time as resharding is on-going.</p>
+
+<h3 id="applying-schema-changes">Applying Schema Changes</h3>
+
+<p>When using
+RBR, <a href="/user-guide/vitess-replication/#vitess-schema-swap">Schema Swap</a>
+becomes useless, as replication between hosts with different schemas will most
+likely break. This is however an existing limitation that is already known and
+handled by MySQL DBAs.</p>
+
+<p>Vitess at this point does not provide an integrated way of applying involved
+schema changes through RBR. A number of external tools however already exist to
+handle this case, like <a href="https://github.com/github/gh-ost">gh-ost</a>.</p>
+
+<p>We have future plans to:</p>
+
+<ul>
+<li><p>Integrate with a tool like gh-ost to provide a seamless schema change story.</p></li>
+<li><p>Maintain a history of the schema changes that happen on all shards, so events
+can be parsed correctly in all cases.</p></li>
+</ul>
+
+<h2 id="unsupported-features">Unsupported Features</h2>
+
+<p>This part describes the features that are not supported for RBR in Vitess as of
+March 2017:</p>
+
+<ul>
+<li><p><em>Fractional timestamps for MariaDB</em>: not supported. This affects the objects
+of type <code class="prettyprint">TIMESTAMP</code>, <code class="prettyprint">TIME</code> and <code class="prettyprint">DATETIME</code>. The way that feature is
+implemented in MariaDB, the binary logs do not contain enough information to
+be parsed, but instead MariaDB relies on the schema knowledge. This is very
+fragile. MySQL 5.6+ added new data types, and these are supported.</p></li>
+<li><p><em>JSON type in MySQL 5.7+</em>: the representation of these in the binlogs is a
+blob containing indexed binary data. Re-building the SQL version of the data,
+so it can be re-inserted during resharding, is not supported yet. It wouldn&#39;t
+however be a lot of work, with other libraries also supporting this, and the
+C++ MySQL code being well written and easy to read. See for instance
+<a href="https://github.com/shyiko/mysql-binlog-connector-java/pull/119">https://github.com/shyiko/mysql-binlog-connector-java/pull/119</a></p></li>
+<li><p><em>Timezones support</em>: the binary logs store timestamps in UTC. When converting
+these to SQL, we print the UTC value. If the server is not in UTC, that will
+result in data corruption. <em>Note</em>: we are working on a fix for that one.</p></li>
+</ul>
+
+<h2 id="update-stream-extensions">Update Stream Extensions</h2>
+
+<p><a href="/user-guide/update-stream/">Update Stream</a> can be changed to contain both
+old and new values of the rows being changed. Again the values will depend on
+the schema. We will also make this feature optional, so if the client is using
+this for Primary Key based cache invalidation for instance, no extra unneeded
+data is sent.</p>
+
+<p>This can be used to re-populate a cache with Update Stream, instead of
+invalidating it, by putting the new values directly in there.</p>
+
+<p>Then, using this in conjunction with <code class="prettyprint">binlog-row-image</code> would help provide a
+feature-complete way of always getting all changes on rows. It would also help
+handle Update Stream corner cases that replay events during resharding, when
+switching traffic from old to new shards.</p>
+
+<h2 id="vttablet-simplifications">Vttablet Simplifications</h2>
+
+<p>A lot of the work done by vttablet now is to find the Primary Key of the
+modified rows, to rewrite the queries in an efficient way and tag each statement
+with the Primary Key. None of this may be necessary with RBR.</p>
+
+<p>We plan to eventually add a <code class="prettyprint">rbr_mode</code> flag to vttablet to disable all the
+things it can skip if RBR is used.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/scalability-philosophy.html b/docs/user-guide/scalability-philosophy.html
index b2040b48fb2..8c6ec883412 100644
--- a/docs/user-guide/scalability-philosophy.html
+++ b/docs/user-guide/scalability-philosophy.html
@@ -1,614 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Scalability Philosophy</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Scalability Philosophy"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Scalability Philosophy</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>Scalability problems can be solved using many approaches. This document describes Vitess’ approach to address these problems.</p>
-
-<h2 id="small-instances">Small instances</h2>
-
-<p>When deciding to shard or break databases up into smaller parts, it’s tempting to break them just enough that they fit in one machine. In the industry, it’s common to run only one MySQL instance per host.</p>
-
-<p>Vitess recommends that instances be broken up to be even smaller, and not to shy away from running multiple instances per host. The net resource usage would be about the same. But the manageability greatly improves when MySQL instances are small. There is the complication of keeping track of ports, and separating the paths for the MySQL instances. However, everything else becomes simpler once this hurdle is crossed.</p>
-
-<p>There are fewer lock contentions to worry about, replication is a lot happier, production impact of outages become smaller, backups and restores run faster, and a lot more secondary advantages can be realized. For example, you can shuffle instances around to get better machine or rack diversity leading to even smaller production impact on outages, and improved resource usage.</p>
-
-<h3 id="cluster-orchestration">Cluster orchestration</h3>
-
-<p>Vitess started on baremetal at YouTube, and some still choose to run it that way.
-But running Vitess in a cluster orchestration system is the key to achieving the
-benefits of small instances without adding management overhead for each new instance.</p>
-
-<p>We provide sample configs to help you <a href="/getting-started/">get started on Kubernetes</a>
-since it&#39;s the most similar to Borg (the <a href="http://blog.kubernetes.io/2015/04/borg-predecessor-to-kubernetes.html">predecessor to Kubernetes</a>
-on which Vitess now runs in YouTube).
-If you&#39;re more familiar with alternatives like Mesos, Swarm, Nomad, or DC/OS,
-we&#39;d welcome your contribution of sample configs for Vitess.</p>
-
-<p>These orchestration systems typically use <a href="https://en.wikipedia.org/wiki/Software_container">containers</a> 
-to isolate small instances so they can be efficiently packed onto machines
-without contention on ports, paths, or compute resources.
-Then an automated scheduler does the job of shuffling instances around for
-failure resilience and optimum utilization.</p>
-
-<h2 id="durability-through-replication">Durability through replication</h2>
-
-<p>Traditional data storage software treated data as durable as soon as it was flushed to disk. However, this approach is impractical in today’s world of commodity hardware. Such an approach also does not address disaster scenarios.</p>
-
-<p>The new approach to durability is achieved by copying the data to multiple machines, and even geographical locations. This form of durability addresses the modern concerns of device failures and disasters.</p>
-
-<p>Many of the workflows in Vitess have been built with this approach in mind. For example, turning on semi-sync replication is highly recommended. This allows Vitess to failover to a new replica when a master goes down, with no data loss. Vitess also recommends that you avoid recovering a crashed database. Instead, create a fresh one from a recent backup and let it catch up.</p>
-
-<p>Relying on replication also allows you to loosen some of the disk-based durability settings. For example, you can turn off sync_binlog, which greatly reduces the number of IOPS to the disk thereby increasing effective throughput.</p>
-
-<h2 id="consistency-model">Consistency model</h2>
-
-<p>Distributing your data has its tradeoffs. Before sharding or moving tables to different keyspaces, the application needs to be verified (or changed) such that it can tolerate the following changes:</p>
-
-<ul>
-<li>Cross-shard reads may not be consistent with each other.</li>
-<li>Cross-shard transactions can fail in the middle and result in partial commits. There is a proposal out to make distributed transactions complete atomically, and on Vitess’ roadmap; however, that is not implemented yet.</li>
-</ul>
-
-<p>Single shard transactions continue to remain ACID, just like MySQL supports it.</p>
-
-<p>If there are read-only code paths that can tolerate slightly stale data, the queries should be sent to REPLICA tablets for OLTP, and RDONLY tablets for OLAP workloads. This allows you to scale your read traffic more easily, and gives you the ability to distribute them geographically.</p>
-
-<p>This tradeoff allows for better throughput at the expense of stale or possible inconsistent reads, since the reads may be lagging behind the master, as data changes (and possibly with varying lag on different shards). To mitigate this, VTGates are capable of monitoring replica lag and can be configured to avoid serving data from instances that are lagging beyond X seconds.</p>
-
-<p>For true snapshot, the queries must be sent to the master within a transaction. For read-after-write consistency, reading from the master without a transaction is sufficient.</p>
-
-<p>To summarize, these are the various levels of consistency supported:</p>
-
-<ul>
-<li>REPLICA/RDONLY read: Servers be scaled geographically. Local reads are fast, but can be stale depending on replica lag.</li>
-<li>MASTER read: There is only one worldwide master per shard. Reads coming from remote locations will be subject to network latency and reliability, but the data will be up-to-date (read-after-write consistency). The isolation level is READ_COMMITTED.</li>
-<li>MASTER transactions: These exhibit the same properties as MASTER reads. However, you get REPEATABLE_READ consistency and ACID writes for a single shard. Support is underway for cross-shard Atomic transactions.</li>
-</ul>
-
-<h3 id="no-multi-master">No multi-master</h3>
-
-<p>Vitess doesn’t support multi-master setup. It has alternate ways of addressing most of the use cases that are typically solved by multi-master:</p>
-
-<ul>
-<li>Scalability: There are situations where multi-master gives you a little bit of additional runway. However, since the statements have to eventually be applied to all masters, it’s not a sustainable strategy. Vitess addresses this problem through sharding, which can scale indefinitely.</li>
-<li>High availability: Vitess integrates with Orchestrator, which is capable of performing a failover to a new master within seconds of failure detection. This is usually sufficient for most applications.</li>
-<li>Low-latency geographically distributed writes: This is one case that is not addressed by Vitess. The current recommendation is to absorb the latency cost of long-distance round-trips for writes. If the data distribution allows, you still have the option of sharding based on geographic affinity. You can then setup masters for different shards to be in different geographic location. This way, most of the master writes can still be local.</li>
-</ul>
-
-<h3 id="big-data-queries">Big data queries</h3>
-
-<p>There are two main ways to access the data for offline data processing (as
-opposed to online web or direct access to the live data): sending queries to
-rdonly servers, or using a Map Reduce framework.</p>
-
-<h4 id="batch-queries">Batch queries</h4>
-
-<p>These are regular queries, but they can consume a lot of data. Typically, the
-streaming APIs are used, to consume large quantities of data.</p>
-
-<p>These queries are just sent to the <em>rdonly</em> servers (also known as <em>batch</em>
-servers). They can take as much resources as they want without affecting live
-traffic.</p>
-
-<h4 id="mapreduce">MapReduce</h4>
-
-<p>Vitess supports MapReduce access to the data. Vitess provides a Hadoop
-connector, that can also be used with Apache Spark. See the <a href="https://github.com/youtube/vitess/tree/master/java/hadoop/src/main/java/io/vitess/hadoop">Hadoop package
-documentation</a>
-for more information.</p>
-
-<p>With a MapReduce framework, Vitess does not support very complicated
-queries. In part because it would be difficult and not very efficient, but also
-because the MapReduce frameworks are usually very good at data processing. So
-instead of doing very complex SQL queries and have processed results, it is
-recommended to just dump the input data out of Vitess (with simple <em>select</em>
-statements), and process it with a MapReduce pipeline.</p>
-
-<h2 id="multi-cell">Multi-cell</h2>
-
-<p>Vitess is meant to run in multiple data centers / regions / cells. In this part,
-we&#39;ll use <em>cell</em> as a set of servers that are very close together, and share the
-same regional availability.</p>
-
-<p>A cell typically contains a set of tablets, a vtgate pool, and app servers that
-use the Vitess cluster. With Vitess, all components can be configured and
-brought up as needed:</p>
-
-<ul>
-<li>The master for a shard can be in any cell. If cross-cell master access is
-required, vtgate can be configured to do so easily (by passing the cell that
-contains the master as a cell to watch).</li>
-<li>It is not uncommon to have the cells that can contain the master be more
-provisioned than read-only serving cells. These <em>master-capable</em> cells may
-need one more replica to handle a possible failover, while still maintaining
-the same replica serving capacity.</li>
-<li>Failing over from one master in one cell to a master in a different cell is no
-different than a local failover. It has an implication on traffic and latency,
-but if the application traffic also gets re-directed to the new cell, the end
-result is stable.</li>
-<li>It is also possible to have some shards with a master in one cell, and some
-other shards with their master in another cell. vtgate will just route the
-traffic to the right place, incurring extra latency cost only on the remote
-access. For instance, creating U.S. user records in a database with masters in
-the U.S. and European user records in a database with masters in Europe is
-easy to do. Replicas can exist in every cell anyway, and serve the replica
-traffic quickly.</li>
-<li>Replica serving cells are a good compromise to reduce user-visible latency:
-they only contain <em>replica</em> servers, and master access is always done
-remotely. If the application profile is mostly reads, this works really well.</li>
-<li>Not all cells need <em>rdonly</em> (or batch) instances. Only the cells that run
-batch jobs, or MapReduce jobs, really need them.</li>
-</ul>
-
-<p>Note Vitess uses local-cell data first, and is very resilient to any cell going
-down (most of our processes handle that case gracefully).</p>
-
-<h2 id="lock-server">Lock server</h2>
-
-<p>Vitess is a highly available service, and Vitess itself needs to store a small
-amount of metadata very reliably. For that purpose, Vitess needs a highly
-available and consistent data store.</p>
-
-<p>Lock servers were built for this exact purpose, and Vitess needs one such
-cluster to be setup to run smoothly. Vitess can be customized to utilize any
-lock server, and by default it supports Zookeeper, etcd and Consul. We call this
-component <a href="/user-guide/topology-service.html">Topology Service</a>.</p>
-
-<p>As Vitess is meant to run in multiple data centers / regions (called cells
-below), it relies on two different lock servers:</p>
-
-<ul>
-<li>global instance: it contains global meta data, like the list of Keyspaces /
-Shards, the VSchema, ... It should be reliable and distributed across multiple
-cells. Running Vitess processes almost never access the global instance.</li>
-<li>per-cell instance (local): It should be running only in the local cell. It
-contains aggregates of all the global data, plus local running tablet
-information. Running Vitess processes get most of their topology data from the
-local instance.</li>
-</ul>
-
-<p>This separation is key to higher reliability. A single cell going bad is never
-critical for Vitess, as the global instance is configured to survive it, and
-other cells can take over the production traffic. The global instance can be
-unavailable for minutes and not affect serving at all (it would affect VSchema
-changes for instance, but these are not critical, they can wait for the global
-instance to be back).</p>
-
-<p>If Vitess is only running in one cell, both global and local instances can share
-the same lock service instance. It is always possible to split them later when
-expanding to multiple cells.</p>
-
-<h2 id="monitoring">Monitoring</h2>
-
-<p>The most stressful part of running a production system is the situation where one is trying to troubleshoot an ongoing outage. You have to be able to get to the root cause quickly and find the correct remedy. This is one area where monitoring becomes critical and Vitess has been battle-tested. A large number of internal state variables and counters are continuously exported by Vitess through the /debug/vars and other URLs. There’s also work underway to integrate with third party monitoring tools like Prometheus.</p>
-
-<p>Vitess errs on the side of over-reporting, but you can be picky about which of these variables you want to monitor.  It’s important and recommended to plot graphs of this data because it’s easy to spot the timing and magnitude of a change. It’s also essential to set up various threshold-based alerts that can be used to proactively prevent outages.</p>
-
-<h2 id="development-workflow">Development workflow</h2>
-
-<p>Vitess provides binaries and scripts to make unit testing of the application
-code very easy. With these tools, we recommend to unit test all the application
-features if possible.</p>
-
-<p>A production environment for a Vitess cluster involves a topology service,
-multiple database instances, a vtgate pool and at least one vtctld process,
-possibly in multiple data centers. The vttest library uses the <em>vtcombo</em> binary
-to combine all the Vitess processes into just one. The various databases are
-also combined into a single MySQL instance (using different database names for
-each shard). The database schema is initialized at startup. The (optional)
-VSchema is also initialized at startup.</p>
-
-<p>A few things to consider:</p>
-
-<ul>
-<li>Use the same database schema in tests as the production schema.</li>
-<li>Use the same VSchema in tests as the production VSchema.</li>
-<li>When a production keyspace is sharded, use a sharded test keyspace as
-well. Just two shards is usually enough, to minimize test startup time, while
-still re-producing the production environment.</li>
-<li><em>vtcombo</em> can also start the <em>vtctld</em> component, so the test environment is
-visible with the Vitess UI.</li>
-<li>See
-<a href="https://github.com/youtube/vitess/blob/master/proto/vttest.proto">vttest.proto</a>
-for more information.</li>
-</ul>
-
-<h2 id="application-query-patterns">Application query patterns</h2>
-
-<p>Although Vitess strives to minimize the app changes required to scale,
-there are some important considerations for application queries.</p>
-
-<h3 id="bind-variables">Bind variables</h3>
-
-<p>We strongly recommend using bind variables for all data values in a query.
-In addition to being more secure (you don&#39;t need to worry about escaping
-bind variable values), this allows Vitess to recognize queries that come from
-the same code path in your app. Vitess can then cache the execution plan for
-that query, instead of recomputing it every time you send different values.</p>
-
-<p>This is similar to prepared statements in MySQL, and in fact that&#39;s how you
-would use bind variables with Vitess through a connector like JDBC or PDO.
-The difference is that Vitess connectors do not communicate with the server
-to prepare a statement. They just create a client-side object that wraps the
-query and bind variables so they can be sent together over the Vitess RPC
-interface.</p>
-
-<p>Note that bind variables are required when sending binary data, since the
-Vitess RPC interface requires the query itself to be valid UTF-8.</p>
-
-<h3 id="tablet-types">Tablet types</h3>
-
-<p>Since Vitess handles query routing for you and lets you access any
-instance in the cluster from any single VTGate endpoint,
-the Vitess clients have an additional parameter for you to specify
-which <a href="/overview/concepts.html#tablet-types">tablet type</a> you want
-to send your query to.</p>
-
-<p>Writes must be directed to a <em>master</em> type tablet, as well as reads
-that should remain part of a larger write transaction.
-You also may want to read from the master if there are queries that
-must return the most up-to-date value possible, such as when reading
-a row that was just modified.</p>
-
-<p>Reads that can tolerate a small amount of replication lag should
-target <em>replica</em> type tablets. This allows you to scale your read
-traffic separately from writes by adding more replicas without
-needing to add more shards. Tablets of the <em>replica</em> type are
-candidates for being promoted to master, so it&#39;s important to
-define an operational policy that prevents them from becoming so
-overloaded that they fall behind on replication by more than a
-few seconds (which would make failovers slow).</p>
-
-<p>The <em>rdonly</em> tablet type defines a separate pool of slaves
-that are ineligible to become master. The separation makes it
-safe to allow these instances to get behind on replication
-(such as while executing expensive analytic queries)
-or have replication stopped altogether (when taking backups
-or clones for resharding).</p>
-
-<h3 id="query-support">Query support</h3>
-
-<p>A sharded Vitess is not 100% backward compatible with MySQL.
-Some queries that used to work will cease to work.
-It’s important that you run all your queries on a sharded test environment -- see the <a href="#development-workflow">Development workflow</a> section above -- to make sure none will fail on production.</p>
-
-<p>Our goal is to expand query support based on the needs of users.
-If you encounter an important construct that isn&#39;t supported,
-please create or comment on an existing feature request so we
-know how to prioritize.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/scalability-philosophy/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/scalability-philosophy/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/scalability-philosophy/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/scalability-philosophy/"</script>
 </html>
diff --git a/docs/user-guide/scalability-philosophy/index.html b/docs/user-guide/scalability-philosophy/index.html
new file mode 100644
index 00000000000..07217b753ec
--- /dev/null
+++ b/docs/user-guide/scalability-philosophy/index.html
@@ -0,0 +1,623 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Scalability Philosophy | Vitess</title>
+<meta property="og:title" content="Scalability Philosophy" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/scalability-philosophy/" />
+<meta property="og:url" content="http://vitess.io/user-guide/scalability-philosophy/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/scalability-philosophy/","headline":"Scalability Philosophy","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Scalability Philosophy</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>Scalability problems can be solved using many approaches. This document describes Vitess’ approach to address these problems.</p>
+
+<h2 id="small-instances">Small instances</h2>
+
+<p>When deciding to shard or break databases up into smaller parts, it’s tempting to break them just enough that they fit in one machine. In the industry, it’s common to run only one MySQL instance per host.</p>
+
+<p>Vitess recommends that instances be broken up to be even smaller, and not to shy away from running multiple instances per host. The net resource usage would be about the same. But the manageability greatly improves when MySQL instances are small. There is the complication of keeping track of ports, and separating the paths for the MySQL instances. However, everything else becomes simpler once this hurdle is crossed.</p>
+
+<p>There are fewer lock contentions to worry about, replication is a lot happier, production impact of outages become smaller, backups and restores run faster, and a lot more secondary advantages can be realized. For example, you can shuffle instances around to get better machine or rack diversity leading to even smaller production impact on outages, and improved resource usage.</p>
+
+<h3 id="cluster-orchestration">Cluster orchestration</h3>
+
+<p>Vitess started on baremetal at YouTube, and some still choose to run it that way.
+But running Vitess in a cluster orchestration system is the key to achieving the
+benefits of small instances without adding management overhead for each new instance.</p>
+
+<p>We provide sample configs to help you <a href="/getting-started/">get started on Kubernetes</a>
+since it&#39;s the most similar to Borg (the <a href="http://blog.kubernetes.io/2015/04/borg-predecessor-to-kubernetes.html">predecessor to Kubernetes</a>
+on which Vitess now runs in YouTube).
+If you&#39;re more familiar with alternatives like Mesos, Swarm, Nomad, or DC/OS,
+we&#39;d welcome your contribution of sample configs for Vitess.</p>
+
+<p>These orchestration systems typically use <a href="https://en.wikipedia.org/wiki/Software_container">containers</a> 
+to isolate small instances so they can be efficiently packed onto machines
+without contention on ports, paths, or compute resources.
+Then an automated scheduler does the job of shuffling instances around for
+failure resilience and optimum utilization.</p>
+
+<h2 id="durability-through-replication">Durability through replication</h2>
+
+<p>Traditional data storage software treated data as durable as soon as it was flushed to disk. However, this approach is impractical in today’s world of commodity hardware. Such an approach also does not address disaster scenarios.</p>
+
+<p>The new approach to durability is achieved by copying the data to multiple machines, and even geographical locations. This form of durability addresses the modern concerns of device failures and disasters.</p>
+
+<p>Many of the workflows in Vitess have been built with this approach in mind. For example, turning on semi-sync replication is highly recommended. This allows Vitess to failover to a new replica when a master goes down, with no data loss. Vitess also recommends that you avoid recovering a crashed database. Instead, create a fresh one from a recent backup and let it catch up.</p>
+
+<p>Relying on replication also allows you to loosen some of the disk-based durability settings. For example, you can turn off sync_binlog, which greatly reduces the number of IOPS to the disk thereby increasing effective throughput.</p>
+
+<h2 id="consistency-model">Consistency model</h2>
+
+<p>Distributing your data has its tradeoffs. Before sharding or moving tables to different keyspaces, the application needs to be verified (or changed) such that it can tolerate the following changes:</p>
+
+<ul>
+<li>Cross-shard reads may not be consistent with each other.</li>
+<li>Cross-shard transactions can fail in the middle and result in partial commits. There is a proposal out to make distributed transactions complete atomically, and on Vitess’ roadmap; however, that is not implemented yet.</li>
+</ul>
+
+<p>Single shard transactions continue to remain ACID, just like MySQL supports it.</p>
+
+<p>If there are read-only code paths that can tolerate slightly stale data, the queries should be sent to REPLICA tablets for OLTP, and RDONLY tablets for OLAP workloads. This allows you to scale your read traffic more easily, and gives you the ability to distribute them geographically.</p>
+
+<p>This tradeoff allows for better throughput at the expense of stale or possible inconsistent reads, since the reads may be lagging behind the master, as data changes (and possibly with varying lag on different shards). To mitigate this, VTGates are capable of monitoring replica lag and can be configured to avoid serving data from instances that are lagging beyond X seconds.</p>
+
+<p>For true snapshot, the queries must be sent to the master within a transaction. For read-after-write consistency, reading from the master without a transaction is sufficient.</p>
+
+<p>To summarize, these are the various levels of consistency supported:</p>
+
+<ul>
+<li>REPLICA/RDONLY read: Servers be scaled geographically. Local reads are fast, but can be stale depending on replica lag.</li>
+<li>MASTER read: There is only one worldwide master per shard. Reads coming from remote locations will be subject to network latency and reliability, but the data will be up-to-date (read-after-write consistency). The isolation level is READ_COMMITTED.</li>
+<li>MASTER transactions: These exhibit the same properties as MASTER reads. However, you get REPEATABLE_READ consistency and ACID writes for a single shard. Support is underway for cross-shard Atomic transactions.</li>
+</ul>
+
+<h3 id="no-multi-master">No multi-master</h3>
+
+<p>Vitess doesn’t support multi-master setup. It has alternate ways of addressing most of the use cases that are typically solved by multi-master:</p>
+
+<ul>
+<li>Scalability: There are situations where multi-master gives you a little bit of additional runway. However, since the statements have to eventually be applied to all masters, it’s not a sustainable strategy. Vitess addresses this problem through sharding, which can scale indefinitely.</li>
+<li>High availability: Vitess integrates with Orchestrator, which is capable of performing a failover to a new master within seconds of failure detection. This is usually sufficient for most applications.</li>
+<li>Low-latency geographically distributed writes: This is one case that is not addressed by Vitess. The current recommendation is to absorb the latency cost of long-distance round-trips for writes. If the data distribution allows, you still have the option of sharding based on geographic affinity. You can then setup masters for different shards to be in different geographic location. This way, most of the master writes can still be local.</li>
+</ul>
+
+<h3 id="big-data-queries">Big data queries</h3>
+
+<p>There are two main ways to access the data for offline data processing (as
+opposed to online web or direct access to the live data): sending queries to
+rdonly servers, or using a Map Reduce framework.</p>
+
+<h4 id="batch-queries">Batch queries</h4>
+
+<p>These are regular queries, but they can consume a lot of data. Typically, the
+streaming APIs are used, to consume large quantities of data.</p>
+
+<p>These queries are just sent to the <em>rdonly</em> servers (also known as <em>batch</em>
+servers). They can take as much resources as they want without affecting live
+traffic.</p>
+
+<h4 id="mapreduce">MapReduce</h4>
+
+<p>Vitess supports MapReduce access to the data. Vitess provides a Hadoop
+connector, that can also be used with Apache Spark. See the <a href="https://github.com/youtube/vitess/tree/master/java/hadoop/src/main/java/io/vitess/hadoop">Hadoop package
+documentation</a>
+for more information.</p>
+
+<p>With a MapReduce framework, Vitess does not support very complicated
+queries. In part because it would be difficult and not very efficient, but also
+because the MapReduce frameworks are usually very good at data processing. So
+instead of doing very complex SQL queries and have processed results, it is
+recommended to just dump the input data out of Vitess (with simple <em>select</em>
+statements), and process it with a MapReduce pipeline.</p>
+
+<h2 id="multi-cell">Multi-cell</h2>
+
+<p>Vitess is meant to run in multiple data centers / regions / cells. In this part,
+we&#39;ll use <em>cell</em> as a set of servers that are very close together, and share the
+same regional availability.</p>
+
+<p>A cell typically contains a set of tablets, a vtgate pool, and app servers that
+use the Vitess cluster. With Vitess, all components can be configured and
+brought up as needed:</p>
+
+<ul>
+<li>The master for a shard can be in any cell. If cross-cell master access is
+required, vtgate can be configured to do so easily (by passing the cell that
+contains the master as a cell to watch).</li>
+<li>It is not uncommon to have the cells that can contain the master be more
+provisioned than read-only serving cells. These <em>master-capable</em> cells may
+need one more replica to handle a possible failover, while still maintaining
+the same replica serving capacity.</li>
+<li>Failing over from one master in one cell to a master in a different cell is no
+different than a local failover. It has an implication on traffic and latency,
+but if the application traffic also gets re-directed to the new cell, the end
+result is stable.</li>
+<li>It is also possible to have some shards with a master in one cell, and some
+other shards with their master in another cell. vtgate will just route the
+traffic to the right place, incurring extra latency cost only on the remote
+access. For instance, creating U.S. user records in a database with masters in
+the U.S. and European user records in a database with masters in Europe is
+easy to do. Replicas can exist in every cell anyway, and serve the replica
+traffic quickly.</li>
+<li>Replica serving cells are a good compromise to reduce user-visible latency:
+they only contain <em>replica</em> servers, and master access is always done
+remotely. If the application profile is mostly reads, this works really well.</li>
+<li>Not all cells need <em>rdonly</em> (or batch) instances. Only the cells that run
+batch jobs, or MapReduce jobs, really need them.</li>
+</ul>
+
+<p>Note Vitess uses local-cell data first, and is very resilient to any cell going
+down (most of our processes handle that case gracefully).</p>
+
+<h2 id="lock-server">Lock server</h2>
+
+<p>Vitess is a highly available service, and Vitess itself needs to store a small
+amount of metadata very reliably. For that purpose, Vitess needs a highly
+available and consistent data store.</p>
+
+<p>Lock servers were built for this exact purpose, and Vitess needs one such
+cluster to be setup to run smoothly. Vitess can be customized to utilize any
+lock server, and by default it supports Zookeeper, etcd and Consul. We call this
+component <a href="/user-guide/topology-service/">Topology Service</a>.</p>
+
+<p>As Vitess is meant to run in multiple data centers / regions (called cells
+below), it relies on two different lock servers:</p>
+
+<ul>
+<li>global instance: it contains global meta data, like the list of Keyspaces /
+Shards, the VSchema, ... It should be reliable and distributed across multiple
+cells. Running Vitess processes almost never access the global instance.</li>
+<li>per-cell instance (local): It should be running only in the local cell. It
+contains aggregates of all the global data, plus local running tablet
+information. Running Vitess processes get most of their topology data from the
+local instance.</li>
+</ul>
+
+<p>This separation is key to higher reliability. A single cell going bad is never
+critical for Vitess, as the global instance is configured to survive it, and
+other cells can take over the production traffic. The global instance can be
+unavailable for minutes and not affect serving at all (it would affect VSchema
+changes for instance, but these are not critical, they can wait for the global
+instance to be back).</p>
+
+<p>If Vitess is only running in one cell, both global and local instances can share
+the same lock service instance. It is always possible to split them later when
+expanding to multiple cells.</p>
+
+<h2 id="monitoring">Monitoring</h2>
+
+<p>The most stressful part of running a production system is the situation where one is trying to troubleshoot an ongoing outage. You have to be able to get to the root cause quickly and find the correct remedy. This is one area where monitoring becomes critical and Vitess has been battle-tested. A large number of internal state variables and counters are continuously exported by Vitess through the /debug/vars and other URLs. There’s also work underway to integrate with third party monitoring tools like Prometheus.</p>
+
+<p>Vitess errs on the side of over-reporting, but you can be picky about which of these variables you want to monitor.  It’s important and recommended to plot graphs of this data because it’s easy to spot the timing and magnitude of a change. It’s also essential to set up various threshold-based alerts that can be used to proactively prevent outages.</p>
+
+<h2 id="development-workflow">Development workflow</h2>
+
+<p>Vitess provides binaries and scripts to make unit testing of the application
+code very easy. With these tools, we recommend to unit test all the application
+features if possible.</p>
+
+<p>A production environment for a Vitess cluster involves a topology service,
+multiple database instances, a vtgate pool and at least one vtctld process,
+possibly in multiple data centers. The vttest library uses the <em>vtcombo</em> binary
+to combine all the Vitess processes into just one. The various databases are
+also combined into a single MySQL instance (using different database names for
+each shard). The database schema is initialized at startup. The (optional)
+VSchema is also initialized at startup.</p>
+
+<p>A few things to consider:</p>
+
+<ul>
+<li>Use the same database schema in tests as the production schema.</li>
+<li>Use the same VSchema in tests as the production VSchema.</li>
+<li>When a production keyspace is sharded, use a sharded test keyspace as
+well. Just two shards is usually enough, to minimize test startup time, while
+still re-producing the production environment.</li>
+<li><em>vtcombo</em> can also start the <em>vtctld</em> component, so the test environment is
+visible with the Vitess UI.</li>
+<li>See
+<a href="https://github.com/youtube/vitess/blob/master/proto/vttest.proto">vttest.proto</a>
+for more information.</li>
+</ul>
+
+<h2 id="application-query-patterns">Application query patterns</h2>
+
+<p>Although Vitess strives to minimize the app changes required to scale,
+there are some important considerations for application queries.</p>
+
+<h3 id="bind-variables">Bind variables</h3>
+
+<p>We strongly recommend using bind variables for all data values in a query.
+In addition to being more secure (you don&#39;t need to worry about escaping
+bind variable values), this allows Vitess to recognize queries that come from
+the same code path in your app. Vitess can then cache the execution plan for
+that query, instead of recomputing it every time you send different values.</p>
+
+<p>This is similar to prepared statements in MySQL, and in fact that&#39;s how you
+would use bind variables with Vitess through a connector like JDBC or PDO.
+The difference is that Vitess connectors do not communicate with the server
+to prepare a statement. They just create a client-side object that wraps the
+query and bind variables so they can be sent together over the Vitess RPC
+interface.</p>
+
+<p>Note that bind variables are required when sending binary data, since the
+Vitess RPC interface requires the query itself to be valid UTF-8.</p>
+
+<h3 id="tablet-types">Tablet types</h3>
+
+<p>Since Vitess handles query routing for you and lets you access any
+instance in the cluster from any single VTGate endpoint,
+the Vitess clients have an additional parameter for you to specify
+which <a href="/overview/concepts/#tablet-types">tablet type</a> you want
+to send your query to.</p>
+
+<p>Writes must be directed to a <em>master</em> type tablet, as well as reads
+that should remain part of a larger write transaction.
+You also may want to read from the master if there are queries that
+must return the most up-to-date value possible, such as when reading
+a row that was just modified.</p>
+
+<p>Reads that can tolerate a small amount of replication lag should
+target <em>replica</em> type tablets. This allows you to scale your read
+traffic separately from writes by adding more replicas without
+needing to add more shards. Tablets of the <em>replica</em> type are
+candidates for being promoted to master, so it&#39;s important to
+define an operational policy that prevents them from becoming so
+overloaded that they fall behind on replication by more than a
+few seconds (which would make failovers slow).</p>
+
+<p>The <em>rdonly</em> tablet type defines a separate pool of slaves
+that are ineligible to become master. The separation makes it
+safe to allow these instances to get behind on replication
+(such as while executing expensive analytic queries)
+or have replication stopped altogether (when taking backups
+or clones for resharding).</p>
+
+<h3 id="query-support">Query support</h3>
+
+<p>A sharded Vitess is not 100% backward compatible with MySQL.
+Some queries that used to work will cease to work.
+It’s important that you run all your queries on a sharded test environment -- see the <a href="#development-workflow">Development workflow</a> section above -- to make sure none will fail on production.</p>
+
+<p>Our goal is to expand query support based on the needs of users.
+If you encounter an important construct that isn&#39;t supported,
+please create or comment on an existing feature request so we
+know how to prioritize.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/schema-management.html b/docs/user-guide/schema-management.html
index 786471bbefa..d399920f48e 100644
--- a/docs/user-guide/schema-management.html
+++ b/docs/user-guide/schema-management.html
@@ -1,496 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Schema Management</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Schema Management"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Schema Management</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>Your MySQL database schema lists the tables in your database and
-contains table definitions that explain how to create those tables.
-Table definitions identify table names, column names, column types,
-primary key information, and so forth.</p>
-
-<p>This document describes the <code><a href="/reference/vtctl.html">vtctl</a></code>
-commands that you can use to <a href="#reviewing-your-schema">review</a> or
-<a href="#changing-your-schema">update</a> your schema in Vitess.</p>
-
-<p>Note that this functionality is not recommended for long-running schema changes. In such cases, we recommend to do a <a href="/user-guide/schema-swap.html">schema swap</a> instead.</p>
-
-<h2 id="reviewing-your-schema">Reviewing your schema</h2>
-
-<p>This section describes the following <code>vtctl</code> commands, which let you look at the schema and validate its consistency across tablets or shards:</p>
-
-<ul>
-<li><a href="#getschema">GetSchema</a></li>
-<li><a href="#validateschemashard">ValidateSchemaShard</a></li>
-<li><a href="#validateschemakeyspace">ValidateSchemaKeyspace</a></li>
-</ul>
-
-<h3 id="getschema">GetSchema</h3>
-
-<p>The <code><a href="/reference/vtctl.html#getschema">GetSchema</a></code> command
-displays the full schema for a tablet or a subset of the tablet&#39;s tables.
-When you call <code>GetSchema</code>, you specify the tablet alias that
-uniquely identifies the tablet. The <code>&lt;tablet alias&gt;</code>
-argument value has the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</p>
-
-<p><strong>Note:</strong> You can use the
-<code><a href="/reference/vtctl.html#listalltablets">vtctl ListAllTablets</a></code> 
-command to retrieve a list of tablets in a cell and their unique IDs.</p>
-
-<p>The following example retrieves the schema for the tablet with the
-unique ID <code>test-000000100</code>:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">GetSchema test-000000100
-</code></pre></div>
-<h3 id="validateschemashard">ValidateSchemaShard</h3>
-
-<p>The
-<code><a href="/reference/vtctl.html#validateschemashard">ValidateSchemaShard</a></code>
-command confirms that for a given keyspace, all of the slave tablets
-in a specified shard have the same schema as the master tablet in that
-shard. When you call <code>ValidateSchemaShard</code>, you specify both 
-the keyspace and the shard that you are validating.</p>
-
-<p>The following command confirms that the master and slave tablets in
-shard <code>0</code> all have the same schema for the <code>user</code>
-keyspace:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">ValidateSchemaShard user/0
-</code></pre></div>
-<h3 id="validateschemakeyspace">ValidateSchemaKeyspace</h3>
-
-<p>The <code><a href="/reference/vtctl.html#validateschemakeyspace">ValidateSchemaKeyspace</a></code>
-command confirms that all of the tablets in a given keyspace have
-the the same schema as the master tablet on shard <code>0</code>
-in that keyspace. Thus, whereas the <code>ValidateSchemaShard</code>
-command confirms the consistency of the schema on tablets within a shard
-for a given keyspace, <code>ValidateSchemaKeyspace</code> confirms the
-consistency across all tablets in all shards for that keyspace.</p>
-
-<p>The following command confirms that all tablets in all shards have the
-same schema as the master tablet in shard <code>0</code> for the
-<code>user</code> keyspace:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">ValidateSchemaKeyspace user
-</code></pre></div>
-<h2 id="changing-your-schema">Changing your schema</h2>
-
-<p>This section describes the <code>vtctl ApplySchema</code> command, which
-supports schema modifications. Vitess&#39; schema modification functionality
-is designed the following goals in mind:</p>
-
-<ul>
-<li>Enable simple updates that propagate to your entire fleet of servers.</li>
-<li>Require minimal human interaction.</li>
-<li>Minimize errors by testing changes against a temporary database.</li>
-<li>Guarantee very little downtime (or no downtime) for most schema updates.</li>
-<li>Do not store permanent schema data in the topology server.</li>
-</ul>
-
-<p>Note that, at this time, Vitess only supports
-<a href="https://dev.mysql.com/doc/refman/5.6/en/sql-syntax-data-definition.html">data definition statements</a>
-that create, modify, or delete database tables.
-For instance, <code>ApplySchema</code> does not affect stored procedures
-or grants.</p>
-
-<h3 id="applyschema">ApplySchema</h3>
-
-<p>The <code><a href="/reference/vtctl.html#applyschema">ApplySchema</a></code>
-command applies a schema change to the specified keyspace on every
-master tablet, running in parallel on all shards. Changes are then
-propagated to slaves via replication. The command format is:
-<code class="prettyprint">
-ApplySchema {-sql=&lt;sql&gt; || -sql_file=&lt;filename&gt;} &lt;keyspace&gt;
-</code></p>
-
-<p>When the <code>ApplySchema</code> action actually applies a schema
-change to the specified keyspace, it performs the following steps:</p>
-
-<ol>
-<li>It finds shards that belong to the keyspace, including newly added
-shards if a <a href="/user-guide/sharding.html#resharding">resharding event</a>
-has taken place.</li>
-<li>It validates the SQL syntax and determines the impact of the schema
-change. If the scope of the change is too large, Vitess rejects it.
-See the <a href="#permitted-schema-changes">permitted schema changes</a> section
-for more detail.</li>
-<li>It employs a pre-flight check to ensure that a schema update will
-succeed before the change is actually applied to the live database.
-In this stage, Vitess copies the current schema into a temporary
-database, applies the change there to validate it, and retrieves
-the resulting schema. By doing so, Vitess verifies that the change
-succeeds without actually touching live database tables.</li>
-<li>It applies the SQL command on the master tablet in each shard.</li>
-</ol>
-
-<p>The following sample command applies the SQL in the <strong>user_table.sql</strong>
-file to the <strong>user</strong> keyspace:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">ApplySchema -sql_file=user_table.sql user
-</code></pre></div>
-<h4 id="permitted-schema-changes">Permitted schema changes</h4>
-
-<p>The <code>ApplySchema</code> command supports a limited set of DDL
-statements. In addition, Vitess rejects some schema changes because
-large changes can slow replication and may reduce the availability
-of your overall system.</p>
-
-<p>The following list identifies types of DDL statements that Vitess
-supports:</p>
-
-<ul>
-<li><code>CREATE TABLE</code></li>
-<li><code>CREATE INDEX</code></li>
-<li><code>CREATE VIEW</code></li>
-<li><code>ALTER TABLE</code></li>
-<li><code>ALTER VIEW</code></li>
-<li><code>RENAME TABLE</code></li>
-<li><code>DROP TABLE</code></li>
-<li><code>DROP INDEX</code></li>
-<li><code>DROP VIEW</code></li>
-</ul>
-
-<p>In addition, Vitess applies the following rules when assessing the
-impact of a potential change:</p>
-
-<ul>
-<li><code>DROP</code> statements are always allowed, regardless of the
-table&#39;s size.</li>
-<li><code>ALTER</code> statements are only allowed if the table on the
-shard&#39;s master tablet has 100,000 rows or less.</li>
-<li>For all other statements, the table on the shard&#39;s master tablet
-must have 2 million rows or less.</li>
-</ul>
-
-<p>If a schema change gets rejected because it affects too many rows, you can specify the flag <code class="prettyprint">-allow_long_unavailability</code> to tell <code class="prettyprint">ApplySchema</code> to skip this check.
-However, we do not recommend this. Instead, you should apply large schema changes by following the <a href="/user-guide/schema-swap.html">schema swap process</a>.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/schema-management/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/schema-management/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/schema-management/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/schema-management/"</script>
 </html>
diff --git a/docs/user-guide/schema-management/index.html b/docs/user-guide/schema-management/index.html
new file mode 100644
index 00000000000..5a5a42847c6
--- /dev/null
+++ b/docs/user-guide/schema-management/index.html
@@ -0,0 +1,505 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Schema Management | Vitess</title>
+<meta property="og:title" content="Schema Management" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/schema-management/" />
+<meta property="og:url" content="http://vitess.io/user-guide/schema-management/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/schema-management/","headline":"Schema Management","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Schema Management</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>Your MySQL database schema lists the tables in your database and
+contains table definitions that explain how to create those tables.
+Table definitions identify table names, column names, column types,
+primary key information, and so forth.</p>
+
+<p>This document describes the <code><a href="/reference/vtctl/">vtctl</a></code>
+commands that you can use to <a href="#reviewing-your-schema">review</a> or
+<a href="#changing-your-schema">update</a> your schema in Vitess.</p>
+
+<p>Note that this functionality is not recommended for long-running schema changes. In such cases, we recommend to do a <a href="/user-guide/schema-swap/">schema swap</a> instead.</p>
+
+<h2 id="reviewing-your-schema">Reviewing your schema</h2>
+
+<p>This section describes the following <code>vtctl</code> commands, which let you look at the schema and validate its consistency across tablets or shards:</p>
+
+<ul>
+<li><a href="#getschema">GetSchema</a></li>
+<li><a href="#validateschemashard">ValidateSchemaShard</a></li>
+<li><a href="#validateschemakeyspace">ValidateSchemaKeyspace</a></li>
+</ul>
+
+<h3 id="getschema">GetSchema</h3>
+
+<p>The <code><a href="/reference/vtctl/#getschema">GetSchema</a></code> command
+displays the full schema for a tablet or a subset of the tablet&#39;s tables.
+When you call <code>GetSchema</code>, you specify the tablet alias that
+uniquely identifies the tablet. The <code>&lt;tablet alias&gt;</code>
+argument value has the format <code>&lt;cell name&gt;-&lt;uid&gt;</code>.</p>
+
+<p><strong>Note:</strong> You can use the
+<code><a href="/reference/vtctl/#listalltablets">vtctl ListAllTablets</a></code> 
+command to retrieve a list of tablets in a cell and their unique IDs.</p>
+
+<p>The following example retrieves the schema for the tablet with the
+unique ID <code>test-000000100</code>:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">GetSchema test-000000100
+</code></pre></div>
+<h3 id="validateschemashard">ValidateSchemaShard</h3>
+
+<p>The
+<code><a href="/reference/vtctl/#validateschemashard">ValidateSchemaShard</a></code>
+command confirms that for a given keyspace, all of the slave tablets
+in a specified shard have the same schema as the master tablet in that
+shard. When you call <code>ValidateSchemaShard</code>, you specify both 
+the keyspace and the shard that you are validating.</p>
+
+<p>The following command confirms that the master and slave tablets in
+shard <code>0</code> all have the same schema for the <code>user</code>
+keyspace:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">ValidateSchemaShard user/0
+</code></pre></div>
+<h3 id="validateschemakeyspace">ValidateSchemaKeyspace</h3>
+
+<p>The <code><a href="/reference/vtctl/#validateschemakeyspace">ValidateSchemaKeyspace</a></code>
+command confirms that all of the tablets in a given keyspace have
+the the same schema as the master tablet on shard <code>0</code>
+in that keyspace. Thus, whereas the <code>ValidateSchemaShard</code>
+command confirms the consistency of the schema on tablets within a shard
+for a given keyspace, <code>ValidateSchemaKeyspace</code> confirms the
+consistency across all tablets in all shards for that keyspace.</p>
+
+<p>The following command confirms that all tablets in all shards have the
+same schema as the master tablet in shard <code>0</code> for the
+<code>user</code> keyspace:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">ValidateSchemaKeyspace user
+</code></pre></div>
+<h2 id="changing-your-schema">Changing your schema</h2>
+
+<p>This section describes the <code>vtctl ApplySchema</code> command, which
+supports schema modifications. Vitess&#39; schema modification functionality
+is designed the following goals in mind:</p>
+
+<ul>
+<li>Enable simple updates that propagate to your entire fleet of servers.</li>
+<li>Require minimal human interaction.</li>
+<li>Minimize errors by testing changes against a temporary database.</li>
+<li>Guarantee very little downtime (or no downtime) for most schema updates.</li>
+<li>Do not store permanent schema data in the topology server.</li>
+</ul>
+
+<p>Note that, at this time, Vitess only supports
+<a href="https://dev.mysql.com/doc/refman/5.6/en/sql-syntax-data-definition.html">data definition statements</a>
+that create, modify, or delete database tables.
+For instance, <code>ApplySchema</code> does not affect stored procedures
+or grants.</p>
+
+<h3 id="applyschema">ApplySchema</h3>
+
+<p>The <code><a href="/reference/vtctl/#applyschema">ApplySchema</a></code>
+command applies a schema change to the specified keyspace on every
+master tablet, running in parallel on all shards. Changes are then
+propagated to slaves via replication. The command format is:
+<code class="prettyprint">
+ApplySchema {-sql=&lt;sql&gt; || -sql_file=&lt;filename&gt;} &lt;keyspace&gt;
+</code></p>
+
+<p>When the <code>ApplySchema</code> action actually applies a schema
+change to the specified keyspace, it performs the following steps:</p>
+
+<ol>
+<li>It finds shards that belong to the keyspace, including newly added
+shards if a <a href="/user-guide/sharding/#resharding">resharding event</a>
+has taken place.</li>
+<li>It validates the SQL syntax and determines the impact of the schema
+change. If the scope of the change is too large, Vitess rejects it.
+See the <a href="#permitted-schema-changes">permitted schema changes</a> section
+for more detail.</li>
+<li>It employs a pre-flight check to ensure that a schema update will
+succeed before the change is actually applied to the live database.
+In this stage, Vitess copies the current schema into a temporary
+database, applies the change there to validate it, and retrieves
+the resulting schema. By doing so, Vitess verifies that the change
+succeeds without actually touching live database tables.</li>
+<li>It applies the SQL command on the master tablet in each shard.</li>
+</ol>
+
+<p>The following sample command applies the SQL in the <strong>user_table.sql</strong>
+file to the <strong>user</strong> keyspace:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">ApplySchema -sql_file=user_table.sql user
+</code></pre></div>
+<h4 id="permitted-schema-changes">Permitted schema changes</h4>
+
+<p>The <code>ApplySchema</code> command supports a limited set of DDL
+statements. In addition, Vitess rejects some schema changes because
+large changes can slow replication and may reduce the availability
+of your overall system.</p>
+
+<p>The following list identifies types of DDL statements that Vitess
+supports:</p>
+
+<ul>
+<li><code>CREATE TABLE</code></li>
+<li><code>CREATE INDEX</code></li>
+<li><code>CREATE VIEW</code></li>
+<li><code>ALTER TABLE</code></li>
+<li><code>ALTER VIEW</code></li>
+<li><code>RENAME TABLE</code></li>
+<li><code>DROP TABLE</code></li>
+<li><code>DROP INDEX</code></li>
+<li><code>DROP VIEW</code></li>
+</ul>
+
+<p>In addition, Vitess applies the following rules when assessing the
+impact of a potential change:</p>
+
+<ul>
+<li><code>DROP</code> statements are always allowed, regardless of the
+table&#39;s size.</li>
+<li><code>ALTER</code> statements are only allowed if the table on the
+shard&#39;s master tablet has 100,000 rows or less.</li>
+<li>For all other statements, the table on the shard&#39;s master tablet
+must have 2 million rows or less.</li>
+</ul>
+
+<p>If a schema change gets rejected because it affects too many rows, you can specify the flag <code class="prettyprint">-allow_long_unavailability</code> to tell <code class="prettyprint">ApplySchema</code> to skip this check.
+However, we do not recommend this. Instead, you should apply large schema changes by following the <a href="/user-guide/schema-swap/">schema swap process</a>.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/schema-swap.html b/docs/user-guide/schema-swap.html
index 691c63c351d..7f9215fceb6 100644
--- a/docs/user-guide/schema-swap.html
+++ b/docs/user-guide/schema-swap.html
@@ -1,428 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Schema Swap</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Schema Swap"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Schema Swap</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="schema-swap-a-tutorial">Schema Swap: A Tutorial</h1>
-
-<p>This page describes how to apply long-running schema changes in Vitess/MySQL
-without disrupting ongoing operations. Examples for long-running changes on
-large databases are <code class="prettyprint">ALTER TABLE</code> (for example to add a column), <code class="prettyprint">OPTIMIZE
-TABLE</code> or large-scale data changes (e.g. populating a column or clearing out
-values).</p>
-
-<p>If a schema change is not long-running, please use the simpler <a href="/user-guide/schema-management.html">vtctl
-ApplySchema</a> instead.</p>
-
-<h2 id="overview">Overview</h2>
-
-<p>One solution to realize such long-running schema changes is to use a temporary
-table and keep it in sync with triggers as <a href="http://code.openark.org/blog/mysql/online-alter-table-now-available-in-openark-kit">originally proposed by
-Shlomi</a>
-and further refined by others (<a href="https://www.percona.com/doc/percona-toolkit/2.2/pt-online-schema-change.html">Percona&#39;s
-pt-online-schema-change</a>,
-<a href="https://github.com/square/shift">Square&#39;s Shift</a>).</p>
-
-<p>Here we describe an alternative solution which uses a combination of MySQL&#39;s
-statement based replication and backups to apply the changes to all tablets.
-Since the long-running schema changes are applied to an offline tablet, ongoing
-operations are not affected. We called this process <strong>schema swap</strong> due to the
-way it&#39;s done, and therefore we refer to it by this name throughout the
-document.</p>
-
-<p>This tutorial outlines the necessary steps for a schema swap and is based on the
-<a href="http://vitess.io/getting-started/">Vitess Kubernetes Getting Started Guide</a>.</p>
-
-<p><strong>At the high level, a schema swap comprises the following phases:</strong></p>
-
-<ol>
-<li> Apply the schema changes to an offline tablet.</li>
-<li> Let the tablet catch up and then create a backup of it.</li>
-<li> Restore all remaining tablets (excluding the master) from the backup.</li>
-<li> Failover the master to a replica tablet which has the new schema. Restore
-the old master from the backup.</li>
-<li> At this point, all tablets have the new schema and you can start using it.</li>
-</ol>
-
-<p><strong>You may be wondering: Why does this work?</strong></p>
-
-<p>The key here is that the new schema is backward compatible with respect to
-statements sent by the app. The replication stream remains backward compatible
-as well because we use statement based replication. As a consequence, the new
-schema must not be used until it has been changed on all tablets. If the schema
-would have been used e.g. when an insert uses a new column, replication would
-break on tablets which have the old schema. Swapping schema on all tablets first
-ensures this doesn&#39;t happen.</p>
-
-<p>Also note that the changes are applied to only one tablet and then all other
-tablets are restored from the backup. This is more efficient than applying the
-long-running changes on every single tablet.</p>
-
-<p>Now let&#39;s carry out an actual schema swap based on our Guestbook example schema.
-We&#39;ll add a column to it.</p>
-
-<h2 id="prerequisites">Prerequisites</h2>
-
-<p>We assume that you have followed the <a href="http://vitess.io/getting-started/">Vitess Kubernetes Getting Started
-Guide</a> up to and including the step &quot;9.
-Create a table&quot;.</p>
-
-<h2 id="schema-swap-steps">Schema Swap Steps</h2>
-
-<ol>
-<li> Got to the Workflows section of vtctld UI (it will be at
-<a href="http://localhost:8001/api/v1/proxy/namespaces/default/services/vtctld:web/app2/workflows">http://localhost:8001/api/v1/proxy/namespaces/default/services/vtctld:web/app2/workflows</a>
-if you followed the Getting Started Guide as is) and press the &quot;+&quot; button in
-the top right corner. You will be presented with &quot;Create a new Workflow&quot;
-dialog.</li>
-<li> In the &quot;Factory Name&quot; list select &quot;Schema Swap&quot;.</li>
-<li> In the field &quot;Keyspace&quot; enter &quot;test_keyspace&quot; (without quotes).</li>
-<li> In the field &quot;SQL&quot; enter the statement representing the schema change you
-want to execute. As an example we want to execute statement &quot;ALTER TABLE
-messages ADD views BIGINT(20) UNSIGNED NULL&quot;.</li>
-<li> Click &quot;Create&quot; button at the bottom of the dialog.</li>
-</ol>
-
-<p>Another way to start the schema swap is to execute vtctlclient command:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh WorkflowCreate schema_swap -keyspace<span class="o">=</span>test_keyspace -sql<span class="o">=</span><span class="s1">&#39;SQL statement&#39;</span>
-</code></pre></div>
-<p>From this point on all you need to do is watch how the schema swap process is
-progressing. Try expanding the displayed nodes in vtctld UI and look at the logs
-of all the actions that process is doing. Once the UI shows &quot;Schema swap is
-finished&quot; you can start using the new schema, it will be propagated to all
-tablets.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/schema-swap/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/schema-swap/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/schema-swap/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/schema-swap/"</script>
 </html>
diff --git a/docs/user-guide/schema-swap/index.html b/docs/user-guide/schema-swap/index.html
new file mode 100644
index 00000000000..8b576e26af8
--- /dev/null
+++ b/docs/user-guide/schema-swap/index.html
@@ -0,0 +1,437 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Schema Swap | Vitess</title>
+<meta property="og:title" content="Schema Swap" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/schema-swap/" />
+<meta property="og:url" content="http://vitess.io/user-guide/schema-swap/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/schema-swap/","headline":"Schema Swap","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Schema Swap</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="schema-swap-a-tutorial">Schema Swap: A Tutorial</h1>
+
+<p>This page describes how to apply long-running schema changes in Vitess/MySQL
+without disrupting ongoing operations. Examples for long-running changes on
+large databases are <code class="prettyprint">ALTER TABLE</code> (for example to add a column), <code class="prettyprint">OPTIMIZE
+TABLE</code> or large-scale data changes (e.g. populating a column or clearing out
+values).</p>
+
+<p>If a schema change is not long-running, please use the simpler <a href="/user-guide/schema-management/">vtctl
+ApplySchema</a> instead.</p>
+
+<h2 id="overview">Overview</h2>
+
+<p>One solution to realize such long-running schema changes is to use a temporary
+table and keep it in sync with triggers as <a href="http://code.openark.org/blog/mysql/online-alter-table-now-available-in-openark-kit">originally proposed by
+Shlomi</a>
+and further refined by others (<a href="https://www.percona.com/doc/percona-toolkit/2.2/pt-online-schema-change.html">Percona&#39;s
+pt-online-schema-change</a>,
+<a href="https://github.com/square/shift">Square&#39;s Shift</a>).</p>
+
+<p>Here we describe an alternative solution which uses a combination of MySQL&#39;s
+statement based replication and backups to apply the changes to all tablets.
+Since the long-running schema changes are applied to an offline tablet, ongoing
+operations are not affected. We called this process <strong>schema swap</strong> due to the
+way it&#39;s done, and therefore we refer to it by this name throughout the
+document.</p>
+
+<p>This tutorial outlines the necessary steps for a schema swap and is based on the
+<a href="/getting-started/">Vitess Kubernetes Getting Started Guide</a>.</p>
+
+<p><strong>At the high level, a schema swap comprises the following phases:</strong></p>
+
+<ol>
+<li> Apply the schema changes to an offline tablet.</li>
+<li> Let the tablet catch up and then create a backup of it.</li>
+<li> Restore all remaining tablets (excluding the master) from the backup.</li>
+<li> Failover the master to a replica tablet which has the new schema. Restore
+the old master from the backup.</li>
+<li> At this point, all tablets have the new schema and you can start using it.</li>
+</ol>
+
+<p><strong>You may be wondering: Why does this work?</strong></p>
+
+<p>The key here is that the new schema is backward compatible with respect to
+statements sent by the app. The replication stream remains backward compatible
+as well because we use statement based replication. As a consequence, the new
+schema must not be used until it has been changed on all tablets. If the schema
+would have been used e.g. when an insert uses a new column, replication would
+break on tablets which have the old schema. Swapping schema on all tablets first
+ensures this doesn&#39;t happen.</p>
+
+<p>Also note that the changes are applied to only one tablet and then all other
+tablets are restored from the backup. This is more efficient than applying the
+long-running changes on every single tablet.</p>
+
+<p>Now let&#39;s carry out an actual schema swap based on our Guestbook example schema.
+We&#39;ll add a column to it.</p>
+
+<h2 id="prerequisites">Prerequisites</h2>
+
+<p>We assume that you have followed the <a href="/getting-started/">Vitess Kubernetes Getting Started
+Guide</a> up to and including the step &quot;9.
+Create a table&quot;.</p>
+
+<h2 id="schema-swap-steps">Schema Swap Steps</h2>
+
+<ol>
+<li> Got to the Workflows section of vtctld UI (it will be at
+<a href="http://localhost:8001/api/v1/proxy/namespaces/default/services/vtctld:web/app2/workflows">http://localhost:8001/api/v1/proxy/namespaces/default/services/vtctld:web/app2/workflows</a>
+if you followed the Getting Started Guide as is) and press the &quot;+&quot; button in
+the top right corner. You will be presented with &quot;Create a new Workflow&quot;
+dialog.</li>
+<li> In the &quot;Factory Name&quot; list select &quot;Schema Swap&quot;.</li>
+<li> In the field &quot;Keyspace&quot; enter &quot;test_keyspace&quot; (without quotes).</li>
+<li> In the field &quot;SQL&quot; enter the statement representing the schema change you
+want to execute. As an example we want to execute statement &quot;ALTER TABLE
+messages ADD views BIGINT(20) UNSIGNED NULL&quot;.</li>
+<li> Click &quot;Create&quot; button at the bottom of the dialog.</li>
+</ol>
+
+<p>Another way to start the schema swap is to execute vtctlclient command:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./lvtctl.sh WorkflowCreate schema_swap -keyspace<span class="o">=</span>test_keyspace -sql<span class="o">=</span><span class="s1">&#39;SQL statement&#39;</span>
+</code></pre></div>
+<p>From this point on all you need to do is watch how the schema swap process is
+progressing. Try expanding the displayed nodes in vtctld UI and look at the logs
+of all the actions that process is doing. Once the UI shows &quot;Schema swap is
+finished&quot; you can start using the new schema, it will be propagated to all
+tablets.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/server-configuration.html b/docs/user-guide/server-configuration.html
index bb64047faf7..5dc1cd2cdb8 100644
--- a/docs/user-guide/server-configuration.html
+++ b/docs/user-guide/server-configuration.html
@@ -1,1044 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Server Configuration</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Server Configuration"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Server Configuration</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h2 id="mysql">MySQL</h2>
-
-<p>Vitess has some requirements on how MySQL should be configured. These will be detailed below.</p>
-
-<p>As a reminder, semi-sync replication is highly recommended. It offers a much better durability story than relying on a disk. This will also let you relax the disk-based durability settings.</p>
-
-<h3 id="versions">Versions</h3>
-
-<p>MySQL versions supported are: MariaDB 10.0, MySQL 5.6 and MySQL 5.7. A number of custom versions based on these exist (Percona, …), Vitess most likely supports them if the version they are based on is supported.</p>
-
-<h3 id="config-files">Config files</h3>
-
-<h4 id="my-cnf">my.cnf</h4>
-
-<p>The main <code class="prettyprint">my.cnf</code> file is generated by
-<a href="https://github.com/youtube/vitess/blob/312064b96ac0070d9f8990e57af6f2c0a76a45a9/examples/local/vttablet-up.sh#L66">mysqlctl init</a>
-based primarily on
-<a href="https://github.com/youtube/vitess/blob/master/config/mycnf/default.cnf">$VTROOT/config/mycnf/default.cnf</a>.
-Additional files will be appended to the generated <code class="prettyprint">my.cnf</code> as specified in
-a colon-separated list of absolute paths in the <code class="prettyprint">EXTRA_MY_CNF</code> environment
-variable. For example, this is typically used to include <a href="https://github.com/youtube/vitess/blob/312064b96ac0070d9f8990e57af6f2c0a76a45a9/examples/local/vttablet-up.sh#L41">flavor-specific
-config files</a>.</p>
-
-<p>To customize the <code class="prettyprint">my.cnf</code>, you can either add overrides in an additional
-<code class="prettyprint">EXTRA_MY_CNF</code> file, or modify the files in <code class="prettyprint">$VTROOT/config/mycnf</code> before
-distributing to your servers. In Kubernetes, you can use a
-<a href="http://kubernetes.io/docs/user-guide/configmap/">ConfigMap</a> to overwrite
-the entire <code class="prettyprint">$VTROOT/config/mycnf</code> directory with your custom versions,
-rather than baking them into a custom container image.</p>
-
-<h4 id="init_db-sql">init_db.sql</h4>
-
-<p>When a new instance is initialized with <code class="prettyprint">mysqlctl init</code> (as opposed to
-restarting in a previously initialized data dir with <code class="prettyprint">mysqlctl start</code>),
-the <a href="https://github.com/youtube/vitess/blob/master/config/init_db.sql">init_db.sql</a>
-file is applied to the server immediatley after executing <code class="prettyprint">mysql_install_db</code>.
-By default, this file contains the equivalent of running
-<a href="https://dev.mysql.com/doc/refman/5.7/en/mysql-secure-installation.html">mysql_secure_installation</a>,
-as well as the necessary tables and grants for Vitess.</p>
-
-<p>If you are running Vitess on top of an existing MySQL instance,
-rather than using mysqlctl, you can use this file as a sample of what
-grants need to be applied to enable Vitess.</p>
-
-<p>Note that changes to this file will not be reflected in shards that have
-already been initialized and had at least one backup taken.
-New instances in such shards will automatically restore the latest backup
-upon vttablet startup, overwriting the data dir created by mysqlctl.</p>
-
-<h3 id="statement-based-replication-sbr">Statement-based replication (SBR)</h3>
-
-<p>Vitess relies on adding comments to DMLs, which are later parsed on the other end of replication for various post-processing work. The critical ones are:</p>
-
-<ul>
-<li>Redirect DMLs to the correct shard during resharding workflow.</li>
-<li>Identify which rows have changed for notifying downstream services that wish to subscribe to changes in vitess.</li>
-<li>Workflows that allow you to apply schema changes to replicas first, and rotate the masters, which improves uptime.</li>
-</ul>
-
-<p>In order to achieve this, Vitess also rewrites all your DMLs to be primary-key based. In a way, this also makes statement based replication almost as efficient as row-based replication (RBR). So, there should be no major loss of performance if you switched to SBR in Vitess.</p>
-
-<p>RBR will eventually be supported by Vitess.</p>
-
-<h3 id="data-types">Data types</h3>
-
-<p>Vitess supports data types at the MySQL 5.5 level. The newer data types like spatial or JSON are not supported yet. Additionally, the TIMESTAMP data type should not be used in a primary key or sharding column. Otherwise, Vitess cannot predict those values correctly and this may result in data corruption.</p>
-
-<h3 id="no-side-effects">No side effects</h3>
-
-<p>Vitess cannot guarantee data consistency if the schema contains constructs with side effects. These are triggers, stored procedures and foreign keys. This is because the resharding workflow and update stream cannot correctly detect what has changed by looking at a statement.</p>
-
-<p>This rule is not strictly enforced. You are allowed to add these things, but at your own risk. As long as you’ve ensured that a certain side-effect will not break Vitess, you can add it to the schema.</p>
-
-<p>Similar guidelines should be used when deciding to bypass Vitess to send statements directly to MySQL.</p>
-
-<p>Vitess also requires you to turn on STRICT_TRANS_TABLES mode. Otherwise, it cannot accurately predict what will be written to the database.</p>
-
-<p>It’s safe to apply backward compatible DDLs directly to MySQL. VTTablets can be configured to periodically check the schema for changes.</p>
-
-<p>There is also work in progress to actively watch the binlog for schema changes. This will likely happen around release 2.1.</p>
-
-<h3 id="autocommit">Autocommit</h3>
-
-<p>MySQL autocommit needs to be turned on.</p>
-
-<p>VTTablet uses connection pools to MySQL. If autocommit was turned off, MySQL will start an implicit transaction (with a point in time snapshot) for each connection and will work very hard at keeping the current view unchanged, which would be counter-productive.</p>
-
-<h3 id="safe-startup">Safe startup</h3>
-
-<p>We recommend to enable <code class="prettyprint">read-only</code> and <code class="prettyprint">skip-slave-start</code> at startup.
-The first ensures that writes will not be accepted accidentally,
-which could cause split brain or alternate futures.
-The second ensures that slaves do not connect to the master before
-settings like semisync are initialized by vttablet according to
-Vitess-specific logic.</p>
-
-<h3 id="binary-logging">Binary logging</h3>
-
-<p>By default, we enable binary logging everywhere (<code class="prettyprint">log-bin</code>),
-including on slaves (<code class="prettyprint">log-slave-updates</code>).
-On <em>replica</em> type tablets, this is important to make sure they have the
-necessary binlogs in case they are promoted to master.
-The slave binlogs are also used to implement Vitess features like
-filtered replication (during resharding) and the upcoming update stream
-and online schema swap.</p>
-
-<h3 id="global-transaction-id-gtid">Global Transaction ID (GTID)</h3>
-
-<p>Many features of Vitess require a fully GTID-based MySQL replication
-topology, including master management, resharding, update stream,
-and online schema swap.</p>
-
-<p>For MySQL 5.6+, that means you must use <code class="prettyprint">gtid_mode=ON</code> on all servers.
-We also strongly encourage <code class="prettyprint">enforce_gtid_consistency</code>.</p>
-
-<p>Similarly, for MariaDB, you should use <code class="prettyprint">gtid_strict_mode</code> to ensure that
-master management operations will fail rather than risk causing data loss
-if slaves diverge from the master due to external interference.</p>
-
-<h3 id="monitoring">Monitoring</h3>
-
-<p>In addition to monitoring the Vitess processes, we recommend to monitor MySQL as well. Here is a list of MySQL metrics you should monitor:</p>
-
-<ul>
-<li>QPS</li>
-<li>Bytes sent/received</li>
-<li>Replication lag</li>
-<li>Threads running</li>
-<li>Innodb buffer cache hit rate</li>
-<li>CPU, memory and disk usage. For disk, break into bytes read/written, latencies and IOPS.</li>
-</ul>
-
-<h3 id="recap">Recap</h3>
-
-<ul>
-<li>2-4 cores</li>
-<li>100-300GB data size</li>
-<li>Statement based replication (required)</li>
-<li>Semi-sync replication
-
-<ul>
-<li>rpl_semi_sync_master_timeout is huge (essentially never; there&#39;s no way to actually specify never)</li>
-<li>rpl_semi_sync_master_wait_no_slave = 1</li>
-<li>sync_binlog=0</li>
-<li>innodb_flush_log_at_trx_commit=2</li>
-</ul></li>
-<li>STRICT_TRANS_TABLES</li>
-<li>auto-commit ON (required)</li>
-<li>Additional parameters as mentioned in above sections.</li>
-</ul>
-
-<h2 id="vitess-servers">Vitess servers</h2>
-
-<p>Vitess servers are written in Go. There are a few Vitess-specific knobs that apply to all servers.</p>
-
-<h3 id="go-version">Go version</h3>
-
-<p>Go, being a young language, tends to add major improvements over each version.
-So, the latest Go version is almost always recommended.
-Note that the latest Go version may be higher than the minimum version we require for compiling the binaries (see <a href="/getting-started/#prerequisites">&quot;Prerequisites&quot; section in the Getting Started guide</a>).</p>
-
-<h3 id="gomaxprocs">GOMAXPROCS</h3>
-
-<p>You typically don’t have to set this environment variable. The default Go runtime will try to use as much CPU as necessary. However, if you want to force a Go server to not exceed a certain CPU limit, setting GOMAXPROCS to that value will work in most situations.</p>
-
-<h3 id="gogc">GOGC</h3>
-
-<p>The default value for this variable is 100. Which means that garbage is collected every time memory doubles from the baseline (100% growth). You typically don’t have to change this value either. However, if you care about tail latency, increasing this value will help you in that area, but at the cost of increased memory usage.</p>
-
-<h3 id="logging">Logging</h3>
-
-<p>Vitess servers write to log files, and they are rotated when they reach a maximum size. It’s recommended that you run at INFO level logging. The information printed in the log files come in handy for troubleshooting. You can limit the disk usage by running cron jobs that periodically purge or archive them.</p>
-
-<h3 id="grpc">gRPC</h3>
-
-<p>Vitess uses gRPC for communication between client and Vitess, and between Vitess
-servers. By default, Vitess does not use SSL.</p>
-
-<p>Also, even without using SSL, we allow the use of an application-provided
-CallerID object. It allows unsecure but easy to use authorization using Table
-ACLs.</p>
-
-<p>See the
-<a href="http://vitess.io/user-guide/transport-security-model.html">Transport Security Model document</a>
-for more information on how to setup both of these features, and what command
-line parameters exist.</p>
-
-<h2 id="topology-service-configuration">Topology Service configuration</h2>
-
-<p>Vttablet, vtgate, vtctld need the right command line parameters to find the
-Topology Server. First the <em>topo_implementation</em> flag needs to be set to one of
-<em>zk2</em>, <em>etcd2</em>, or <em>consul</em>. Then they&#39;re all configured as follows:</p>
-
-<ul>
-<li>The <em>topo_global_server_address</em> contains the server address / addresses of
-the global topology server.</li>
-<li>The <em>topo_global_root</em> contains the directory / path to use.</li>
-</ul>
-
-<p>Note that the local cell for the tablet must exist and be configured properly in
-the Topology Service for vttablet to start. Local cells are configured inside
-the topo server, by using the <code class="prettyprint">vtctl AddCellInfo</code> command. See
-the <a href="/user-guide/topology-service.html">Topology Service</a> documentation for more
-information.</p>
-
-<h2 id="vttablet">VTTablet</h2>
-
-<!-- TODO: auto-generate a different doc from code for the command line parameters, and link from here. -->
-
-<p>VTTablet has a large number of command line options. Some important ones will be covered here. In terms of provisioning these are the recommended values</p>
-
-<ul>
-<li>2-4 cores (in proportion to MySQL cores)</li>
-<li>2-4 GB RAM</li>
-</ul>
-
-<h3 id="directory-configuration">Directory Configuration</h3>
-
-<p>vttablet supports a number of command line options and environment variables
-to facilitate its setup.</p>
-
-<p>The <strong>VTDATAROOT</strong> environment variable specifies the toplevel directory for all
-data files. If not set, it defaults to <code class="prettyprint">/vt</code>.</p>
-
-<p>By default, a vttablet will use a subdirectory in <strong>VTDATAROOT</strong> named
-<code class="prettyprint">vt_NNNNNNNNNN</code> where <code class="prettyprint">NNNNNNNNNN</code> is the tablet id. The <strong>tablet_dir</strong>
-command-line parameter allows overriding this relative path. This is useful in
-containers where the filesystem only contains one vttablet, in order to have a
-fixed root directory.</p>
-
-<p>When starting up and using <code class="prettyprint">mysqlctl</code> to manage MySQL, the MySQL files will be
-in subdirectories of the tablet root. For instance, <code class="prettyprint">bin-logs</code> for the binary
-logs, <code class="prettyprint">data</code> for the data files, and <code class="prettyprint">relay-logs</code> for the relay logs.</p>
-
-<p>It is possible to host different parts of a MySQL server files on different
-partitions. For instance, the data file may reside in flash, while the bin logs
-and relay logs are on spindle. To achieve this, create a symlink from
-<code class="prettyprint">$VTDATAROOT/&lt;dir name&gt;</code> to the proper location on disk. When MySQL is
-configured by mysqlctl, it will realize this directory exists, and use it for the
-files it would otherwise have put in the tablet directory. For instance, to host
-the binlogs in <code class="prettyprint">/mnt/bin-logs</code>:</p>
-
-<ul>
-<li><p>Create a symlink from <code class="prettyprint">$VTDATAROOT/bin-logs</code> to <code class="prettyprint">/mnt/bin-logs</code>.</p></li>
-<li><p>When starting up a tablet:</p>
-
-<ul>
-<li><code class="prettyprint">/mnt/bin-logs/vt_NNNNNNNNNN</code> will be created.</li>
-<li><code class="prettyprint">$VTDATAROOT/vt_NNNNNNNNNN/bin-logs</code> will be a symlink to
-<code class="prettyprint">/mnt/bin-logs/vt_NNNNNNNNNN</code></li>
-</ul></li>
-</ul>
-
-<h3 id="initialization">Initialization</h3>
-
-<ul>
-<li>Init_keyspace, init_shard, init_tablet_type: These parameters should be set at startup with the keyspace / shard / tablet type to start the tablet as. Note ‘master’ is not allowed here, instead use ‘replica’, as the tablet when starting will figure out if it is the master (this way, all replica tablets start with the same command line parameters, independently of which one is the master).</li>
-</ul>
-
-<h3 id="query-server-parameters">Query server parameters</h3>
-
-<!-- TODO: Change this section to link to auto-generated descriptions. -->
-
-<ul>
-<li><strong>queryserver-config-pool-size</strong>: This value should typically be set to the max number of simultaneous queries you want MySQL to run. This should typically be around 2-3x the number of allocated CPUs. Around 4-16. There is not much harm in going higher with this value, but you may see no additional benefits.</li>
-<li><strong>queryserver-config-stream-pool-size</strong>: This value is relevant only if you plan to run streaming queries against the database. It’s recommended that you use rdonly instances for such streaming queries. This value depends on how many simultaneous streaming queries you plan to run. Typical values are in the low 100s.</li>
-<li><strong>queryserver-config-transaction-cap</strong>: This value should be set to how many concurrent transactions you wish to allow. This should be a function of transaction QPS and transaction length. Typical values are in the low 100s.</li>
-<li><strong>queryserver-config-query-timeout</strong>: This value should be set to the upper limit you’re willing to allow a query to run before it’s deemed too expensive or detrimental to the rest of the system. VTTablet will kill any query that exceeds this timeout. This value is usually around 15-30s.</li>
-<li><strong>queryserver-config-transaction-timeout</strong>: This value is meant to protect the situation where a client has crashed without completing a transaction. Typical value for this timeout is 30s.</li>
-<li><strong>queryserver-config-max-result-size</strong>: This parameter prevents the OLTP application from accidentally requesting too many rows. If the result exceeds the specified number of rows, VTTablet returns an error. The default value is 10,000.</li>
-</ul>
-
-<h3 id="db-config-parameters">DB config parameters</h3>
-
-<p>VTTablet requires multiple user credentials to perform its tasks. Since it&#39;s required to run on the same machine as MySQL, it’s most beneficial to use the more efficient unix socket connections.</p>
-
-<p><strong>app</strong> credentials are for serving app queries:</p>
-
-<ul>
-<li><strong>db-config-app-unixsocket</strong>: MySQL socket name to connect to.</li>
-<li><strong>db-config-app-uname</strong>: App username.</li>
-<li><strong>db-config-app-pass</strong>: Password for the app username. If you need a more secure way of managing and supplying passwords, VTTablet does allow you to plug into a &quot;password server&quot; that can securely supply and refresh usernames and passwords. Please contact the Vitess team for help if you’d like to write such a custom plugin.</li>
-<li><strong>db-config-app-charset</strong>: The only supported character set is utf8. Vitess still works with latin1, but it’s getting deprecated.</li>
-</ul>
-
-<p><strong>dba</strong> credentials will be used for housekeeping work like loading the schema or killing runaway queries:</p>
-
-<ul>
-<li><strong>db-config-dba-unixsocket</strong></li>
-<li><strong>db-config-dba-uname</strong></li>
-<li><strong>db-config-dba-pass</strong></li>
-<li><strong>db-config-dba-charset</strong></li>
-</ul>
-
-<p><strong>repl</strong> credentials are for managing replication. Since repl connections can be used across machines, you can optionally turn on encryption:</p>
-
-<ul>
-<li><strong>db-config-repl-uname</strong></li>
-<li><strong>db-config-repl-pass</strong></li>
-<li><strong>db-config-repl-charset</strong></li>
-<li><strong>db-config-repl-flags</strong>: If you want to enable SSL, this must be set to 2048.</li>
-<li><strong>db-config-repl-ssl-ca</strong></li>
-<li><strong>db-config-repl-ssl-cert</strong></li>
-<li><strong>db-config-repl-ssl-key</strong></li>
-</ul>
-
-<p><strong>filtered</strong> credentials are for performing resharding:</p>
-
-<ul>
-<li><strong>db-config-filtered-unixsocket</strong></li>
-<li><strong>db-config-filtered-uname</strong></li>
-<li><strong>db-config-filtered-pass</strong></li>
-<li><strong>db-config-filtered-charset</strong></li>
-</ul>
-
-<h3 id="monitoring">Monitoring</h3>
-
-<p>VTTablet exports a wealth of real-time information about itself. This section will explain the essential ones:</p>
-
-<h4 id="debug-status">/debug/status</h4>
-
-<p>This page has a variety of human-readable information about the current VTTablet. You can look at this page to get a general overview of what’s going on. It also has links to various other diagnostic URLs below.</p>
-
-<h4 id="debug-vars">/debug/vars</h4>
-
-<p>This is the most important source of information for monitoring. There are other URLs below that can be used to further drill down.</p>
-
-<h5 id="queries-as-described-in-debug-vars-section">Queries (as described in /debug/vars section)</h5>
-
-<p>Vitess has a structured way of exporting certain performance stats. The most common one is the Histogram structure, which is used by Queries:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;Queries&quot;: {
-    &quot;Histograms&quot;: {
-      &quot;PASS_SELECT&quot;: {
-        &quot;1000000&quot;: 1138196,
-        &quot;10000000&quot;: 1138313,
-        &quot;100000000&quot;: 1138342,
-        &quot;1000000000&quot;: 1138342,
-        &quot;10000000000&quot;: 1138342,
-        &quot;500000&quot;: 1133195,
-        &quot;5000000&quot;: 1138277,
-        &quot;50000000&quot;: 1138342,
-        &quot;500000000&quot;: 1138342,
-        &quot;5000000000&quot;: 1138342,
-        &quot;Count&quot;: 1138342,
-        &quot;Time&quot;: 387710449887,
-        &quot;inf&quot;: 1138342
-      }
-    },
-    &quot;TotalCount&quot;: 1138342,
-    &quot;TotalTime&quot;: 387710449887
-  },
-</code></pre></div>
-<p>The histograms are broken out into query categories. In the above case, &quot;PASS_SELECT&quot; is the only category.  An entry like <code class="prettyprint">&quot;500000&quot;: 1133195</code> means that <code class="prettyprint">1133195</code> queries took under <code class="prettyprint">500000</code> nanoseconds to execute.</p>
-
-<p>Queries.Histograms.PASS_SELECT.Count is the total count in the PASS_SELECT category.</p>
-
-<p>Queries.Histograms.PASS_SELECT.Time is the total time in the PASS_SELECT category.</p>
-
-<p>Queries.TotalCount is the total count across all categories.</p>
-
-<p>Queries.TotalTime is the total time across all categories.</p>
-
-<p>There are other Histogram variables described below, and they will always have the same structure.</p>
-
-<p>Use this variable to track:</p>
-
-<ul>
-<li>QPS</li>
-<li>Latency</li>
-<li>Per-category QPS. For replicas, the only category will be PASS_SELECT, but there will be more for masters.</li>
-<li>Per-category latency</li>
-<li>Per-category tail latency</li>
-</ul>
-
-<h5 id="results">Results</h5>
-<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;Results&quot;: {
-    &quot;0&quot;: 0,
-    &quot;1&quot;: 0,
-    &quot;10&quot;: 1138326,
-    &quot;100&quot;: 1138326,
-    &quot;1000&quot;: 1138342,
-    &quot;10000&quot;: 1138342,
-    &quot;5&quot;: 1138326,
-    &quot;50&quot;: 1138326,
-    &quot;500&quot;: 1138342,
-    &quot;5000&quot;: 1138342,
-    &quot;Count&quot;: 1138342,
-    &quot;Total&quot;: 1140438,
-    &quot;inf&quot;: 1138342
-  }
-</code></pre></div>
-<p>Results is a simple histogram with no timing info. It gives you a histogram view of the number of rows returned per query.</p>
-
-<h5 id="mysql">Mysql</h5>
-
-<p>Mysql is a histogram variable like Queries, except that it reports MySQL execution times. The categories are &quot;Exec&quot; and “ExecStream”.</p>
-
-<p>In the past, the exec time difference between VTTablet and MySQL used to be substantial. With the newer versions of Go, the VTTablet exec time has been predominantly been equal to the mysql exec time, conn pool wait time and consolidations waits. In other words, this variable has not shown much value recently. However, it’s good to track this variable initially, until it’s determined that there are no other factors causing a big difference between MySQL performance and VTTablet performance.</p>
-
-<h5 id="transactions">Transactions</h5>
-
-<p>Transactions is a histogram variable that tracks transactions. The categories are &quot;Completed&quot; and “Aborted”.</p>
-
-<h5 id="waits">Waits</h5>
-
-<p>Waits is a histogram variable that tracks various waits in the system. Right now, the only category is &quot;Consolidations&quot;. A consolidation happens when one query waits for the results of an identical query already executing, thereby saving the database from performing duplicate work.</p>
-
-<p>This variable used to report connection pool waits, but a refactor moved those variables out into the pool related vars.</p>
-
-<h5 id="errors">Errors</h5>
-<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;Errors&quot;: {
-    &quot;Deadlock&quot;: 0,
-    &quot;Fail&quot;: 1,
-    &quot;NotInTx&quot;: 0,
-    &quot;TxPoolFull&quot;: 0
-  },
-</code></pre></div>
-<p>Errors are reported under different categories. It’s beneficial to track each category separately as it will be more helpful for troubleshooting. Right now, there are four categories. The category list may vary as Vitess evolves.</p>
-
-<p>Plotting errors/query can sometimes be useful for troubleshooting.</p>
-
-<p>VTTablet also exports an InfoErrors variable that tracks inconsequential errors that don’t signify any kind of problem with the system. For example, a dup key on insert is considered normal because apps tend to use that error to instead update an existing row. So, no monitoring is needed for that variable.</p>
-
-<h5 id="internalerrors">InternalErrors</h5>
-<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;InternalErrors&quot;: {
-    &quot;HungQuery&quot;: 0,
-    &quot;Invalidation&quot;: 0,
-    &quot;MemcacheStats&quot;: 0,
-    &quot;Mismatch&quot;: 0,
-    &quot;Panic&quot;: 0,
-    &quot;Schema&quot;: 0,
-    &quot;StrayTransactions&quot;: 0,
-    &quot;Task&quot;: 0
-  },
-</code></pre></div>
-<p>An internal error is an unexpected situation in code that may possibly point to a bug. Such errors may not cause outages, but even a single error needs be escalated for root cause analysis.</p>
-
-<h5 id="kills">Kills</h5>
-<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;Kills&quot;: {
-    &quot;Queries&quot;: 2,
-    &quot;Transactions&quot;: 0
-  },
-</code></pre></div>
-<p>Kills reports the queries and transactions killed by VTTablet due to timeout. It’s a very important variable to look at during outages.</p>
-
-<h5 id="transactionpool">TransactionPool*</h5>
-
-<p>There are a few variables with the above prefix:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;TransactionPoolAvailable&quot;: 300,
-  &quot;TransactionPoolCapacity&quot;: 300,
-  &quot;TransactionPoolIdleTimeout&quot;: 600000000000,
-  &quot;TransactionPoolMaxCap&quot;: 300,
-  &quot;TransactionPoolTimeout&quot;: 30000000000,
-  &quot;TransactionPoolWaitCount&quot;: 0,
-  &quot;TransactionPoolWaitTime&quot;: 0,
-</code></pre></div>
-<ul>
-<li>WaitCount will give you how often the transaction pool gets full that causes new transactions to wait.</li>
-<li>WaitTime/WaitCount will tell you the average wait time.</li>
-<li>Available is a gauge that tells you the number of available connections in the pool in real-time. Capacity-Available is the number of connections in use. Note that this number could be misleading if the traffic is spiky.</li>
-</ul>
-
-<h5 id="other-pool-variables">Other Pool variables</h5>
-
-<p>Just like TransactionPool, there are variables for other pools:</p>
-
-<ul>
-<li>ConnPool: This is the pool used for read traffic.</li>
-<li>StreamConnPool: This is the pool used for streaming queries.</li>
-</ul>
-
-<p>There are other internal pools used by VTTablet that are not very consequential.</p>
-
-<h5 id="tableaclallowed-tableacldenied-tableaclpseudodenied">TableACLAllowed, TableACLDenied, TableACLPseudoDenied</h5>
-
-<p>The above three variables table acl stats broken out by table, plan and user.</p>
-
-<h5 id="querycachesize">QueryCacheSize</h5>
-
-<p>If the application does not make good use of bind variables, this value would reach the QueryCacheCapacity. If so, inspecting the current query cache will give you a clue about where the misuse is happening.</p>
-
-<h5 id="querycounts-queryerrorcounts-queryrowcounts-querytimesns">QueryCounts, QueryErrorCounts, QueryRowCounts, QueryTimesNs</h5>
-
-<p>These variables are another multi-dimensional view of Queries. They have a lot more data than Queries because they’re broken out into tables as well as plan. This is a priceless source of information when it comes to troubleshooting. If an outage is related to rogue queries, the graphs plotted from these vars will immediately show the table on which such queries are run. After that, a quick look at the detailed query stats will most likely identify the culprit.</p>
-
-<h5 id="usertablequerycount-usertablequerytimesns-usertransactioncount-usertransactiontimesns">UserTableQueryCount, UserTableQueryTimesNs, UserTransactionCount, UserTransactionTimesNs</h5>
-
-<p>These variables are yet another view of Queries, but broken out by user, table and plan. If you have well-compartmentalized app users, this is another priceless way of identifying a rogue &quot;user app&quot; that could be misbehaving.</p>
-
-<h5 id="datafree-datalength-indexlength-tablerows">DataFree, DataLength, IndexLength, TableRows</h5>
-
-<p>These variables are updated periodically from information_schema.tables. They represent statistical information as reported by MySQL about each table. They can be used for planning purposes, or to track unusual changes in table stats.</p>
-
-<ul>
-<li>DataFree represents data_free</li>
-<li>DataLength represents data_length</li>
-<li>IndexLength represents index_length</li>
-<li>TableRows represents table_rows</li>
-</ul>
-
-<h4 id="debug-health">/debug/health</h4>
-
-<p>This URL prints out a simple &quot;ok&quot; or “not ok” string that can be used to check if the server is healthy. The health check makes sure mysqld connections work, and replication is configured (though not necessarily running) if not master.</p>
-
-<h4 id="queryz-debug-query_stats-debug-query_plans-streamqueryz">/queryz, /debug/query_stats, /debug/query_plans, /streamqueryz</h4>
-
-<ul>
-<li>/debug/query_stats is a JSON view of the per-query stats. This information is pulled in real-time from the query cache. The per-table stats in /debug/vars are a roll-up of this information.</li>
-<li>/queryz is a human-readable version of /debug/query_stats. If a graph shows a table as a possible source of problems, this is the next place to look at to see if a specific query is the root cause.</li>
-<li>/debug/query_plans is a more static view of the query cache. It just shows how VTTablet will process or rewrite the input query.</li>
-<li>/streamqueryz lists the currently running streaming queries. You have the option to kill any of them from this page.</li>
-</ul>
-
-<h4 id="querylogz-debug-querylog-txlogz-debug-txlog">/querylogz, /debug/querylog, /txlogz, /debug/txlog</h4>
-
-<ul>
-<li>/debug/querylog is a never-ending stream of currently executing queries with verbose information about each query. This URL can generate a lot of data because it streams every query processed by VTTablet. The details are as per this function: <a href="https://github.com/youtube/vitess/blob/master/go/vt/tabletserver/logstats.go#L202">https://github.com/youtube/vitess/blob/master/go/vt/tabletserver/logstats.go#L202</a></li>
-<li>/querylogz is a limited human readable version of /debug/querylog. It prints the next 300 queries by default. The limit can be specified with a limit=N parameter on the URL.</li>
-<li>/txlogz is like /querylogz, but for transactions.</li>
-<li>/debug/txlog is the JSON counterpart to /txlogz.</li>
-</ul>
-
-<h4 id="consolidations">/consolidations</h4>
-
-<p>This URL has an MRU list of consolidations. This is a way of identifying if multiple clients are spamming the same query to a server.</p>
-
-<h4 id="schemaz-debug-schema">/schemaz, /debug/schema</h4>
-
-<ul>
-<li>/schemaz shows the schema info loaded by VTTablet.</li>
-<li>/debug/schema is the JSON version of /schemaz.</li>
-</ul>
-
-<h4 id="debug-query_rules">/debug/query_rules</h4>
-
-<p>This URL displays the currently active query blacklist rules.</p>
-
-<h4 id="debug-health">/debug/health</h4>
-
-<p>This URL prints out a simple &quot;ok&quot; or “not ok” string that can be used to check if the server is healthy.</p>
-
-<h3 id="alerting">Alerting</h3>
-
-<p>Alerting is built on top of the variables you monitor. Before setting up alerts, you should get some baseline stats and variance, and then you can build meaningful alerting rules. You can use the following list as a guideline to build your own:</p>
-
-<ul>
-<li>Query latency among all vttablets</li>
-<li>Per keyspace latency</li>
-<li>Errors/query</li>
-<li>Memory usage</li>
-<li>Unhealthy for too long</li>
-<li>Too many vttablets down</li>
-<li>Health has been flapping</li>
-<li>Transaction pool full error rate</li>
-<li>Any internal error</li>
-<li>Traffic out of balance among replicas</li>
-<li>Qps/core too high</li>
-</ul>
-
-<h2 id="vtgate">VTGate</h2>
-
-<p>A typical VTGate should be provisioned as follows.</p>
-
-<ul>
-<li>2-4 cores</li>
-<li>2-4 GB RAM</li>
-</ul>
-
-<p>Since VTGate is stateless, you can scale it linearly by just adding more servers as needed. Beyond the recommended values, it’s better to add more VTGates than giving more resources to existing servers, as recommended in the philosophy section.</p>
-
-<p>Load-balancer in front of vtgate to scale up (not covered by Vitess). Stateless, can use the health URL for health check.</p>
-
-<h3 id="parameters">Parameters</h3>
-
-<ul>
-<li><strong>cells_to_watch</strong>: which cell vtgate is in and will monitor tablets from. Cross-cell master access needs multiple cells here.</li>
-<li><strong>tablet_types_to_wait</strong>: VTGate waits for at least one serving tablet per tablet type specified here during startup, before listening to the serving port. So VTGate does not serve error. It should match the available tablet types VTGate connects to (master, replica, rdonly).</li>
-<li><strong>discovery_low_replication_lag</strong>: when replication lags of all VTTablet in a particular shard and tablet type are less than or equal the flag (in seconds), VTGate does not filter them by replication lag and uses all to balance traffic.</li>
-<li><strong>degraded_threshold (30s)</strong>: a tablet will publish itself as degraded if replication lag exceeds this threshold. This will cause VTGates to choose more up-to-date servers over this one. If all servers are degraded, VTGate resorts to serving from all of them.</li>
-<li><strong>unhealthy_threshold (2h)</strong>: a tablet will publish itself as unhealthy if replication lag exceeds this threshold.</li>
-<li><strong>transaction_mode (multi)</strong>: <code class="prettyprint">single</code>: disallow multi-db transactions, <code class="prettyprint">multi</code>: allow multi-db transactions with best effort commit, <code class="prettyprint">twopc</code>: allow multi-db transactions with 2pc commit.</li>
-<li><strong>normalize_queries (false)</strong>: Turning this flag on will cause vtgate to rewrite queries with bind vars. This is beneficial if the app doesn&#39;t itself send normalized queries.</li>
-</ul>
-
-<h3 id="monitoring">Monitoring</h3>
-
-<h4 id="debug-status">/debug/status</h4>
-
-<p>This is the landing page for a VTGate, which can gives you a status on how a particular server is doing. Of particular interest there is the list of tablets this vtgate process is connected to, as this is the list of tablets that can potentially serve queries.</p>
-
-<h4 id="debug-vars">/debug/vars</h4>
-
-<h5 id="vtgateapi">VTGateApi</h5>
-
-<p>This is the main histogram variable to track for vtgates. It gives you a break up of all queries by command, keyspace, and type.</p>
-
-<h5 id="healthcheckconnections">HealthcheckConnections</h5>
-
-<p>It shows the number of tablet connections for query/healthcheck per keyspace, shard, and tablet type.</p>
-
-<h4 id="debug-query_plans">/debug/query_plans</h4>
-
-<p>This URL gives you all the query plans for queries going through VTGate.</p>
-
-<h4 id="debug-vschema">/debug/vschema</h4>
-
-<p>This URL shows the vschema as loaded by VTGate.</p>
-
-<h3 id="alerting">Alerting</h3>
-
-<p>For VTGate, here’s a list of possible variables to alert on:</p>
-
-<ul>
-<li>Error rate</li>
-<li>Error/query rate</li>
-<li>Error/query/tablet-type rate</li>
-<li>VTGate serving graph is stale by x minutes (lock server is down)</li>
-<li>Qps/core</li>
-<li>Latency</li>
-</ul>
-
-<!-- TODO: Add vtctld section. -->
-
-<h2 id="external-processes">External processes</h2>
-
-<p>Things that need to be configured:</p>
-
-<h3 id="periodic-backup-configuration">Periodic backup configuration</h3>
-
-<p>We recommend to take backups regularly e.g. you should set up a cron job for it. See our recommendations at  <a href="http://vitess.io/user-guide/backup-and-restore.html#backup-frequency">http://vitess.io/user-guide/backup-and-restore.html#backup-frequency</a>.</p>
-
-<h3 id="logs-archiver-purger">Logs archiver/purger</h3>
-
-<p>You will need to run some cron jobs to archive or purge log files periodically.</p>
-
-<h3 id="orchestrator">Orchestrator</h3>
-
-<p><a href="https://github.com/github/orchestrator">Orchestrator</a> is a tool for
-managing MySQL replication topologies, including automated failover.
-It can detect master failure and initiate a recovery in a matter of seconds.</p>
-
-<p>For the most part, Vitess is agnostic to the actions of Orchestrator,
-which operates below Vitess at the MySQL level. That means you can
-pretty much
-<a href="https://github.com/github/orchestrator/wiki/Orchestrator-Manual">set up Orchestrator</a>
-in the normal way, with just a few additions as described below.</p>
-
-<p>For the <a href="/getting-started/">Kubernetes example</a>, we provide a
-<a href="https://github.com/youtube/vitess/blob/master/examples/kubernetes/orchestrator-up.sh">sample script</a>
-to launch Orchestrator for you with these settings applied.</p>
-
-<h4 id="orchestrator-configuration">Orchestrator configuration</h4>
-
-<p>Orchestrator needs to know some things from the Vitess side,
-like the tablet aliases and whether semisync is enforced
-(with async fallback disabled).
-We pass this information by telling Orchestrator to execute certain
-queries that return local metadata from a non-replicated table,
-as seen in our sample
-<a href="https://github.com/youtube/vitess/blob/master/docker/orchestrator/orchestrator.conf.json">orchestrator.conf.json</a>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json">  <span class="s2">&quot;DetectClusterAliasQuery&quot;</span><span class="err">:</span> <span class="s2">&quot;SELECT value FROM _vt.local_metadata WHERE name=&#39;ClusterAlias&#39;&quot;</span><span class="err">,</span>
-  <span class="s2">&quot;DetectInstanceAliasQuery&quot;</span><span class="err">:</span> <span class="s2">&quot;SELECT value FROM _vt.local_metadata WHERE name=&#39;Alias&#39;&quot;</span><span class="err">,</span>
-  <span class="s2">&quot;DetectPromotionRuleQuery&quot;</span><span class="err">:</span> <span class="s2">&quot;SELECT value FROM _vt.local_metadata WHERE name=&#39;PromotionRule&#39;&quot;</span><span class="err">,</span>
-  <span class="s2">&quot;DetectSemiSyncEnforcedQuery&quot;</span><span class="err">:</span> <span class="s2">&quot;SELECT @@global.rpl_semi_sync_master_wait_no_slave AND @@global.rpl_semi_sync_master_timeout &gt; 1000000&quot;</span><span class="err">,</span>
-</code></pre></div>
-<p>There is also one thing that Vitess needs to know from Orchestrator,
-which is the identity of the master for each shard, if a failover occurs.</p>
-
-<p>From our experience at YouTube, we believe that this signal is too critical
-for data integrity to rely on bottom-up detection such as asking each MySQL
-if it thinks it&#39;s the master. Instead, we rely on Orchestrator to be the
-source of truth, and expect it to send a top-down signal to Vitess.</p>
-
-<p>This signal is sent by ensuring the Orchestrator server has access to
-<code class="prettyprint">vtctlclient</code>, which it then uses to send an RPC to vtctld, informing
-Vitess of the change in mastership via the
-<a href="/reference/vtctl.html#tabletexternallyreparented">TabletExternallyReparented</a>
-command.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json">  <span class="s2">&quot;PostMasterFailoverProcesses&quot;</span><span class="err">:</span> <span class="p">[</span>
-    <span class="s2">&quot;echo &#39;Recovered from {failureType} on {failureCluster}. Failed: {failedHost}:{failedPort}; Promoted: {successorHost}:{successorPort}&#39; &gt;&gt; /tmp/recovery.log&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;vtctlclient -server vtctld:15999 TabletExternallyReparented {successorAlias}&quot;</span>
-  <span class="p">]</span><span class="err">,</span>
-</code></pre></div>
-<h4 id="vttablet-configuration">VTTablet configuration</h4>
-
-<p>Normally, you need to seed Orchestrator by giving it the addresses of
-MySQL instances in each shard. If you have lots of shards, this could
-be tedious or error-prone.</p>
-
-<p>Luckily, Vitess already knows everything about all the MySQL instances
-that comprise your cluster. So we provide a mechanism for tablets to
-self-register with the Orchestrator API, configured by the following
-vttablet parameters:</p>
-
-<ul>
-<li><strong>orc_api_url</strong>: Address of Orchestrator&#39;s HTTP API (e.g. <a href="http://host:port/api/">http://host:port/api/</a>). Leave empty to disable Orchestrator integration.</li>
-<li><strong>orc_discover_interval</strong>: How often (e.g. 60s) to ping Orchestrator&#39;s HTTP API endpoint to tell it we exist. 0 means never.</li>
-</ul>
-
-<p>Not only does this relieve you from the initial seeding of addresses into
-Orchestrator, it also means new instances will be discovered immediately,
-and the topology will automatically repopulate even if Orchestrator&#39;s
-backing store is wiped out. Note that Orchestrator will forget stale
-instances after a configurable timeout.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/server-configuration/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/server-configuration/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/server-configuration/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/server-configuration/"</script>
 </html>
diff --git a/docs/user-guide/server-configuration/index.html b/docs/user-guide/server-configuration/index.html
new file mode 100644
index 00000000000..4479b9d243d
--- /dev/null
+++ b/docs/user-guide/server-configuration/index.html
@@ -0,0 +1,1053 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Server Configuration | Vitess</title>
+<meta property="og:title" content="Server Configuration" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/server-configuration/" />
+<meta property="og:url" content="http://vitess.io/user-guide/server-configuration/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/server-configuration/","headline":"Server Configuration","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Server Configuration</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h2 id="mysql">MySQL</h2>
+
+<p>Vitess has some requirements on how MySQL should be configured. These will be detailed below.</p>
+
+<p>As a reminder, semi-sync replication is highly recommended. It offers a much better durability story than relying on a disk. This will also let you relax the disk-based durability settings.</p>
+
+<h3 id="versions">Versions</h3>
+
+<p>MySQL versions supported are: MariaDB 10.0, MySQL 5.6 and MySQL 5.7. A number of custom versions based on these exist (Percona, …), Vitess most likely supports them if the version they are based on is supported.</p>
+
+<h3 id="config-files">Config files</h3>
+
+<h4 id="my-cnf">my.cnf</h4>
+
+<p>The main <code class="prettyprint">my.cnf</code> file is generated by
+<a href="https://github.com/youtube/vitess/blob/312064b96ac0070d9f8990e57af6f2c0a76a45a9/examples/local/vttablet-up.sh#L66">mysqlctl init</a>
+based primarily on
+<a href="https://github.com/youtube/vitess/blob/master/config/mycnf/default.cnf">$VTROOT/config/mycnf/default.cnf</a>.
+Additional files will be appended to the generated <code class="prettyprint">my.cnf</code> as specified in
+a colon-separated list of absolute paths in the <code class="prettyprint">EXTRA_MY_CNF</code> environment
+variable. For example, this is typically used to include <a href="https://github.com/youtube/vitess/blob/312064b96ac0070d9f8990e57af6f2c0a76a45a9/examples/local/vttablet-up.sh#L41">flavor-specific
+config files</a>.</p>
+
+<p>To customize the <code class="prettyprint">my.cnf</code>, you can either add overrides in an additional
+<code class="prettyprint">EXTRA_MY_CNF</code> file, or modify the files in <code class="prettyprint">$VTROOT/config/mycnf</code> before
+distributing to your servers. In Kubernetes, you can use a
+<a href="http://kubernetes.io/docs/user-guide/configmap/">ConfigMap</a> to overwrite
+the entire <code class="prettyprint">$VTROOT/config/mycnf</code> directory with your custom versions,
+rather than baking them into a custom container image.</p>
+
+<h4 id="init_db-sql">init_db.sql</h4>
+
+<p>When a new instance is initialized with <code class="prettyprint">mysqlctl init</code> (as opposed to
+restarting in a previously initialized data dir with <code class="prettyprint">mysqlctl start</code>),
+the <a href="https://github.com/youtube/vitess/blob/master/config/init_db.sql">init_db.sql</a>
+file is applied to the server immediatley after executing <code class="prettyprint">mysql_install_db</code>.
+By default, this file contains the equivalent of running
+<a href="https://dev.mysql.com/doc/refman/5.7/en/mysql-secure-installation.html">mysql_secure_installation</a>,
+as well as the necessary tables and grants for Vitess.</p>
+
+<p>If you are running Vitess on top of an existing MySQL instance,
+rather than using mysqlctl, you can use this file as a sample of what
+grants need to be applied to enable Vitess.</p>
+
+<p>Note that changes to this file will not be reflected in shards that have
+already been initialized and had at least one backup taken.
+New instances in such shards will automatically restore the latest backup
+upon vttablet startup, overwriting the data dir created by mysqlctl.</p>
+
+<h3 id="statement-based-replication-sbr">Statement-based replication (SBR)</h3>
+
+<p>Vitess relies on adding comments to DMLs, which are later parsed on the other end of replication for various post-processing work. The critical ones are:</p>
+
+<ul>
+<li>Redirect DMLs to the correct shard during resharding workflow.</li>
+<li>Identify which rows have changed for notifying downstream services that wish to subscribe to changes in vitess.</li>
+<li>Workflows that allow you to apply schema changes to replicas first, and rotate the masters, which improves uptime.</li>
+</ul>
+
+<p>In order to achieve this, Vitess also rewrites all your DMLs to be primary-key based. In a way, this also makes statement based replication almost as efficient as row-based replication (RBR). So, there should be no major loss of performance if you switched to SBR in Vitess.</p>
+
+<p>RBR will eventually be supported by Vitess.</p>
+
+<h3 id="data-types">Data types</h3>
+
+<p>Vitess supports data types at the MySQL 5.5 level. The newer data types like spatial or JSON are not supported yet. Additionally, the TIMESTAMP data type should not be used in a primary key or sharding column. Otherwise, Vitess cannot predict those values correctly and this may result in data corruption.</p>
+
+<h3 id="no-side-effects">No side effects</h3>
+
+<p>Vitess cannot guarantee data consistency if the schema contains constructs with side effects. These are triggers, stored procedures and foreign keys. This is because the resharding workflow and update stream cannot correctly detect what has changed by looking at a statement.</p>
+
+<p>This rule is not strictly enforced. You are allowed to add these things, but at your own risk. As long as you’ve ensured that a certain side-effect will not break Vitess, you can add it to the schema.</p>
+
+<p>Similar guidelines should be used when deciding to bypass Vitess to send statements directly to MySQL.</p>
+
+<p>Vitess also requires you to turn on STRICT_TRANS_TABLES mode. Otherwise, it cannot accurately predict what will be written to the database.</p>
+
+<p>It’s safe to apply backward compatible DDLs directly to MySQL. VTTablets can be configured to periodically check the schema for changes.</p>
+
+<p>There is also work in progress to actively watch the binlog for schema changes. This will likely happen around release 2.1.</p>
+
+<h3 id="autocommit">Autocommit</h3>
+
+<p>MySQL autocommit needs to be turned on.</p>
+
+<p>VTTablet uses connection pools to MySQL. If autocommit was turned off, MySQL will start an implicit transaction (with a point in time snapshot) for each connection and will work very hard at keeping the current view unchanged, which would be counter-productive.</p>
+
+<h3 id="safe-startup">Safe startup</h3>
+
+<p>We recommend to enable <code class="prettyprint">read-only</code> and <code class="prettyprint">skip-slave-start</code> at startup.
+The first ensures that writes will not be accepted accidentally,
+which could cause split brain or alternate futures.
+The second ensures that slaves do not connect to the master before
+settings like semisync are initialized by vttablet according to
+Vitess-specific logic.</p>
+
+<h3 id="binary-logging">Binary logging</h3>
+
+<p>By default, we enable binary logging everywhere (<code class="prettyprint">log-bin</code>),
+including on slaves (<code class="prettyprint">log-slave-updates</code>).
+On <em>replica</em> type tablets, this is important to make sure they have the
+necessary binlogs in case they are promoted to master.
+The slave binlogs are also used to implement Vitess features like
+filtered replication (during resharding) and the upcoming update stream
+and online schema swap.</p>
+
+<h3 id="global-transaction-id-gtid">Global Transaction ID (GTID)</h3>
+
+<p>Many features of Vitess require a fully GTID-based MySQL replication
+topology, including master management, resharding, update stream,
+and online schema swap.</p>
+
+<p>For MySQL 5.6+, that means you must use <code class="prettyprint">gtid_mode=ON</code> on all servers.
+We also strongly encourage <code class="prettyprint">enforce_gtid_consistency</code>.</p>
+
+<p>Similarly, for MariaDB, you should use <code class="prettyprint">gtid_strict_mode</code> to ensure that
+master management operations will fail rather than risk causing data loss
+if slaves diverge from the master due to external interference.</p>
+
+<h3 id="monitoring">Monitoring</h3>
+
+<p>In addition to monitoring the Vitess processes, we recommend to monitor MySQL as well. Here is a list of MySQL metrics you should monitor:</p>
+
+<ul>
+<li>QPS</li>
+<li>Bytes sent/received</li>
+<li>Replication lag</li>
+<li>Threads running</li>
+<li>Innodb buffer cache hit rate</li>
+<li>CPU, memory and disk usage. For disk, break into bytes read/written, latencies and IOPS.</li>
+</ul>
+
+<h3 id="recap">Recap</h3>
+
+<ul>
+<li>2-4 cores</li>
+<li>100-300GB data size</li>
+<li>Statement based replication (required)</li>
+<li>Semi-sync replication
+
+<ul>
+<li>rpl_semi_sync_master_timeout is huge (essentially never; there&#39;s no way to actually specify never)</li>
+<li>rpl_semi_sync_master_wait_no_slave = 1</li>
+<li>sync_binlog=0</li>
+<li>innodb_flush_log_at_trx_commit=2</li>
+</ul></li>
+<li>STRICT_TRANS_TABLES</li>
+<li>auto-commit ON (required)</li>
+<li>Additional parameters as mentioned in above sections.</li>
+</ul>
+
+<h2 id="vitess-servers">Vitess servers</h2>
+
+<p>Vitess servers are written in Go. There are a few Vitess-specific knobs that apply to all servers.</p>
+
+<h3 id="go-version">Go version</h3>
+
+<p>Go, being a young language, tends to add major improvements over each version.
+So, the latest Go version is almost always recommended.
+Note that the latest Go version may be higher than the minimum version we require for compiling the binaries (see <a href="/getting-started/#prerequisites">&quot;Prerequisites&quot; section in the Getting Started guide</a>).</p>
+
+<h3 id="gomaxprocs">GOMAXPROCS</h3>
+
+<p>You typically don’t have to set this environment variable. The default Go runtime will try to use as much CPU as necessary. However, if you want to force a Go server to not exceed a certain CPU limit, setting GOMAXPROCS to that value will work in most situations.</p>
+
+<h3 id="gogc">GOGC</h3>
+
+<p>The default value for this variable is 100. Which means that garbage is collected every time memory doubles from the baseline (100% growth). You typically don’t have to change this value either. However, if you care about tail latency, increasing this value will help you in that area, but at the cost of increased memory usage.</p>
+
+<h3 id="logging">Logging</h3>
+
+<p>Vitess servers write to log files, and they are rotated when they reach a maximum size. It’s recommended that you run at INFO level logging. The information printed in the log files come in handy for troubleshooting. You can limit the disk usage by running cron jobs that periodically purge or archive them.</p>
+
+<h3 id="grpc">gRPC</h3>
+
+<p>Vitess uses gRPC for communication between client and Vitess, and between Vitess
+servers. By default, Vitess does not use SSL.</p>
+
+<p>Also, even without using SSL, we allow the use of an application-provided
+CallerID object. It allows unsecure but easy to use authorization using Table
+ACLs.</p>
+
+<p>See the
+<a href="/user-guide/transport-security-model/">Transport Security Model document</a>
+for more information on how to setup both of these features, and what command
+line parameters exist.</p>
+
+<h2 id="topology-service-configuration">Topology Service configuration</h2>
+
+<p>Vttablet, vtgate, vtctld need the right command line parameters to find the
+Topology Server. First the <em>topo_implementation</em> flag needs to be set to one of
+<em>zk2</em>, <em>etcd2</em>, or <em>consul</em>. Then they&#39;re all configured as follows:</p>
+
+<ul>
+<li>The <em>topo_global_server_address</em> contains the server address / addresses of
+the global topology server.</li>
+<li>The <em>topo_global_root</em> contains the directory / path to use.</li>
+</ul>
+
+<p>Note that the local cell for the tablet must exist and be configured properly in
+the Topology Service for vttablet to start. Local cells are configured inside
+the topo server, by using the <code class="prettyprint">vtctl AddCellInfo</code> command. See
+the <a href="/user-guide/topology-service/">Topology Service</a> documentation for more
+information.</p>
+
+<h2 id="vttablet">VTTablet</h2>
+
+<!-- TODO: auto-generate a different doc from code for the command line parameters, and link from here. -->
+
+<p>VTTablet has a large number of command line options. Some important ones will be covered here. In terms of provisioning these are the recommended values</p>
+
+<ul>
+<li>2-4 cores (in proportion to MySQL cores)</li>
+<li>2-4 GB RAM</li>
+</ul>
+
+<h3 id="directory-configuration">Directory Configuration</h3>
+
+<p>vttablet supports a number of command line options and environment variables
+to facilitate its setup.</p>
+
+<p>The <strong>VTDATAROOT</strong> environment variable specifies the toplevel directory for all
+data files. If not set, it defaults to <code class="prettyprint">/vt</code>.</p>
+
+<p>By default, a vttablet will use a subdirectory in <strong>VTDATAROOT</strong> named
+<code class="prettyprint">vt_NNNNNNNNNN</code> where <code class="prettyprint">NNNNNNNNNN</code> is the tablet id. The <strong>tablet_dir</strong>
+command-line parameter allows overriding this relative path. This is useful in
+containers where the filesystem only contains one vttablet, in order to have a
+fixed root directory.</p>
+
+<p>When starting up and using <code class="prettyprint">mysqlctl</code> to manage MySQL, the MySQL files will be
+in subdirectories of the tablet root. For instance, <code class="prettyprint">bin-logs</code> for the binary
+logs, <code class="prettyprint">data</code> for the data files, and <code class="prettyprint">relay-logs</code> for the relay logs.</p>
+
+<p>It is possible to host different parts of a MySQL server files on different
+partitions. For instance, the data file may reside in flash, while the bin logs
+and relay logs are on spindle. To achieve this, create a symlink from
+<code class="prettyprint">$VTDATAROOT/&lt;dir name&gt;</code> to the proper location on disk. When MySQL is
+configured by mysqlctl, it will realize this directory exists, and use it for the
+files it would otherwise have put in the tablet directory. For instance, to host
+the binlogs in <code class="prettyprint">/mnt/bin-logs</code>:</p>
+
+<ul>
+<li><p>Create a symlink from <code class="prettyprint">$VTDATAROOT/bin-logs</code> to <code class="prettyprint">/mnt/bin-logs</code>.</p></li>
+<li><p>When starting up a tablet:</p>
+
+<ul>
+<li><code class="prettyprint">/mnt/bin-logs/vt_NNNNNNNNNN</code> will be created.</li>
+<li><code class="prettyprint">$VTDATAROOT/vt_NNNNNNNNNN/bin-logs</code> will be a symlink to
+<code class="prettyprint">/mnt/bin-logs/vt_NNNNNNNNNN</code></li>
+</ul></li>
+</ul>
+
+<h3 id="initialization">Initialization</h3>
+
+<ul>
+<li>Init_keyspace, init_shard, init_tablet_type: These parameters should be set at startup with the keyspace / shard / tablet type to start the tablet as. Note ‘master’ is not allowed here, instead use ‘replica’, as the tablet when starting will figure out if it is the master (this way, all replica tablets start with the same command line parameters, independently of which one is the master).</li>
+</ul>
+
+<h3 id="query-server-parameters">Query server parameters</h3>
+
+<!-- TODO: Change this section to link to auto-generated descriptions. -->
+
+<ul>
+<li><strong>queryserver-config-pool-size</strong>: This value should typically be set to the max number of simultaneous queries you want MySQL to run. This should typically be around 2-3x the number of allocated CPUs. Around 4-16. There is not much harm in going higher with this value, but you may see no additional benefits.</li>
+<li><strong>queryserver-config-stream-pool-size</strong>: This value is relevant only if you plan to run streaming queries against the database. It’s recommended that you use rdonly instances for such streaming queries. This value depends on how many simultaneous streaming queries you plan to run. Typical values are in the low 100s.</li>
+<li><strong>queryserver-config-transaction-cap</strong>: This value should be set to how many concurrent transactions you wish to allow. This should be a function of transaction QPS and transaction length. Typical values are in the low 100s.</li>
+<li><strong>queryserver-config-query-timeout</strong>: This value should be set to the upper limit you’re willing to allow a query to run before it’s deemed too expensive or detrimental to the rest of the system. VTTablet will kill any query that exceeds this timeout. This value is usually around 15-30s.</li>
+<li><strong>queryserver-config-transaction-timeout</strong>: This value is meant to protect the situation where a client has crashed without completing a transaction. Typical value for this timeout is 30s.</li>
+<li><strong>queryserver-config-max-result-size</strong>: This parameter prevents the OLTP application from accidentally requesting too many rows. If the result exceeds the specified number of rows, VTTablet returns an error. The default value is 10,000.</li>
+</ul>
+
+<h3 id="db-config-parameters">DB config parameters</h3>
+
+<p>VTTablet requires multiple user credentials to perform its tasks. Since it&#39;s required to run on the same machine as MySQL, it’s most beneficial to use the more efficient unix socket connections.</p>
+
+<p><strong>app</strong> credentials are for serving app queries:</p>
+
+<ul>
+<li><strong>db-config-app-unixsocket</strong>: MySQL socket name to connect to.</li>
+<li><strong>db-config-app-uname</strong>: App username.</li>
+<li><strong>db-config-app-pass</strong>: Password for the app username. If you need a more secure way of managing and supplying passwords, VTTablet does allow you to plug into a &quot;password server&quot; that can securely supply and refresh usernames and passwords. Please contact the Vitess team for help if you’d like to write such a custom plugin.</li>
+<li><strong>db-config-app-charset</strong>: The only supported character set is utf8. Vitess still works with latin1, but it’s getting deprecated.</li>
+</ul>
+
+<p><strong>dba</strong> credentials will be used for housekeeping work like loading the schema or killing runaway queries:</p>
+
+<ul>
+<li><strong>db-config-dba-unixsocket</strong></li>
+<li><strong>db-config-dba-uname</strong></li>
+<li><strong>db-config-dba-pass</strong></li>
+<li><strong>db-config-dba-charset</strong></li>
+</ul>
+
+<p><strong>repl</strong> credentials are for managing replication. Since repl connections can be used across machines, you can optionally turn on encryption:</p>
+
+<ul>
+<li><strong>db-config-repl-uname</strong></li>
+<li><strong>db-config-repl-pass</strong></li>
+<li><strong>db-config-repl-charset</strong></li>
+<li><strong>db-config-repl-flags</strong>: If you want to enable SSL, this must be set to 2048.</li>
+<li><strong>db-config-repl-ssl-ca</strong></li>
+<li><strong>db-config-repl-ssl-cert</strong></li>
+<li><strong>db-config-repl-ssl-key</strong></li>
+</ul>
+
+<p><strong>filtered</strong> credentials are for performing resharding:</p>
+
+<ul>
+<li><strong>db-config-filtered-unixsocket</strong></li>
+<li><strong>db-config-filtered-uname</strong></li>
+<li><strong>db-config-filtered-pass</strong></li>
+<li><strong>db-config-filtered-charset</strong></li>
+</ul>
+
+<h3 id="monitoring">Monitoring</h3>
+
+<p>VTTablet exports a wealth of real-time information about itself. This section will explain the essential ones:</p>
+
+<h4 id="debug-status">/debug/status</h4>
+
+<p>This page has a variety of human-readable information about the current VTTablet. You can look at this page to get a general overview of what’s going on. It also has links to various other diagnostic URLs below.</p>
+
+<h4 id="debug-vars">/debug/vars</h4>
+
+<p>This is the most important source of information for monitoring. There are other URLs below that can be used to further drill down.</p>
+
+<h5 id="queries-as-described-in-debug-vars-section">Queries (as described in /debug/vars section)</h5>
+
+<p>Vitess has a structured way of exporting certain performance stats. The most common one is the Histogram structure, which is used by Queries:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;Queries&quot;: {
+    &quot;Histograms&quot;: {
+      &quot;PASS_SELECT&quot;: {
+        &quot;1000000&quot;: 1138196,
+        &quot;10000000&quot;: 1138313,
+        &quot;100000000&quot;: 1138342,
+        &quot;1000000000&quot;: 1138342,
+        &quot;10000000000&quot;: 1138342,
+        &quot;500000&quot;: 1133195,
+        &quot;5000000&quot;: 1138277,
+        &quot;50000000&quot;: 1138342,
+        &quot;500000000&quot;: 1138342,
+        &quot;5000000000&quot;: 1138342,
+        &quot;Count&quot;: 1138342,
+        &quot;Time&quot;: 387710449887,
+        &quot;inf&quot;: 1138342
+      }
+    },
+    &quot;TotalCount&quot;: 1138342,
+    &quot;TotalTime&quot;: 387710449887
+  },
+</code></pre></div>
+<p>The histograms are broken out into query categories. In the above case, &quot;PASS_SELECT&quot; is the only category.  An entry like <code class="prettyprint">&quot;500000&quot;: 1133195</code> means that <code class="prettyprint">1133195</code> queries took under <code class="prettyprint">500000</code> nanoseconds to execute.</p>
+
+<p>Queries.Histograms.PASS_SELECT.Count is the total count in the PASS_SELECT category.</p>
+
+<p>Queries.Histograms.PASS_SELECT.Time is the total time in the PASS_SELECT category.</p>
+
+<p>Queries.TotalCount is the total count across all categories.</p>
+
+<p>Queries.TotalTime is the total time across all categories.</p>
+
+<p>There are other Histogram variables described below, and they will always have the same structure.</p>
+
+<p>Use this variable to track:</p>
+
+<ul>
+<li>QPS</li>
+<li>Latency</li>
+<li>Per-category QPS. For replicas, the only category will be PASS_SELECT, but there will be more for masters.</li>
+<li>Per-category latency</li>
+<li>Per-category tail latency</li>
+</ul>
+
+<h5 id="results">Results</h5>
+<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;Results&quot;: {
+    &quot;0&quot;: 0,
+    &quot;1&quot;: 0,
+    &quot;10&quot;: 1138326,
+    &quot;100&quot;: 1138326,
+    &quot;1000&quot;: 1138342,
+    &quot;10000&quot;: 1138342,
+    &quot;5&quot;: 1138326,
+    &quot;50&quot;: 1138326,
+    &quot;500&quot;: 1138342,
+    &quot;5000&quot;: 1138342,
+    &quot;Count&quot;: 1138342,
+    &quot;Total&quot;: 1140438,
+    &quot;inf&quot;: 1138342
+  }
+</code></pre></div>
+<p>Results is a simple histogram with no timing info. It gives you a histogram view of the number of rows returned per query.</p>
+
+<h5 id="mysql">Mysql</h5>
+
+<p>Mysql is a histogram variable like Queries, except that it reports MySQL execution times. The categories are &quot;Exec&quot; and “ExecStream”.</p>
+
+<p>In the past, the exec time difference between VTTablet and MySQL used to be substantial. With the newer versions of Go, the VTTablet exec time has been predominantly been equal to the mysql exec time, conn pool wait time and consolidations waits. In other words, this variable has not shown much value recently. However, it’s good to track this variable initially, until it’s determined that there are no other factors causing a big difference between MySQL performance and VTTablet performance.</p>
+
+<h5 id="transactions">Transactions</h5>
+
+<p>Transactions is a histogram variable that tracks transactions. The categories are &quot;Completed&quot; and “Aborted”.</p>
+
+<h5 id="waits">Waits</h5>
+
+<p>Waits is a histogram variable that tracks various waits in the system. Right now, the only category is &quot;Consolidations&quot;. A consolidation happens when one query waits for the results of an identical query already executing, thereby saving the database from performing duplicate work.</p>
+
+<p>This variable used to report connection pool waits, but a refactor moved those variables out into the pool related vars.</p>
+
+<h5 id="errors">Errors</h5>
+<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;Errors&quot;: {
+    &quot;Deadlock&quot;: 0,
+    &quot;Fail&quot;: 1,
+    &quot;NotInTx&quot;: 0,
+    &quot;TxPoolFull&quot;: 0
+  },
+</code></pre></div>
+<p>Errors are reported under different categories. It’s beneficial to track each category separately as it will be more helpful for troubleshooting. Right now, there are four categories. The category list may vary as Vitess evolves.</p>
+
+<p>Plotting errors/query can sometimes be useful for troubleshooting.</p>
+
+<p>VTTablet also exports an InfoErrors variable that tracks inconsequential errors that don’t signify any kind of problem with the system. For example, a dup key on insert is considered normal because apps tend to use that error to instead update an existing row. So, no monitoring is needed for that variable.</p>
+
+<h5 id="internalerrors">InternalErrors</h5>
+<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;InternalErrors&quot;: {
+    &quot;HungQuery&quot;: 0,
+    &quot;Invalidation&quot;: 0,
+    &quot;MemcacheStats&quot;: 0,
+    &quot;Mismatch&quot;: 0,
+    &quot;Panic&quot;: 0,
+    &quot;Schema&quot;: 0,
+    &quot;StrayTransactions&quot;: 0,
+    &quot;Task&quot;: 0
+  },
+</code></pre></div>
+<p>An internal error is an unexpected situation in code that may possibly point to a bug. Such errors may not cause outages, but even a single error needs be escalated for root cause analysis.</p>
+
+<h5 id="kills">Kills</h5>
+<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;Kills&quot;: {
+    &quot;Queries&quot;: 2,
+    &quot;Transactions&quot;: 0
+  },
+</code></pre></div>
+<p>Kills reports the queries and transactions killed by VTTablet due to timeout. It’s a very important variable to look at during outages.</p>
+
+<h5 id="transactionpool">TransactionPool*</h5>
+
+<p>There are a few variables with the above prefix:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">  &quot;TransactionPoolAvailable&quot;: 300,
+  &quot;TransactionPoolCapacity&quot;: 300,
+  &quot;TransactionPoolIdleTimeout&quot;: 600000000000,
+  &quot;TransactionPoolMaxCap&quot;: 300,
+  &quot;TransactionPoolTimeout&quot;: 30000000000,
+  &quot;TransactionPoolWaitCount&quot;: 0,
+  &quot;TransactionPoolWaitTime&quot;: 0,
+</code></pre></div>
+<ul>
+<li>WaitCount will give you how often the transaction pool gets full that causes new transactions to wait.</li>
+<li>WaitTime/WaitCount will tell you the average wait time.</li>
+<li>Available is a gauge that tells you the number of available connections in the pool in real-time. Capacity-Available is the number of connections in use. Note that this number could be misleading if the traffic is spiky.</li>
+</ul>
+
+<h5 id="other-pool-variables">Other Pool variables</h5>
+
+<p>Just like TransactionPool, there are variables for other pools:</p>
+
+<ul>
+<li>ConnPool: This is the pool used for read traffic.</li>
+<li>StreamConnPool: This is the pool used for streaming queries.</li>
+</ul>
+
+<p>There are other internal pools used by VTTablet that are not very consequential.</p>
+
+<h5 id="tableaclallowed-tableacldenied-tableaclpseudodenied">TableACLAllowed, TableACLDenied, TableACLPseudoDenied</h5>
+
+<p>The above three variables table acl stats broken out by table, plan and user.</p>
+
+<h5 id="querycachesize">QueryCacheSize</h5>
+
+<p>If the application does not make good use of bind variables, this value would reach the QueryCacheCapacity. If so, inspecting the current query cache will give you a clue about where the misuse is happening.</p>
+
+<h5 id="querycounts-queryerrorcounts-queryrowcounts-querytimesns">QueryCounts, QueryErrorCounts, QueryRowCounts, QueryTimesNs</h5>
+
+<p>These variables are another multi-dimensional view of Queries. They have a lot more data than Queries because they’re broken out into tables as well as plan. This is a priceless source of information when it comes to troubleshooting. If an outage is related to rogue queries, the graphs plotted from these vars will immediately show the table on which such queries are run. After that, a quick look at the detailed query stats will most likely identify the culprit.</p>
+
+<h5 id="usertablequerycount-usertablequerytimesns-usertransactioncount-usertransactiontimesns">UserTableQueryCount, UserTableQueryTimesNs, UserTransactionCount, UserTransactionTimesNs</h5>
+
+<p>These variables are yet another view of Queries, but broken out by user, table and plan. If you have well-compartmentalized app users, this is another priceless way of identifying a rogue &quot;user app&quot; that could be misbehaving.</p>
+
+<h5 id="datafree-datalength-indexlength-tablerows">DataFree, DataLength, IndexLength, TableRows</h5>
+
+<p>These variables are updated periodically from information_schema.tables. They represent statistical information as reported by MySQL about each table. They can be used for planning purposes, or to track unusual changes in table stats.</p>
+
+<ul>
+<li>DataFree represents data_free</li>
+<li>DataLength represents data_length</li>
+<li>IndexLength represents index_length</li>
+<li>TableRows represents table_rows</li>
+</ul>
+
+<h4 id="debug-health">/debug/health</h4>
+
+<p>This URL prints out a simple &quot;ok&quot; or “not ok” string that can be used to check if the server is healthy. The health check makes sure mysqld connections work, and replication is configured (though not necessarily running) if not master.</p>
+
+<h4 id="queryz-debug-query_stats-debug-query_plans-streamqueryz">/queryz, /debug/query_stats, /debug/query_plans, /streamqueryz</h4>
+
+<ul>
+<li>/debug/query_stats is a JSON view of the per-query stats. This information is pulled in real-time from the query cache. The per-table stats in /debug/vars are a roll-up of this information.</li>
+<li>/queryz is a human-readable version of /debug/query_stats. If a graph shows a table as a possible source of problems, this is the next place to look at to see if a specific query is the root cause.</li>
+<li>/debug/query_plans is a more static view of the query cache. It just shows how VTTablet will process or rewrite the input query.</li>
+<li>/streamqueryz lists the currently running streaming queries. You have the option to kill any of them from this page.</li>
+</ul>
+
+<h4 id="querylogz-debug-querylog-txlogz-debug-txlog">/querylogz, /debug/querylog, /txlogz, /debug/txlog</h4>
+
+<ul>
+<li>/debug/querylog is a never-ending stream of currently executing queries with verbose information about each query. This URL can generate a lot of data because it streams every query processed by VTTablet. The details are as per this function: <a href="https://github.com/youtube/vitess/blob/master/go/vt/tabletserver/logstats.go#L202">https://github.com/youtube/vitess/blob/master/go/vt/tabletserver/logstats.go#L202</a></li>
+<li>/querylogz is a limited human readable version of /debug/querylog. It prints the next 300 queries by default. The limit can be specified with a limit=N parameter on the URL.</li>
+<li>/txlogz is like /querylogz, but for transactions.</li>
+<li>/debug/txlog is the JSON counterpart to /txlogz.</li>
+</ul>
+
+<h4 id="consolidations">/consolidations</h4>
+
+<p>This URL has an MRU list of consolidations. This is a way of identifying if multiple clients are spamming the same query to a server.</p>
+
+<h4 id="schemaz-debug-schema">/schemaz, /debug/schema</h4>
+
+<ul>
+<li>/schemaz shows the schema info loaded by VTTablet.</li>
+<li>/debug/schema is the JSON version of /schemaz.</li>
+</ul>
+
+<h4 id="debug-query_rules">/debug/query_rules</h4>
+
+<p>This URL displays the currently active query blacklist rules.</p>
+
+<h4 id="debug-health">/debug/health</h4>
+
+<p>This URL prints out a simple &quot;ok&quot; or “not ok” string that can be used to check if the server is healthy.</p>
+
+<h3 id="alerting">Alerting</h3>
+
+<p>Alerting is built on top of the variables you monitor. Before setting up alerts, you should get some baseline stats and variance, and then you can build meaningful alerting rules. You can use the following list as a guideline to build your own:</p>
+
+<ul>
+<li>Query latency among all vttablets</li>
+<li>Per keyspace latency</li>
+<li>Errors/query</li>
+<li>Memory usage</li>
+<li>Unhealthy for too long</li>
+<li>Too many vttablets down</li>
+<li>Health has been flapping</li>
+<li>Transaction pool full error rate</li>
+<li>Any internal error</li>
+<li>Traffic out of balance among replicas</li>
+<li>Qps/core too high</li>
+</ul>
+
+<h2 id="vtgate">VTGate</h2>
+
+<p>A typical VTGate should be provisioned as follows.</p>
+
+<ul>
+<li>2-4 cores</li>
+<li>2-4 GB RAM</li>
+</ul>
+
+<p>Since VTGate is stateless, you can scale it linearly by just adding more servers as needed. Beyond the recommended values, it’s better to add more VTGates than giving more resources to existing servers, as recommended in the philosophy section.</p>
+
+<p>Load-balancer in front of vtgate to scale up (not covered by Vitess). Stateless, can use the health URL for health check.</p>
+
+<h3 id="parameters">Parameters</h3>
+
+<ul>
+<li><strong>cells_to_watch</strong>: which cell vtgate is in and will monitor tablets from. Cross-cell master access needs multiple cells here.</li>
+<li><strong>tablet_types_to_wait</strong>: VTGate waits for at least one serving tablet per tablet type specified here during startup, before listening to the serving port. So VTGate does not serve error. It should match the available tablet types VTGate connects to (master, replica, rdonly).</li>
+<li><strong>discovery_low_replication_lag</strong>: when replication lags of all VTTablet in a particular shard and tablet type are less than or equal the flag (in seconds), VTGate does not filter them by replication lag and uses all to balance traffic.</li>
+<li><strong>degraded_threshold (30s)</strong>: a tablet will publish itself as degraded if replication lag exceeds this threshold. This will cause VTGates to choose more up-to-date servers over this one. If all servers are degraded, VTGate resorts to serving from all of them.</li>
+<li><strong>unhealthy_threshold (2h)</strong>: a tablet will publish itself as unhealthy if replication lag exceeds this threshold.</li>
+<li><strong>transaction_mode (multi)</strong>: <code class="prettyprint">single</code>: disallow multi-db transactions, <code class="prettyprint">multi</code>: allow multi-db transactions with best effort commit, <code class="prettyprint">twopc</code>: allow multi-db transactions with 2pc commit.</li>
+<li><strong>normalize_queries (false)</strong>: Turning this flag on will cause vtgate to rewrite queries with bind vars. This is beneficial if the app doesn&#39;t itself send normalized queries.</li>
+</ul>
+
+<h3 id="monitoring">Monitoring</h3>
+
+<h4 id="debug-status">/debug/status</h4>
+
+<p>This is the landing page for a VTGate, which can gives you a status on how a particular server is doing. Of particular interest there is the list of tablets this vtgate process is connected to, as this is the list of tablets that can potentially serve queries.</p>
+
+<h4 id="debug-vars">/debug/vars</h4>
+
+<h5 id="vtgateapi">VTGateApi</h5>
+
+<p>This is the main histogram variable to track for vtgates. It gives you a break up of all queries by command, keyspace, and type.</p>
+
+<h5 id="healthcheckconnections">HealthcheckConnections</h5>
+
+<p>It shows the number of tablet connections for query/healthcheck per keyspace, shard, and tablet type.</p>
+
+<h4 id="debug-query_plans">/debug/query_plans</h4>
+
+<p>This URL gives you all the query plans for queries going through VTGate.</p>
+
+<h4 id="debug-vschema">/debug/vschema</h4>
+
+<p>This URL shows the vschema as loaded by VTGate.</p>
+
+<h3 id="alerting">Alerting</h3>
+
+<p>For VTGate, here’s a list of possible variables to alert on:</p>
+
+<ul>
+<li>Error rate</li>
+<li>Error/query rate</li>
+<li>Error/query/tablet-type rate</li>
+<li>VTGate serving graph is stale by x minutes (lock server is down)</li>
+<li>Qps/core</li>
+<li>Latency</li>
+</ul>
+
+<!-- TODO: Add vtctld section. -->
+
+<h2 id="external-processes">External processes</h2>
+
+<p>Things that need to be configured:</p>
+
+<h3 id="periodic-backup-configuration">Periodic backup configuration</h3>
+
+<p>We recommend to take backups regularly e.g. you should set up a cron job for it. See our recommendations at  <a href="/user-guide/backup-and-restore/#backup-frequency">/user-guide/backup-and-restore/#backup-frequency</a>.</p>
+
+<h3 id="logs-archiver-purger">Logs archiver/purger</h3>
+
+<p>You will need to run some cron jobs to archive or purge log files periodically.</p>
+
+<h3 id="orchestrator">Orchestrator</h3>
+
+<p><a href="https://github.com/github/orchestrator">Orchestrator</a> is a tool for
+managing MySQL replication topologies, including automated failover.
+It can detect master failure and initiate a recovery in a matter of seconds.</p>
+
+<p>For the most part, Vitess is agnostic to the actions of Orchestrator,
+which operates below Vitess at the MySQL level. That means you can
+pretty much
+<a href="https://github.com/github/orchestrator/wiki/Orchestrator-Manual">set up Orchestrator</a>
+in the normal way, with just a few additions as described below.</p>
+
+<p>For the <a href="/getting-started/">Kubernetes example</a>, we provide a
+<a href="https://github.com/youtube/vitess/blob/master/examples/kubernetes/orchestrator-up.sh">sample script</a>
+to launch Orchestrator for you with these settings applied.</p>
+
+<h4 id="orchestrator-configuration">Orchestrator configuration</h4>
+
+<p>Orchestrator needs to know some things from the Vitess side,
+like the tablet aliases and whether semisync is enforced
+(with async fallback disabled).
+We pass this information by telling Orchestrator to execute certain
+queries that return local metadata from a non-replicated table,
+as seen in our sample
+<a href="https://github.com/youtube/vitess/blob/master/docker/orchestrator/orchestrator.conf.json">orchestrator.conf.json</a>:</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json">  <span class="s2">&quot;DetectClusterAliasQuery&quot;</span><span class="err">:</span> <span class="s2">&quot;SELECT value FROM _vt.local_metadata WHERE name=&#39;ClusterAlias&#39;&quot;</span><span class="err">,</span>
+  <span class="s2">&quot;DetectInstanceAliasQuery&quot;</span><span class="err">:</span> <span class="s2">&quot;SELECT value FROM _vt.local_metadata WHERE name=&#39;Alias&#39;&quot;</span><span class="err">,</span>
+  <span class="s2">&quot;DetectPromotionRuleQuery&quot;</span><span class="err">:</span> <span class="s2">&quot;SELECT value FROM _vt.local_metadata WHERE name=&#39;PromotionRule&#39;&quot;</span><span class="err">,</span>
+  <span class="s2">&quot;DetectSemiSyncEnforcedQuery&quot;</span><span class="err">:</span> <span class="s2">&quot;SELECT @@global.rpl_semi_sync_master_wait_no_slave AND @@global.rpl_semi_sync_master_timeout &gt; 1000000&quot;</span><span class="err">,</span>
+</code></pre></div>
+<p>There is also one thing that Vitess needs to know from Orchestrator,
+which is the identity of the master for each shard, if a failover occurs.</p>
+
+<p>From our experience at YouTube, we believe that this signal is too critical
+for data integrity to rely on bottom-up detection such as asking each MySQL
+if it thinks it&#39;s the master. Instead, we rely on Orchestrator to be the
+source of truth, and expect it to send a top-down signal to Vitess.</p>
+
+<p>This signal is sent by ensuring the Orchestrator server has access to
+<code class="prettyprint">vtctlclient</code>, which it then uses to send an RPC to vtctld, informing
+Vitess of the change in mastership via the
+<a href="/reference/vtctl/#tabletexternallyreparented">TabletExternallyReparented</a>
+command.</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json">  <span class="s2">&quot;PostMasterFailoverProcesses&quot;</span><span class="err">:</span> <span class="p">[</span>
+    <span class="s2">&quot;echo &#39;Recovered from {failureType} on {failureCluster}. Failed: {failedHost}:{failedPort}; Promoted: {successorHost}:{successorPort}&#39; &gt;&gt; /tmp/recovery.log&quot;</span><span class="p">,</span>
+    <span class="s2">&quot;vtctlclient -server vtctld:15999 TabletExternallyReparented {successorAlias}&quot;</span>
+  <span class="p">]</span><span class="err">,</span>
+</code></pre></div>
+<h4 id="vttablet-configuration">VTTablet configuration</h4>
+
+<p>Normally, you need to seed Orchestrator by giving it the addresses of
+MySQL instances in each shard. If you have lots of shards, this could
+be tedious or error-prone.</p>
+
+<p>Luckily, Vitess already knows everything about all the MySQL instances
+that comprise your cluster. So we provide a mechanism for tablets to
+self-register with the Orchestrator API, configured by the following
+vttablet parameters:</p>
+
+<ul>
+<li><strong>orc_api_url</strong>: Address of Orchestrator&#39;s HTTP API (e.g. <a href="http://host:port/api/">http://host:port/api/</a>). Leave empty to disable Orchestrator integration.</li>
+<li><strong>orc_discover_interval</strong>: How often (e.g. 60s) to ping Orchestrator&#39;s HTTP API endpoint to tell it we exist. 0 means never.</li>
+</ul>
+
+<p>Not only does this relieve you from the initial seeding of addresses into
+Orchestrator, it also means new instances will be discovered immediately,
+and the topology will automatically repopulate even if Orchestrator&#39;s
+backing store is wiped out. Note that Orchestrator will forget stale
+instances after a configurable timeout.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/sharding-kubernetes-workflow.html b/docs/user-guide/sharding-kubernetes-workflow.html
index 6e3205e5448..352a7fef86d 100644
--- a/docs/user-guide/sharding-kubernetes-workflow.html
+++ b/docs/user-guide/sharding-kubernetes-workflow.html
@@ -1,521 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Sharding in Kubernetes (Tutorial, automated)</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Sharding in Kubernetes (Tutorial, automated)"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Sharding in Kubernetes (Tutorial, automated)</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>This guide shows you an example about how to apply range-based sharding
-process in an existing unsharded Vitess <a href="http://vitess.io/overview/concepts.html#keyspace">keyspace</a>
-in <a href="http://kubernetes.io/">Kubernetes</a> using the horizontal resharding workflow.
-In this example, we will reshard from 1 shard &quot;0&quot; into 2 shards &quot;-80&quot; and &quot;80-&quot;.
-We will follow a process similar to the general
-<a href="http://vitess.io/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding guide</a>
-except that here we&#39;ll give you the commands you&#39;ll need in the kubernetes
-environment.</p>
-
-<h2 id="overview">Overview</h2>
-
-<p>The horizontal resharding process overview can be found
-<a href="http://vitess.io/user-guide/horizontal-sharding-workflow.html#overview">here</a> </p>
-
-<h2 id="prerequisites">Prerequisites</h2>
-
-<p>You should complete the <a href="http://vitess.io/getting-started/">Getting Started on Kubernetes</a>
-guide (please finish all the steps before Try Vitess resharding) and have left
-the cluster running. Then, please follow these steps before running the
-resharding process:</p>
-
-<ol>
-<li><p>Configure sharding information. By running the command below, we tell
-Vitess to shard the data using the page column through the provided VSchema.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ApplyVSchema -vschema <span class="s2">&quot;$(cat vschema.json)&quot;</span> test_keyspace
-</code></pre></div></li>
-<li><p>Bring up tablets for 2 additional shards:  <em>test_keyspace/-80</em> and
-<em>test_keyspace/80-</em> (you can learn more about sharding key range
-<a href="http://vitess.io/user-guide/sharding.html#key-ranges-and-partitions">here</a>):</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vttablet-up.sh
-</code></pre></div>
-<p>Initialize replication by electing the first master for each of the new shards:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh InitShardMaster -force test_keyspace/-80 <span class="nb">test</span>-200
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh InitShardMaster -force test_keyspace/80- <span class="nb">test</span>-300
-</code></pre></div>
-<p>After this set up, you should see the shards on Dashboard page of vtctld UI
-(<a href="http://localhost:8001/api/v1/proxy/namespaces/default/services/vtctld:web">http://localhost:8001/api/v1/proxy/namespaces/default/services/vtctld:web</a>).
-There should be 1 serving shard named &quot;0&quot; and 2 non-serving shards named
-&quot;-80&quot; and &quot;80-&quot;. Click the shard node, you can inspect all its tablets
-information.</p></li>
-<li><p>Bring up a <em>vtworker</em> process (a pod in kubernetes) and a <em>vtworker</em> service
-which is used by the workflow to connect with the <em>vtworker</em> pod. (The
-number of <em>vtworker</em> should be the same of original shards, we start one
-vtworker process here since we have only one original shard in this example.)</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./vtworker-up.sh
-</code></pre></div>
-<p>You can check out the external IP for the vtworker service (please take note
-of this external IP, it will be used for the vtworker address in creating
-the resharding workflow):</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>kubectl get service vtworker
-</code></pre></div>
-<p>You can verify this <em>vtworker</em> process set up through http://<EXTERNAL-IP>:15032/Debugging.
-It should be pinged successfully. After you ping the vtworker, please click
-&quot;Reset Job&quot;. Otherwise, the vtworker is not ready for executing other tasks.</p></li>
-</ol>
-
-<h2 id="horizontal-resharding-workflow">Horizontal Resharding Workflow</h2>
-
-<h3 id="create-the-workflow">Create the Workflow</h3>
-
-<p>Using the web vtctld UI to create the workflow is the same with <a href="http://vitess.io/user-guide/horizontal-sharding-workflow.html#create-the-workflow">steps in local
-environment</a>
-except for filling the &quot;vtworker Addresses&quot; slot. You need to get the external
-IP for vtworker service (mentioned in
-<a href="sharding-kubernetes-workflow.html#prerequisites">Prerequisites</a>) and use
-&lt;EXTERNAL-IP&gt;:15033 as the vtworker addresses.</p>
-
-<p>Another way to start the workflow is through the vtctlclient command:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh WorkflowCreate -skip_start<span class="o">=</span><span class="nb">false </span>horizontal_resharding -keyspace<span class="o">=</span>test_keyspace -vtworkers<span class="o">=</span>&lt;EXTERNAL-IP&gt;:15033 -enable_approvals<span class="o">=</span><span class="nb">true</span>
-</code></pre></div>
-<h3 id="approvals-of-tasks-execution-canary-feature">Approvals of Tasks Execution (Canary feature)</h3>
-
-<p>Please check the content in general 
-<a href="http://vitess.io/user-guide/horizontal-sharding-workflow.html#approvals-of-tasks-execution-canary-feature">Horizontal Sharding guide</a></p>
-
-<h3 id="retry">Retry</h3>
-
-<p>Please check the content in general 
-<a href="http://vitess.io/user-guide/horizontal-sharding-workflow.html#retry">Horizontal Sharding guide</a></p>
-
-<h3 id="checkpoint-and-recovery">Checkpoint and Recovery</h3>
-
-<p>Please check the content in general 
-<a href="http://vitess.io/user-guide/horizontal-sharding-workflow.html#checkpoint-and-recovery">Horizontal Sharding guide</a></p>
-
-<h2 id="verify-results-and-clean-up">Verify Results and Clean up</h2>
-
-<p>After the resharding process, data in the original shard is identically copied
-to new shards. Data updates will be visible on the new shards, but not on the
-original shard. You should then see in the vtctld UI <em>Dashboard</em> page that shard
-<em>0</em> becomes non-serving and shard <em>-80</em> and shard <em>80-</em> are serving shards.
-Verify this for yourself: inspect the database content,
-then add messages to the guestbook page and inspect again. You can use
-http://&lt;EXTERNAL-IP&gt; (EXTERNAL-IP refers to the external IP of the guest book
-service) to visit the guestbook webpage in your browser and choose any random
-page for inserting information. Details can be found
-<a href="http://vitess.io/getting-started/#test-your-cluster-with-a-client-app">here</a>)
-You can inspect the database content using the following commands:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># See what&#39;s on shard test_keyspace/0</span>
-<span class="c"># (no updates visible since we migrated away from it):</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-100 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-<span class="c"># See what&#39;s on shard test_keyspace/-80:</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-200 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-<span class="c"># See what&#39;s on shard test_keyspace/80-:</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-300 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-</code></pre></div>
-<p>You can also checkout the <em>Topology</em> browser on vtctl UI. It shows you the
-information of the keyrange of shard and their serving status. Each shard
-should look like this</p>
-
-<p><a href="https://cloud.githubusercontent.com/assets/23492389/24313876/072f61e6-109c-11e7-938a-23b8398958aa.png">shard 0</a></p>
-
-<p><a href="https://cloud.githubusercontent.com/assets/23492389/24313813/bd11c824-109b-11e7-83d4-cca3f6093360.png">shard -80</a></p>
-
-<p><a href="https://cloud.githubusercontent.com/assets/23492389/24313743/7f9ae1c4-109b-11e7-997a-774f4f16e473.png">shard 80-</a></p>
-
-<p>After you verify the result, we can remove the
-original shard since all traffic is being served from the new shards:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./vttablet-down.sh
-</code></pre></div>
-<p>Then we can delete the now-empty shard:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./kvtctl.sh DeleteShard -recursive test_keyspace/0
-</code></pre></div>
-<p>You should then see in the vtctld UI <em>Dashboard</em> page that shard <em>0</em> is gone.</p>
-
-<h2 id="tear-down-and-clean-up">Tear down and Clean up</h2>
-
-<p>Since you already cleaned up the tablets from the original unsharded example by
-running <code class="prettyprint">./vttablet-down.sh</code>, that step has been replaced with
-<code class="prettyprint">./sharded-vttablet-down.sh</code> to clean up the new sharded tablets.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./guestbook-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./vtworker-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./vtgate-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vttablet-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./vtctld-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./etcd-down.sh
-</code></pre></div>
-<p>Then tear down the Container Engine cluster itself, which will stop the virtual machines running on Compute Engine:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>gcloud container clusters delete example
-</code></pre></div>
-<p>It&#39;s also a good idea to remove the firewall rules you created, unless you plan to use them again soon:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>gcloud compute firewall-rules delete vtctld guestbook
-</code></pre></div>
-<h2 id="reference">Reference</h2>
-
-<p>You can checkout the old version tutorial <a href="http://vitess.io/user-guide/sharding-kubernetes.html">here</a>.
-It walks you through the resharding process by manually executing commands.</p>
-
-<p>For the kubectl command line interface, which helps you interact with the
-kubernetes cluster, you can check out more information
-<a href="https://kubernetes.io/docs/user-guide/kubectl-overview">here</a>.</p>
-
-<h2 id="troubleshooting">Troubleshooting</h2>
-
-<h3 id="checking-status-of-your-setup">Checking status of your setup.</h3>
-
-<p>To get status of pods and services you&#39;ve setup, you can use the commands
-(all pods should be in Running status, guestbook and vtworker services
-should have assign external IP):</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>kubectl get pods
-<span class="nv">$ </span>kubectl get services
-</code></pre></div>
-<h3 id="debugging-pods">Debugging pods.</h3>
-
-<p>If you find out a component (e.g. vttablet, vtgate) doesn&#39;t respond as
-expected, you can surface the log using this command (the pod name can be
-found out using the command mentioned above):</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>kubectl logs &lt;pod name&gt; <span class="o">[</span>-c &lt;container&gt;<span class="o">]</span>
-<span class="c">### example</span>
-<span class="c"># $ kubectl logs vtworker</span>
-<span class="c"># $ kubectl logs vttablet-XXXX -c vttablet</span>
-</code></pre></div>
-<h3 id="debugging-pending-external-ip-issue">Debugging pending external IP issue.</h3>
-
-<p>If you found that your service has a pending external IP for long time, it
-maybe because you&#39;ve reached the limitation of networking resource. Please
-go to your project console on gcloud (cloud.google.com), then go to <em>Load
-balancing</em> page (you can search &quot;Load balancing&quot; in the search bar to get
-to the page) under Networking section. Then, click &quot;advanced menu&quot; for
-editing load balancing resources. Check the forwarding rules you have and
-delete the unused ones if there are too many.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/sharding-kubernetes-workflow/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/sharding-kubernetes-workflow/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/sharding-kubernetes-workflow/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/sharding-kubernetes-workflow/"</script>
 </html>
diff --git a/docs/user-guide/sharding-kubernetes-workflow/index.html b/docs/user-guide/sharding-kubernetes-workflow/index.html
new file mode 100644
index 00000000000..1430e62acb3
--- /dev/null
+++ b/docs/user-guide/sharding-kubernetes-workflow/index.html
@@ -0,0 +1,530 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Sharding in Kubernetes (Tutorial, automated) | Vitess</title>
+<meta property="og:title" content="Sharding in Kubernetes (Tutorial, automated)" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/sharding-kubernetes-workflow/" />
+<meta property="og:url" content="http://vitess.io/user-guide/sharding-kubernetes-workflow/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/sharding-kubernetes-workflow/","headline":"Sharding in Kubernetes (Tutorial, automated)","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Sharding in Kubernetes (Tutorial, automated)</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>This guide shows you an example about how to apply range-based sharding
+process in an existing unsharded Vitess <a href="/overview/concepts/#keyspace">keyspace</a>
+in <a href="http://kubernetes.io/">Kubernetes</a> using the horizontal resharding workflow.
+In this example, we will reshard from 1 shard &quot;0&quot; into 2 shards &quot;-80&quot; and &quot;80-&quot;.
+We will follow a process similar to the general
+<a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding guide</a>
+except that here we&#39;ll give you the commands you&#39;ll need in the kubernetes
+environment.</p>
+
+<h2 id="overview">Overview</h2>
+
+<p>The horizontal resharding process overview can be found
+<a href="/user-guide/horizontal-sharding-workflow/#overview">here</a> </p>
+
+<h2 id="prerequisites">Prerequisites</h2>
+
+<p>You should complete the <a href="/getting-started/">Getting Started on Kubernetes</a>
+guide (please finish all the steps before Try Vitess resharding) and have left
+the cluster running. Then, please follow these steps before running the
+resharding process:</p>
+
+<ol>
+<li><p>Configure sharding information. By running the command below, we tell
+Vitess to shard the data using the page column through the provided VSchema.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ApplyVSchema -vschema <span class="s2">&quot;$(cat vschema.json)&quot;</span> test_keyspace
+</code></pre></div></li>
+<li><p>Bring up tablets for 2 additional shards:  <em>test_keyspace/-80</em> and
+<em>test_keyspace/80-</em> (you can learn more about sharding key range
+<a href="/user-guide/sharding/#key-ranges-and-partitions">here</a>):</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vttablet-up.sh
+</code></pre></div>
+<p>Initialize replication by electing the first master for each of the new shards:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh InitShardMaster -force test_keyspace/-80 <span class="nb">test</span>-200
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh InitShardMaster -force test_keyspace/80- <span class="nb">test</span>-300
+</code></pre></div>
+<p>After this set up, you should see the shards on Dashboard page of vtctld UI
+(<a href="http://localhost:8001/api/v1/proxy/namespaces/default/services/vtctld:web">http://localhost:8001/api/v1/proxy/namespaces/default/services/vtctld:web</a>).
+There should be 1 serving shard named &quot;0&quot; and 2 non-serving shards named
+&quot;-80&quot; and &quot;80-&quot;. Click the shard node, you can inspect all its tablets
+information.</p></li>
+<li><p>Bring up a <em>vtworker</em> process (a pod in kubernetes) and a <em>vtworker</em> service
+which is used by the workflow to connect with the <em>vtworker</em> pod. (The
+number of <em>vtworker</em> should be the same of original shards, we start one
+vtworker process here since we have only one original shard in this example.)</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./vtworker-up.sh
+</code></pre></div>
+<p>You can check out the external IP for the vtworker service (please take note
+of this external IP, it will be used for the vtworker address in creating
+the resharding workflow):</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>kubectl get service vtworker
+</code></pre></div>
+<p>You can verify this <em>vtworker</em> process set up through http://<EXTERNAL-IP>:15032/Debugging.
+It should be pinged successfully. After you ping the vtworker, please click
+&quot;Reset Job&quot;. Otherwise, the vtworker is not ready for executing other tasks.</p></li>
+</ol>
+
+<h2 id="horizontal-resharding-workflow">Horizontal Resharding Workflow</h2>
+
+<h3 id="create-the-workflow">Create the Workflow</h3>
+
+<p>Using the web vtctld UI to create the workflow is the same with <a href="/user-guide/horizontal-sharding-workflow/#create-the-workflow">steps in local
+environment</a>
+except for filling the &quot;vtworker Addresses&quot; slot. You need to get the external
+IP for vtworker service (mentioned in
+<a href="#prerequisites">Prerequisites</a>) and use
+&lt;EXTERNAL-IP&gt;:15033 as the vtworker addresses.</p>
+
+<p>Another way to start the workflow is through the vtctlclient command:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh WorkflowCreate -skip_start<span class="o">=</span><span class="nb">false </span>horizontal_resharding -keyspace<span class="o">=</span>test_keyspace -vtworkers<span class="o">=</span>&lt;EXTERNAL-IP&gt;:15033 -enable_approvals<span class="o">=</span><span class="nb">true</span>
+</code></pre></div>
+<h3 id="approvals-of-tasks-execution-canary-feature">Approvals of Tasks Execution (Canary feature)</h3>
+
+<p>Please check the content in general 
+<a href="/user-guide/horizontal-sharding-workflow/#approvals-of-tasks-execution-canary-feature">Horizontal Sharding guide</a></p>
+
+<h3 id="retry">Retry</h3>
+
+<p>Please check the content in general 
+<a href="/user-guide/horizontal-sharding-workflow/#retry">Horizontal Sharding guide</a></p>
+
+<h3 id="checkpoint-and-recovery">Checkpoint and Recovery</h3>
+
+<p>Please check the content in general 
+<a href="/user-guide/horizontal-sharding-workflow/#checkpoint-and-recovery">Horizontal Sharding guide</a></p>
+
+<h2 id="verify-results-and-clean-up">Verify Results and Clean up</h2>
+
+<p>After the resharding process, data in the original shard is identically copied
+to new shards. Data updates will be visible on the new shards, but not on the
+original shard. You should then see in the vtctld UI <em>Dashboard</em> page that shard
+<em>0</em> becomes non-serving and shard <em>-80</em> and shard <em>80-</em> are serving shards.
+Verify this for yourself: inspect the database content,
+then add messages to the guestbook page and inspect again. You can use
+http://&lt;EXTERNAL-IP&gt; (EXTERNAL-IP refers to the external IP of the guest book
+service) to visit the guestbook webpage in your browser and choose any random
+page for inserting information. Details can be found
+<a href="/getting-started/#test-your-cluster-with-a-client-app">here</a>)
+You can inspect the database content using the following commands:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># See what&#39;s on shard test_keyspace/0</span>
+<span class="c"># (no updates visible since we migrated away from it):</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-100 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+<span class="c"># See what&#39;s on shard test_keyspace/-80:</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-200 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+<span class="c"># See what&#39;s on shard test_keyspace/80-:</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-300 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+</code></pre></div>
+<p>You can also checkout the <em>Topology</em> browser on vtctl UI. It shows you the
+information of the keyrange of shard and their serving status. Each shard
+should look like this</p>
+
+<p><a href="https://cloud.githubusercontent.com/assets/23492389/24313876/072f61e6-109c-11e7-938a-23b8398958aa.png">shard 0</a></p>
+
+<p><a href="https://cloud.githubusercontent.com/assets/23492389/24313813/bd11c824-109b-11e7-83d4-cca3f6093360.png">shard -80</a></p>
+
+<p><a href="https://cloud.githubusercontent.com/assets/23492389/24313743/7f9ae1c4-109b-11e7-997a-774f4f16e473.png">shard 80-</a></p>
+
+<p>After you verify the result, we can remove the
+original shard since all traffic is being served from the new shards:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./vttablet-down.sh
+</code></pre></div>
+<p>Then we can delete the now-empty shard:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/local<span class="nv">$ </span>./kvtctl.sh DeleteShard -recursive test_keyspace/0
+</code></pre></div>
+<p>You should then see in the vtctld UI <em>Dashboard</em> page that shard <em>0</em> is gone.</p>
+
+<h2 id="tear-down-and-clean-up">Tear down and Clean up</h2>
+
+<p>Since you already cleaned up the tablets from the original unsharded example by
+running <code class="prettyprint">./vttablet-down.sh</code>, that step has been replaced with
+<code class="prettyprint">./sharded-vttablet-down.sh</code> to clean up the new sharded tablets.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./guestbook-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./vtworker-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./vtgate-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vttablet-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./vtctld-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./etcd-down.sh
+</code></pre></div>
+<p>Then tear down the Container Engine cluster itself, which will stop the virtual machines running on Compute Engine:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>gcloud container clusters delete example
+</code></pre></div>
+<p>It&#39;s also a good idea to remove the firewall rules you created, unless you plan to use them again soon:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>gcloud compute firewall-rules delete vtctld guestbook
+</code></pre></div>
+<h2 id="reference">Reference</h2>
+
+<p>You can checkout the old version tutorial <a href="/user-guide/sharding-kubernetes/">here</a>.
+It walks you through the resharding process by manually executing commands.</p>
+
+<p>For the kubectl command line interface, which helps you interact with the
+kubernetes cluster, you can check out more information
+<a href="https://kubernetes.io/docs/user-guide/kubectl-overview">here</a>.</p>
+
+<h2 id="troubleshooting">Troubleshooting</h2>
+
+<h3 id="checking-status-of-your-setup">Checking status of your setup.</h3>
+
+<p>To get status of pods and services you&#39;ve setup, you can use the commands
+(all pods should be in Running status, guestbook and vtworker services
+should have assign external IP):</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>kubectl get pods
+<span class="nv">$ </span>kubectl get services
+</code></pre></div>
+<h3 id="debugging-pods">Debugging pods.</h3>
+
+<p>If you find out a component (e.g. vttablet, vtgate) doesn&#39;t respond as
+expected, you can surface the log using this command (the pod name can be
+found out using the command mentioned above):</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>kubectl logs &lt;pod name&gt; <span class="o">[</span>-c &lt;container&gt;<span class="o">]</span>
+<span class="c">### example</span>
+<span class="c"># $ kubectl logs vtworker</span>
+<span class="c"># $ kubectl logs vttablet-XXXX -c vttablet</span>
+</code></pre></div>
+<h3 id="debugging-pending-external-ip-issue">Debugging pending external IP issue.</h3>
+
+<p>If you found that your service has a pending external IP for long time, it
+maybe because you&#39;ve reached the limitation of networking resource. Please
+go to your project console on gcloud (cloud.google.com), then go to <em>Load
+balancing</em> page (you can search &quot;Load balancing&quot; in the search bar to get
+to the page) under Networking section. Then, click &quot;advanced menu&quot; for
+editing load balancing resources. Check the forwarding rules you have and
+delete the unused ones if there are too many.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/sharding-kubernetes.html b/docs/user-guide/sharding-kubernetes.html
index 2503a2bd260..4d7b8d5bcac 100644
--- a/docs/user-guide/sharding-kubernetes.html
+++ b/docs/user-guide/sharding-kubernetes.html
@@ -1,575 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Sharding in Kubernetes (Tutorial, manual)</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Sharding in Kubernetes (Tutorial, manual)"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Sharding in Kubernetes (Tutorial, manual)</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>This guide walks you through the process of sharding an existing unsharded
-Vitess <a href="http://vitess.io/overview/concepts.html#keyspace">keyspace</a> in
-<a href="http://kubernetes.io/">Kubernetes</a>.</p>
-
-<h2 id="prerequisites">Prerequisites</h2>
-
-<p>We begin by assuming you&#39;ve completed the
-<a href="http://vitess.io/getting-started/">Getting Started on Kubernetes</a> guide, and
-have left the cluster running.</p>
-
-<h2 id="overview">Overview</h2>
-
-<p>We will follow a process similar to the one in the general
-<a href="http://vitess.io/user-guide/horizontal-sharding.html">Horizontal Sharding</a>
-guide, except that here we&#39;ll give the commands you&#39;ll need to do it for
-the example Vitess cluster in Kubernetes.</p>
-
-<p>Since Vitess makes <a href="http://vitess.io/user-guide/sharding.html">sharding</a>
-transparent to the app layer, the
-<a href="https://github.com/youtube/vitess/tree/master/examples/kubernetes/guestbook">Guestbook</a>
-sample app will stay live throughout the
-<a href="http://vitess.io/user-guide/sharding.html#resharding">resharding</a> process,
-confirming that the Vitess cluster continues to serve without downtime.</p>
-
-<h2 id="configure-sharding-information">Configure sharding information</h2>
-
-<p>The first step is to tell Vitess how we want to partition the data.
-We do this by providing a VSchema definition as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span>
-  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
-  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;hash&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
-    <span class="p">}</span>
-  <span class="p">},</span>
-  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;messages&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="p">{</span>
-          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;page&quot;</span><span class="p">,</span>
-          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
-        <span class="p">}</span>
-      <span class="p">]</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-</code></pre></div>
-<p>This says that we want to shard the data by a hash of the <code class="prettyprint">page</code> column.
-In other words, keep each page&#39;s messages together, but spread pages around
-the shards randomly.</p>
-
-<p>We can load this VSchema into Vitess like this:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ApplyVSchema -vschema <span class="s2">&quot;$(cat vschema.json)&quot;</span> test_keyspace
-</code></pre></div>
-<h2 id="bring-up-tablets-for-new-shards">Bring up tablets for new shards</h2>
-
-<p>In the unsharded example, you started tablets for a shard
-named <em>0</em> in <em>test_keyspace</em>, written as <em>test_keyspace/0</em>.
-Now you&#39;ll start tablets for two additional shards,
-named <em>test_keyspace/-80</em> and <em>test_keyspace/80-</em>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vttablet-up.sh
-<span class="c">### example output:</span>
-<span class="c"># Creating test_keyspace.shard--80 pods in cell test...</span>
-<span class="c"># ...</span>
-<span class="c"># Creating test_keyspace.shard-80- pods in cell test...</span>
-<span class="c"># ...</span>
-</code></pre></div>
-<p>Since the sharding key in the Guestbook app is the page number,
-this will result in half the pages going to each shard,
-since <em>0x80</em> is the midpoint of the
-<a href="http://vitess.io/user-guide/sharding.html#key-ranges-and-partitions">sharding key range</a>.</p>
-
-<p>These new shards will run in parallel with the original shard during the
-transition, but actual traffic will be served only by the original shard
-until we tell it to switch over.</p>
-
-<p>Check the <code class="prettyprint">vtctld</code> web UI, or the output of <code class="prettyprint">kvtctl.sh ListAllTablets test</code>,
-to see when the tablets are ready. There should be 5 tablets in each shard.</p>
-
-<p>Once the tablets are ready, initialize replication by electing the first master
-for each of the new shards:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh InitShardMaster -force test_keyspace/-80 <span class="nb">test</span>-0000000200
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh InitShardMaster -force test_keyspace/80- <span class="nb">test</span>-0000000300
-</code></pre></div>
-<p>Now there should be a total of 15 tablets, with one master for each shard:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ListAllTablets <span class="nb">test</span>
-<span class="c">### example output:</span>
-<span class="c"># test-0000000100 test_keyspace 0 master 10.64.3.4:15002 10.64.3.4:3306 []</span>
-<span class="c"># ...</span>
-<span class="c"># test-0000000200 test_keyspace -80 master 10.64.0.7:15002 10.64.0.7:3306 []</span>
-<span class="c"># ...</span>
-<span class="c"># test-0000000300 test_keyspace 80- master 10.64.0.9:15002 10.64.0.9:3306 []</span>
-<span class="c"># ...</span>
-</code></pre></div>
-<h2 id="copy-data-from-original-shard">Copy data from original shard</h2>
-
-<p>The new tablets start out empty, so we need to copy everything from the
-original shard to the two new ones, starting with the schema:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh CopySchemaShard test_keyspace/0 test_keyspace/-80
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh CopySchemaShard test_keyspace/0 test_keyspace/80-
-</code></pre></div>
-<p>Next we copy the data. Since the amount of data to copy can be very large,
-we use a special batch process called <em>vtworker</em> to stream the data from a
-single source to multiple destinations, routing each row based on its
-<em>keyspace_id</em>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vtworker.sh SplitClone test_keyspace/0
-<span class="c">### example output:</span>
-<span class="c"># Creating vtworker pod in cell test...</span>
-<span class="c"># pods/vtworker</span>
-<span class="c"># Following vtworker logs until termination...</span>
-<span class="c"># I0416 02:08:59.952805       9 instance.go:115] Starting worker...</span>
-<span class="c"># ...</span>
-<span class="c"># State: done</span>
-<span class="c"># Success:</span>
-<span class="c"># messages: copy done, copied 11 rows</span>
-<span class="c"># Deleting vtworker pod...</span>
-<span class="c"># pods/vtworker</span>
-</code></pre></div>
-<p>Notice that we&#39;ve only specified the source shard, <em>test_keyspace/0</em>.
-The <em>SplitClone</em> process will automatically figure out which shards to use
-as the destinations based on the key range that needs to be covered.
-In this case, shard <em>0</em> covers the entire range, so it identifies
-<em>-80</em> and <em>80-</em> as the destination shards, since they combine to cover the
-same range.</p>
-
-<p>Next, it will pause replication on one <em>rdonly</em> (offline processing) tablet
-to serve as a consistent snapshot of the data. The app can continue without
-downtime, since live traffic is served by <em>replica</em> and <em>master</em> tablets,
-which are unaffected. Other batch jobs will also be unaffected, since they
-will be served only by the remaining, un-paused <em>rdonly</em> tablets.</p>
-
-<h2 id="check-filtered-replication">Check filtered replication</h2>
-
-<p>Once the copy from the paused snapshot finishes, <em>vtworker</em> turns on
-<a href="http://vitess.io/user-guide/sharding.html#filtered-replication">filtered replication</a>
-from the source shard to each destination shard. This allows the destination
-shards to catch up on updates that have continued to flow in from the app since
-the time of the snapshot.</p>
-
-<p>When the destination shards are caught up, they will continue to replicate
-new updates. You can see this by looking at the contents of each shard as
-you add new messages to various pages in the Guestbook app. Shard <em>0</em> will
-see all the messages, while the new shards will only see messages for pages
-that live on that shard.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># See what&#39;s on shard test_keyspace/0:</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000100 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-<span class="c"># See what&#39;s on shard test_keyspace/-80:</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000200 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-<span class="c"># See what&#39;s on shard test_keyspace/80-:</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000300 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-</code></pre></div>
-<p>Add some messages on various pages of the Guestbook to see how they get routed.</p>
-
-<h2 id="check-copied-data-integrity">Check copied data integrity</h2>
-
-<p>The <em>vtworker</em> batch process has another mode that will compare the source
-and destination to ensure all the data is present and correct.
-The following commands will run a diff for each destination shard:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vtworker.sh SplitDiff test_keyspace/-80
-vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vtworker.sh SplitDiff test_keyspace/80-
-</code></pre></div>
-<p>If any discrepancies are found, they will be printed.
-If everything is good, you should see something like this:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">I0416 02:10:56.927313      10 split_diff.go:496] Table messages checks out (4 rows processed, 1072961 qps)
-</code></pre></div>
-<h2 id="switch-over-to-new-shards">Switch over to new shards</h2>
-
-<p>Now we&#39;re ready to switch over to serving from the new shards.
-The <a href="http://vitess.io/reference/vtctl.html#migrateservedtypes">MigrateServedTypes</a>
-command lets you do this one
-<a href="http://vitess.io/overview/concepts.html#tablet">tablet type</a> at a time,
-and even one <a href="http://vitess.io/overview/concepts.html#cell-data-center">cell</a>
-at a time. The process can be rolled back at any point <em>until</em> the master is
-switched over.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh MigrateServedTypes test_keyspace/0 rdonly
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh MigrateServedTypes test_keyspace/0 replica
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh MigrateServedTypes test_keyspace/0 master
-</code></pre></div>
-<p>During the <em>master</em> migration, the original shard master will first stop
-accepting updates. Then the process will wait for the new shard masters to
-fully catch up on filtered replication before allowing them to begin serving.
-Since filtered replication has been following along with live updates, there
-should only be a few seconds of master unavailability.</p>
-
-<p>When the master traffic is migrated, the filtered replication will be stopped.
-Data updates will be visible on the new shards, but not on the original shard.
-See it for yourself: Add a message to the guestbook page and then inspect
-the database content:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># See what&#39;s on shard test_keyspace/0</span>
-<span class="c"># (no updates visible since we migrated away from it):</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000100 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-<span class="c"># See what&#39;s on shard test_keyspace/-80:</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000200 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-<span class="c"># See what&#39;s on shard test_keyspace/80-:</span>
-vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000300 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
-</code></pre></div>
-<h2 id="remove-original-shard">Remove original shard</h2>
-
-<p>Now that all traffic is being served from the new shards, we can remove the
-original one. To do that, we use the <code class="prettyprint">vttablet-down.sh</code> script from the
-unsharded example:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./vttablet-down.sh
-<span class="c">### example output:</span>
-<span class="c"># Deleting pod for tablet test-0000000100...</span>
-<span class="c"># pods/vttablet-100</span>
-<span class="c"># ...</span>
-</code></pre></div>
-<p>Then we can delete the now-empty shard:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh DeleteShard -recursive test_keyspace/0
-</code></pre></div>
-<p>You should then see in the vtctld <strong>Topology</strong> page, or in the output of
-<code class="prettyprint">kvtctl.sh ListAllTablets test</code> that the tablets for shard <em>0</em> are gone.</p>
-
-<h2 id="tear-down-and-clean-up">Tear down and clean up</h2>
-
-<p>Before stopping the Container Engine cluster, you should tear down the Vitess
-services. Kubernetes will then take care of cleaning up any entities it created
-for those services, like external load balancers.</p>
-
-<p>Since you already cleaned up the tablets from the original unsharded example by
-running <code class="prettyprint">./vttablet-down.sh</code>, that step has been replaced with
-<code class="prettyprint">./sharded-vttablet-down.sh</code> to clean up the new sharded tablets.</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./guestbook-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./vtgate-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vttablet-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./vtctld-down.sh
-vitess/examples/kubernetes<span class="nv">$ </span>./etcd-down.sh
-</code></pre></div>
-<p>Then tear down the Container Engine cluster itself, which will stop the virtual
-machines running on Compute Engine:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>gcloud container clusters delete example
-</code></pre></div>
-<p>It&#39;s also a good idea to remove the firewall rules you created, unless you plan
-to use them again soon:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>gcloud compute firewall-rules delete vtctld guestbook
-</code></pre></div>
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/sharding-kubernetes/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/sharding-kubernetes/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/sharding-kubernetes/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/sharding-kubernetes/"</script>
 </html>
diff --git a/docs/user-guide/sharding-kubernetes/index.html b/docs/user-guide/sharding-kubernetes/index.html
new file mode 100644
index 00000000000..2d5dc8cb42d
--- /dev/null
+++ b/docs/user-guide/sharding-kubernetes/index.html
@@ -0,0 +1,584 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Sharding in Kubernetes (Tutorial, manual) | Vitess</title>
+<meta property="og:title" content="Sharding in Kubernetes (Tutorial, manual)" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/sharding-kubernetes/" />
+<meta property="og:url" content="http://vitess.io/user-guide/sharding-kubernetes/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/sharding-kubernetes/","headline":"Sharding in Kubernetes (Tutorial, manual)","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Sharding in Kubernetes (Tutorial, manual)</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>This guide walks you through the process of sharding an existing unsharded
+Vitess <a href="/overview/concepts/#keyspace">keyspace</a> in
+<a href="http://kubernetes.io/">Kubernetes</a>.</p>
+
+<h2 id="prerequisites">Prerequisites</h2>
+
+<p>We begin by assuming you&#39;ve completed the
+<a href="/getting-started/">Getting Started on Kubernetes</a> guide, and
+have left the cluster running.</p>
+
+<h2 id="overview">Overview</h2>
+
+<p>We will follow a process similar to the one in the general
+<a href="/user-guide/horizontal-sharding/">Horizontal Sharding</a>
+guide, except that here we&#39;ll give the commands you&#39;ll need to do it for
+the example Vitess cluster in Kubernetes.</p>
+
+<p>Since Vitess makes <a href="/user-guide/sharding/">sharding</a>
+transparent to the app layer, the
+<a href="https://github.com/youtube/vitess/tree/master/examples/kubernetes/guestbook">Guestbook</a>
+sample app will stay live throughout the
+<a href="/user-guide/sharding/#resharding">resharding</a> process,
+confirming that the Vitess cluster continues to serve without downtime.</p>
+
+<h2 id="configure-sharding-information">Configure sharding information</h2>
+
+<p>The first step is to tell Vitess how we want to partition the data.
+We do this by providing a VSchema definition as follows:</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
+  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;hash&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+    <span class="p">}</span>
+  <span class="p">},</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;messages&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
+        <span class="p">{</span>
+          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;page&quot;</span><span class="p">,</span>
+          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+        <span class="p">}</span>
+      <span class="p">]</span>
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</code></pre></div>
+<p>This says that we want to shard the data by a hash of the <code class="prettyprint">page</code> column.
+In other words, keep each page&#39;s messages together, but spread pages around
+the shards randomly.</p>
+
+<p>We can load this VSchema into Vitess like this:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ApplyVSchema -vschema <span class="s2">&quot;$(cat vschema.json)&quot;</span> test_keyspace
+</code></pre></div>
+<h2 id="bring-up-tablets-for-new-shards">Bring up tablets for new shards</h2>
+
+<p>In the unsharded example, you started tablets for a shard
+named <em>0</em> in <em>test_keyspace</em>, written as <em>test_keyspace/0</em>.
+Now you&#39;ll start tablets for two additional shards,
+named <em>test_keyspace/-80</em> and <em>test_keyspace/80-</em>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vttablet-up.sh
+<span class="c">### example output:</span>
+<span class="c"># Creating test_keyspace.shard--80 pods in cell test...</span>
+<span class="c"># ...</span>
+<span class="c"># Creating test_keyspace.shard-80- pods in cell test...</span>
+<span class="c"># ...</span>
+</code></pre></div>
+<p>Since the sharding key in the Guestbook app is the page number,
+this will result in half the pages going to each shard,
+since <em>0x80</em> is the midpoint of the
+<a href="/user-guide/sharding/#key-ranges-and-partitions">sharding key range</a>.</p>
+
+<p>These new shards will run in parallel with the original shard during the
+transition, but actual traffic will be served only by the original shard
+until we tell it to switch over.</p>
+
+<p>Check the <code class="prettyprint">vtctld</code> web UI, or the output of <code class="prettyprint">kvtctl.sh ListAllTablets test</code>,
+to see when the tablets are ready. There should be 5 tablets in each shard.</p>
+
+<p>Once the tablets are ready, initialize replication by electing the first master
+for each of the new shards:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh InitShardMaster -force test_keyspace/-80 <span class="nb">test</span>-0000000200
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh InitShardMaster -force test_keyspace/80- <span class="nb">test</span>-0000000300
+</code></pre></div>
+<p>Now there should be a total of 15 tablets, with one master for each shard:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ListAllTablets <span class="nb">test</span>
+<span class="c">### example output:</span>
+<span class="c"># test-0000000100 test_keyspace 0 master 10.64.3.4:15002 10.64.3.4:3306 []</span>
+<span class="c"># ...</span>
+<span class="c"># test-0000000200 test_keyspace -80 master 10.64.0.7:15002 10.64.0.7:3306 []</span>
+<span class="c"># ...</span>
+<span class="c"># test-0000000300 test_keyspace 80- master 10.64.0.9:15002 10.64.0.9:3306 []</span>
+<span class="c"># ...</span>
+</code></pre></div>
+<h2 id="copy-data-from-original-shard">Copy data from original shard</h2>
+
+<p>The new tablets start out empty, so we need to copy everything from the
+original shard to the two new ones, starting with the schema:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh CopySchemaShard test_keyspace/0 test_keyspace/-80
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh CopySchemaShard test_keyspace/0 test_keyspace/80-
+</code></pre></div>
+<p>Next we copy the data. Since the amount of data to copy can be very large,
+we use a special batch process called <em>vtworker</em> to stream the data from a
+single source to multiple destinations, routing each row based on its
+<em>keyspace_id</em>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vtworker.sh SplitClone test_keyspace/0
+<span class="c">### example output:</span>
+<span class="c"># Creating vtworker pod in cell test...</span>
+<span class="c"># pods/vtworker</span>
+<span class="c"># Following vtworker logs until termination...</span>
+<span class="c"># I0416 02:08:59.952805       9 instance.go:115] Starting worker...</span>
+<span class="c"># ...</span>
+<span class="c"># State: done</span>
+<span class="c"># Success:</span>
+<span class="c"># messages: copy done, copied 11 rows</span>
+<span class="c"># Deleting vtworker pod...</span>
+<span class="c"># pods/vtworker</span>
+</code></pre></div>
+<p>Notice that we&#39;ve only specified the source shard, <em>test_keyspace/0</em>.
+The <em>SplitClone</em> process will automatically figure out which shards to use
+as the destinations based on the key range that needs to be covered.
+In this case, shard <em>0</em> covers the entire range, so it identifies
+<em>-80</em> and <em>80-</em> as the destination shards, since they combine to cover the
+same range.</p>
+
+<p>Next, it will pause replication on one <em>rdonly</em> (offline processing) tablet
+to serve as a consistent snapshot of the data. The app can continue without
+downtime, since live traffic is served by <em>replica</em> and <em>master</em> tablets,
+which are unaffected. Other batch jobs will also be unaffected, since they
+will be served only by the remaining, un-paused <em>rdonly</em> tablets.</p>
+
+<h2 id="check-filtered-replication">Check filtered replication</h2>
+
+<p>Once the copy from the paused snapshot finishes, <em>vtworker</em> turns on
+<a href="/user-guide/sharding/#filtered-replication">filtered replication</a>
+from the source shard to each destination shard. This allows the destination
+shards to catch up on updates that have continued to flow in from the app since
+the time of the snapshot.</p>
+
+<p>When the destination shards are caught up, they will continue to replicate
+new updates. You can see this by looking at the contents of each shard as
+you add new messages to various pages in the Guestbook app. Shard <em>0</em> will
+see all the messages, while the new shards will only see messages for pages
+that live on that shard.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># See what&#39;s on shard test_keyspace/0:</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000100 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+<span class="c"># See what&#39;s on shard test_keyspace/-80:</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000200 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+<span class="c"># See what&#39;s on shard test_keyspace/80-:</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000300 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+</code></pre></div>
+<p>Add some messages on various pages of the Guestbook to see how they get routed.</p>
+
+<h2 id="check-copied-data-integrity">Check copied data integrity</h2>
+
+<p>The <em>vtworker</em> batch process has another mode that will compare the source
+and destination to ensure all the data is present and correct.
+The following commands will run a diff for each destination shard:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vtworker.sh SplitDiff test_keyspace/-80
+vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vtworker.sh SplitDiff test_keyspace/80-
+</code></pre></div>
+<p>If any discrepancies are found, they will be printed.
+If everything is good, you should see something like this:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">I0416 02:10:56.927313      10 split_diff.go:496] Table messages checks out (4 rows processed, 1072961 qps)
+</code></pre></div>
+<h2 id="switch-over-to-new-shards">Switch over to new shards</h2>
+
+<p>Now we&#39;re ready to switch over to serving from the new shards.
+The <a href="/reference/vtctl/#migrateservedtypes">MigrateServedTypes</a>
+command lets you do this one
+<a href="/overview/concepts/#tablet">tablet type</a> at a time,
+and even one <a href="/overview/concepts/#cell-data-center">cell</a>
+at a time. The process can be rolled back at any point <em>until</em> the master is
+switched over.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh MigrateServedTypes test_keyspace/0 rdonly
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh MigrateServedTypes test_keyspace/0 replica
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh MigrateServedTypes test_keyspace/0 master
+</code></pre></div>
+<p>During the <em>master</em> migration, the original shard master will first stop
+accepting updates. Then the process will wait for the new shard masters to
+fully catch up on filtered replication before allowing them to begin serving.
+Since filtered replication has been following along with live updates, there
+should only be a few seconds of master unavailability.</p>
+
+<p>When the master traffic is migrated, the filtered replication will be stopped.
+Data updates will be visible on the new shards, but not on the original shard.
+See it for yourself: Add a message to the guestbook page and then inspect
+the database content:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># See what&#39;s on shard test_keyspace/0</span>
+<span class="c"># (no updates visible since we migrated away from it):</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000100 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+<span class="c"># See what&#39;s on shard test_keyspace/-80:</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000200 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+<span class="c"># See what&#39;s on shard test_keyspace/80-:</span>
+vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh ExecuteFetchAsDba <span class="nb">test</span>-0000000300 <span class="s2">&quot;SELECT * FROM messages&quot;</span>
+</code></pre></div>
+<h2 id="remove-original-shard">Remove original shard</h2>
+
+<p>Now that all traffic is being served from the new shards, we can remove the
+original one. To do that, we use the <code class="prettyprint">vttablet-down.sh</code> script from the
+unsharded example:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./vttablet-down.sh
+<span class="c">### example output:</span>
+<span class="c"># Deleting pod for tablet test-0000000100...</span>
+<span class="c"># pods/vttablet-100</span>
+<span class="c"># ...</span>
+</code></pre></div>
+<p>Then we can delete the now-empty shard:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./kvtctl.sh DeleteShard -recursive test_keyspace/0
+</code></pre></div>
+<p>You should then see in the vtctld <strong>Topology</strong> page, or in the output of
+<code class="prettyprint">kvtctl.sh ListAllTablets test</code> that the tablets for shard <em>0</em> are gone.</p>
+
+<h2 id="tear-down-and-clean-up">Tear down and clean up</h2>
+
+<p>Before stopping the Container Engine cluster, you should tear down the Vitess
+services. Kubernetes will then take care of cleaning up any entities it created
+for those services, like external load balancers.</p>
+
+<p>Since you already cleaned up the tablets from the original unsharded example by
+running <code class="prettyprint">./vttablet-down.sh</code>, that step has been replaced with
+<code class="prettyprint">./sharded-vttablet-down.sh</code> to clean up the new sharded tablets.</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh">vitess/examples/kubernetes<span class="nv">$ </span>./guestbook-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./vtgate-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./sharded-vttablet-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./vtctld-down.sh
+vitess/examples/kubernetes<span class="nv">$ </span>./etcd-down.sh
+</code></pre></div>
+<p>Then tear down the Container Engine cluster itself, which will stop the virtual
+machines running on Compute Engine:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>gcloud container clusters delete example
+</code></pre></div>
+<p>It&#39;s also a good idea to remove the firewall rules you created, unless you plan
+to use them again soon:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>gcloud compute firewall-rules delete vtctld guestbook
+</code></pre></div>
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/sharding.html b/docs/user-guide/sharding.html
index 26714cbf7a1..84925d96074 100644
--- a/docs/user-guide/sharding.html
+++ b/docs/user-guide/sharding.html
@@ -1,575 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Sharding</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Sharding"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Sharding</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>Sharding is a method of horizontally partitioning a database to store
-data across two or more database servers. This document explains how
-sharding works in Vitess and the types of sharding that Vitess supports.</p>
-
-<h2 id="overview">Overview</h2>
-
-<p>In Vitess, a shard is a partition of a keyspace. In turn, the keyspace
-might be a partition of the whole database. For example, a database might
-have one keyspace for product data and another for user data. The shard
-contains a subset of records within its keyspace.</p>
-
-<p>For example, if an application&#39;s &quot;user&quot; keyspace is split into two
-shards, each shard contains records for approximately half of the
-application&#39;s users. Similarly, each user&#39;s information is stored
-in only one shard.</p>
-
-<p>Note that sharding is orthogonal to (MySQL) replication.
-A Vitess shard typically contains one MySQL master and many MySQL
-slaves. The master handles write operations, while slaves handle
-read-only traffic, batch processing operations, and other tasks.
-Each MySQL instance within the shard should have the same data,
-excepting some replication lag.</p>
-
-<h3 id="supported-operations">Supported Operations</h3>
-
-<p>Vitess supports the following types of sharding operations:</p>
-
-<ul>
-<li><strong>Horizontal sharding:</strong> Splitting or merging shards in a sharded keyspace</li>
-<li><strong>Vertical sharding:</strong> Moving tables from an unsharded keyspace to
-a different keyspace.</li>
-</ul>
-
-<p>With these features, you can start with a single keyspace that contains
-all of your data (in multiple tables). As your database grows, you can
-move tables to different keyspaces (vertical split) and shard some or
-all of those keyspaces (horizontal split) without any real downtime
-for your application.</p>
-
-<h2 id="range-based-sharding">Range-based Sharding</h2>
-
-<p>Vitess uses range-based sharding to manage data across multiple shards.
-(Vitess can also support a <a href="#custom-sharding">custom sharding</a> scheme.)</p>
-
-<p>In range-based sharding, each record in a keyspace is associated with
-a sharding key that is stored with the record. The sharding key value
-is also the primary key for sharded data. Records with the same sharding
-key are always collocated on the same shard.</p>
-
-<p><strong>Note:</strong> The API uses the term &quot;keyspace ID&quot; to refer to the sharding key.</p>
-
-<p>The full set of shards covers the range of possible sharding key values.
-To guarantee a balanced use of shards, the sharding scheme should
-ensure an even distribution of sharding keys across the keyspace&#39;s
-shards. That distribution makes it easier to reshard the keyspace
-at a later time using a more granular division of sharding keys.</p>
-
-<p>Vitess calculates the sharding key or keys for each query and then
-routes that query to the appropriate shards. For example, a query
-that updates information about a particular user might be directed to
-a single shard in the application&#39;s &quot;user&quot; keyspace. On the other hand,
-a query that retrieves information about several products might be
-directed to one or more shards in the application&#39;s &quot;product&quot; keyspace.</p>
-
-<h3 id="key-ranges-and-partitions">Key Ranges and Partitions</h3>
-
-<p>Vitess uses key ranges to determine which shards should handle any
-particular query.</p>
-
-<ul>
-<li>A <strong>key range</strong> is a series of consecutive sharding key values. It
-has starting and ending values. A key falls inside the range if
-it is equal to or greater than the start value and strictly less
-than the end value.</li>
-<li>A <strong>partition</strong> represents a set of key ranges that covers the entire
-space.</li>
-</ul>
-
-<p>When building the serving graph for a keyspace that uses range-based
-sharding, Vitess ensures that each shard is valid and that the shards
-collectively constitute a full partition. In each keyspace, one shard
-must have a key range with an empty start value and one shard, which
-could be the same shard, must have a key range with an empty end value.</p>
-
-<ul>
-<li>An empty start value represents the lowest value, and all values are
-greater than it.</li>
-<li>An empty end value represents a value larger than the highest possible
-value, and all values are strictly lower than it.</li>
-</ul>
-
-<p>Vitess always converts sharding keys to byte arrays before routing
-queries. The value [ 0x80 ] is the middle value for sharding keys.
-So, in a keyspace with two shards, sharding keys that have a byte-array
-value lower than 0x80 are assigned to one shard. Keys with a byte-array
-value equal to or higher than 0x80 are assigned to the other shard.</p>
-
-<p>Several sample key ranges are shown below:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">Start</span><span class="o">=[]</span>, <span class="nv">End</span><span class="o">=[]</span>: Full Key Range
-<span class="nv">Start</span><span class="o">=[]</span>, <span class="nv">End</span><span class="o">=[</span>0x80<span class="o">]</span>: Lower half of the Key Range.
-<span class="nv">Start</span><span class="o">=[</span>0x80<span class="o">]</span>, <span class="nv">End</span><span class="o">=[]</span>: Upper half of the Key Range.
-<span class="nv">Start</span><span class="o">=[</span>0x40<span class="o">]</span>, <span class="nv">End</span><span class="o">=[</span>0x80<span class="o">]</span>: Second quarter of the Key Range.
-<span class="nv">Start</span><span class="o">=[</span>0xFF00<span class="o">]</span>, <span class="nv">End</span><span class="o">=[</span>0xFF80<span class="o">]</span>: Second to last 1/512th of the Key Range.
-</code></pre></div>
-<p>Two key ranges are consecutive if the end value of one range equals the
-start value of the other range.</p>
-
-<h3 id="shard-names-in-range-based-keyspaces">Shard Names in Range-Based Keyspaces</h3>
-
-<p>In range-based, sharded keyspaces, a shard&#39;s name identifies the start
-and end of the shard&#39;s key range, printed in hexadecimal and separated
-by a hyphen. For instance, if a shard&#39;s key range is the array of bytes
-beginning with [ 0x80 ] and ending, noninclusively, with [ 0xc0], then
-the shard&#39;s name is <code>80-c0</code>.</p>
-
-<p>Using this naming convention, the following four shards would be a valid
-full partition:</p>
-
-<ul>
-<li>-40</li>
-<li>40-80</li>
-<li>80-c0</li>
-<li>c0-</li>
-</ul>
-
-<p>Shards do not need to handle the same size portion of the key space. For example, the following five shards would also be a valid full partition, albeit with a highly uneven distribution of keys.</p>
-
-<ul>
-<li>-80</li>
-<li>80-c0</li>
-<li>c0-dc00</li>
-<li>dc00-dc80</li>
-<li>dc80-</li>
-</ul>
-
-<h2 id="resharding">Resharding</h2>
-
-<p>In Vitess, resharding describes the process of updating the sharding
-scheme for a keyspace and dynamically reorganizing data to match the
-new scheme. During resharding, Vitess copies, verifies, and keeps
-data up-to-date on new shards while the existing shards continue to
-serve live read and write traffic. When you&#39;re ready to switch over,
-the migration occurs with only a few seconds of read-only downtime.
-During that time, existing data can be read, but new data cannot be
-written.</p>
-
-<p>The table below lists the sharding (or resharding) processes that you
-would typically perform for different types of requirements:</p>
-
-<table><thead>
-<tr>
-<th>Requirement</th>
-<th>Action</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>Uniformly increase read capacity</td>
-<td>Add replicas or split shards</td>
-</tr>
-<tr>
-<td>Uniformly increase write capacity</td>
-<td>Split shards</td>
-</tr>
-<tr>
-<td>Reclaim overprovisioned resources</td>
-<td>Merge shards and/or keyspaces</td>
-</tr>
-<tr>
-<td>Increase geo-diversity</td>
-<td>Add new cells and replicas</td>
-</tr>
-<tr>
-<td>Cool a hot tablet</td>
-<td>For read access, add replicas or split shards. For write access, split shards.</td>
-</tr>
-</tbody></table>
-
-<h3 id="filtered-replication">Filtered Replication</h3>
-
-<p>The cornerstone of resharding is replicating the right data. Vitess
-implements the following functions to support filtered replication,
-the process that ensures that the correct source tablet data is
-transferred to the proper destination tablets. Since MySQL does not
-support any filtering, this functionality is all specific to Vitess.</p>
-
-<ol>
-<li>The source tablet tags transactions with comments so that MySQL binlogs
-contain the filtering data needed during the resharding process. The
-comments describe the scope of each transaction (its keyspace ID,
-table, etc.).</li>
-<li>A server process uses the comments to filter the MySQL binlogs and
-stream the correct data to the destination tablet.</li>
-<li>A client process on the destination tablet applies the filtered logs,
-which are just regular SQL statements at this point.</li>
-</ol>
-
-<h3 id="additional-tools-and-processes">Additional Tools and Processes</h3>
-
-<p>Vitess provides the following tools to help manage range-based shards:</p>
-
-<ul>
-<li>The <a href="/reference/vtctl.html">vtctl</a> command-line tool supports
-functions for managing keyspaces, shards, tablets, and more.</li>
-<li>Client APIs account for sharding operations.</li>
-<li>The <a href="https://github.com/youtube/vitess/tree/master/java/hadoop/src/main/java/io/vitess/hadoop">MapReduce framework</a>
-fully utilizes key ranges to read data as quickly as possible,
-concurrently from all shards and all replicas.</li>
-</ul>
-
-<h2 id="custom-sharding">Custom Sharding</h2>
-
-<p>If your application already supports sharding or if you want to control
-exactly which shard handles each query, Vitess can support your custom
-sharding scheme. In that use case, each keyspace has a collection of
-shards, and the client code always specifies the shard to which it is
-directing a query.</p>
-
-<p>One example of a custom sharding scheme is lookup-based sharding. In
-lookup-based sharding, one keyspace is used as a lookup keyspace, and
-it contains the mapping between a record&#39;s identifying key and the name
-of the record&#39;s shard. To execute a query, the client first checks the
-lookup table to locate the correct shard name and then routes the query
-to that shard.</p>
-
-<p>In a custom sharding scheme, shards can use any name you choose, and
-they are always addressed by name. The vtgate API calls to use are
-<code>ExecuteShard</code>, <code>ExecuteBatchShard</code>, and
-<code>StreamExecuteShard</code>. None of the API calls for
-<strong>KeyspaceIds</strong>, <strong>KeyRanges</strong>, or <strong>EntityIds</strong> are compatible with
-a custom sharding scheme. Vitess&#39; tools and processes for automated
-resharding also do not support custom sharding schemes.</p>
-
-<p>If you use a custom sharding scheme, you can still use the
-<a href="https://github.com/youtube/vitess/tree/master/java/hadoop/src/main/java/io/vitess/hadoop">MapReduce framework</a>
-to iterate over the data on multiple shards.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/sharding/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/sharding/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/sharding/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/sharding/"</script>
 </html>
diff --git a/docs/user-guide/sharding/index.html b/docs/user-guide/sharding/index.html
new file mode 100644
index 00000000000..9349ac897df
--- /dev/null
+++ b/docs/user-guide/sharding/index.html
@@ -0,0 +1,584 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Sharding | Vitess</title>
+<meta property="og:title" content="Sharding" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/sharding/" />
+<meta property="og:url" content="http://vitess.io/user-guide/sharding/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/sharding/","headline":"Sharding","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Sharding</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>Sharding is a method of horizontally partitioning a database to store
+data across two or more database servers. This document explains how
+sharding works in Vitess and the types of sharding that Vitess supports.</p>
+
+<h2 id="overview">Overview</h2>
+
+<p>In Vitess, a shard is a partition of a keyspace. In turn, the keyspace
+might be a partition of the whole database. For example, a database might
+have one keyspace for product data and another for user data. The shard
+contains a subset of records within its keyspace.</p>
+
+<p>For example, if an application&#39;s &quot;user&quot; keyspace is split into two
+shards, each shard contains records for approximately half of the
+application&#39;s users. Similarly, each user&#39;s information is stored
+in only one shard.</p>
+
+<p>Note that sharding is orthogonal to (MySQL) replication.
+A Vitess shard typically contains one MySQL master and many MySQL
+slaves. The master handles write operations, while slaves handle
+read-only traffic, batch processing operations, and other tasks.
+Each MySQL instance within the shard should have the same data,
+excepting some replication lag.</p>
+
+<h3 id="supported-operations">Supported Operations</h3>
+
+<p>Vitess supports the following types of sharding operations:</p>
+
+<ul>
+<li><strong>Horizontal sharding:</strong> Splitting or merging shards in a sharded keyspace</li>
+<li><strong>Vertical sharding:</strong> Moving tables from an unsharded keyspace to
+a different keyspace.</li>
+</ul>
+
+<p>With these features, you can start with a single keyspace that contains
+all of your data (in multiple tables). As your database grows, you can
+move tables to different keyspaces (vertical split) and shard some or
+all of those keyspaces (horizontal split) without any real downtime
+for your application.</p>
+
+<h2 id="range-based-sharding">Range-based Sharding</h2>
+
+<p>Vitess uses range-based sharding to manage data across multiple shards.
+(Vitess can also support a <a href="#custom-sharding">custom sharding</a> scheme.)</p>
+
+<p>In range-based sharding, each record in a keyspace is associated with
+a sharding key that is stored with the record. The sharding key value
+is also the primary key for sharded data. Records with the same sharding
+key are always collocated on the same shard.</p>
+
+<p><strong>Note:</strong> The API uses the term &quot;keyspace ID&quot; to refer to the sharding key.</p>
+
+<p>The full set of shards covers the range of possible sharding key values.
+To guarantee a balanced use of shards, the sharding scheme should
+ensure an even distribution of sharding keys across the keyspace&#39;s
+shards. That distribution makes it easier to reshard the keyspace
+at a later time using a more granular division of sharding keys.</p>
+
+<p>Vitess calculates the sharding key or keys for each query and then
+routes that query to the appropriate shards. For example, a query
+that updates information about a particular user might be directed to
+a single shard in the application&#39;s &quot;user&quot; keyspace. On the other hand,
+a query that retrieves information about several products might be
+directed to one or more shards in the application&#39;s &quot;product&quot; keyspace.</p>
+
+<h3 id="key-ranges-and-partitions">Key Ranges and Partitions</h3>
+
+<p>Vitess uses key ranges to determine which shards should handle any
+particular query.</p>
+
+<ul>
+<li>A <strong>key range</strong> is a series of consecutive sharding key values. It
+has starting and ending values. A key falls inside the range if
+it is equal to or greater than the start value and strictly less
+than the end value.</li>
+<li>A <strong>partition</strong> represents a set of key ranges that covers the entire
+space.</li>
+</ul>
+
+<p>When building the serving graph for a keyspace that uses range-based
+sharding, Vitess ensures that each shard is valid and that the shards
+collectively constitute a full partition. In each keyspace, one shard
+must have a key range with an empty start value and one shard, which
+could be the same shard, must have a key range with an empty end value.</p>
+
+<ul>
+<li>An empty start value represents the lowest value, and all values are
+greater than it.</li>
+<li>An empty end value represents a value larger than the highest possible
+value, and all values are strictly lower than it.</li>
+</ul>
+
+<p>Vitess always converts sharding keys to byte arrays before routing
+queries. The value [ 0x80 ] is the middle value for sharding keys.
+So, in a keyspace with two shards, sharding keys that have a byte-array
+value lower than 0x80 are assigned to one shard. Keys with a byte-array
+value equal to or higher than 0x80 are assigned to the other shard.</p>
+
+<p>Several sample key ranges are shown below:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">Start</span><span class="o">=[]</span>, <span class="nv">End</span><span class="o">=[]</span>: Full Key Range
+<span class="nv">Start</span><span class="o">=[]</span>, <span class="nv">End</span><span class="o">=[</span>0x80<span class="o">]</span>: Lower half of the Key Range.
+<span class="nv">Start</span><span class="o">=[</span>0x80<span class="o">]</span>, <span class="nv">End</span><span class="o">=[]</span>: Upper half of the Key Range.
+<span class="nv">Start</span><span class="o">=[</span>0x40<span class="o">]</span>, <span class="nv">End</span><span class="o">=[</span>0x80<span class="o">]</span>: Second quarter of the Key Range.
+<span class="nv">Start</span><span class="o">=[</span>0xFF00<span class="o">]</span>, <span class="nv">End</span><span class="o">=[</span>0xFF80<span class="o">]</span>: Second to last 1/512th of the Key Range.
+</code></pre></div>
+<p>Two key ranges are consecutive if the end value of one range equals the
+start value of the other range.</p>
+
+<h3 id="shard-names-in-range-based-keyspaces">Shard Names in Range-Based Keyspaces</h3>
+
+<p>In range-based, sharded keyspaces, a shard&#39;s name identifies the start
+and end of the shard&#39;s key range, printed in hexadecimal and separated
+by a hyphen. For instance, if a shard&#39;s key range is the array of bytes
+beginning with [ 0x80 ] and ending, noninclusively, with [ 0xc0], then
+the shard&#39;s name is <code>80-c0</code>.</p>
+
+<p>Using this naming convention, the following four shards would be a valid
+full partition:</p>
+
+<ul>
+<li>-40</li>
+<li>40-80</li>
+<li>80-c0</li>
+<li>c0-</li>
+</ul>
+
+<p>Shards do not need to handle the same size portion of the key space. For example, the following five shards would also be a valid full partition, albeit with a highly uneven distribution of keys.</p>
+
+<ul>
+<li>-80</li>
+<li>80-c0</li>
+<li>c0-dc00</li>
+<li>dc00-dc80</li>
+<li>dc80-</li>
+</ul>
+
+<h2 id="resharding">Resharding</h2>
+
+<p>In Vitess, resharding describes the process of updating the sharding
+scheme for a keyspace and dynamically reorganizing data to match the
+new scheme. During resharding, Vitess copies, verifies, and keeps
+data up-to-date on new shards while the existing shards continue to
+serve live read and write traffic. When you&#39;re ready to switch over,
+the migration occurs with only a few seconds of read-only downtime.
+During that time, existing data can be read, but new data cannot be
+written.</p>
+
+<p>The table below lists the sharding (or resharding) processes that you
+would typically perform for different types of requirements:</p>
+
+<table><thead>
+<tr>
+<th>Requirement</th>
+<th>Action</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>Uniformly increase read capacity</td>
+<td>Add replicas or split shards</td>
+</tr>
+<tr>
+<td>Uniformly increase write capacity</td>
+<td>Split shards</td>
+</tr>
+<tr>
+<td>Reclaim overprovisioned resources</td>
+<td>Merge shards and/or keyspaces</td>
+</tr>
+<tr>
+<td>Increase geo-diversity</td>
+<td>Add new cells and replicas</td>
+</tr>
+<tr>
+<td>Cool a hot tablet</td>
+<td>For read access, add replicas or split shards. For write access, split shards.</td>
+</tr>
+</tbody></table>
+
+<h3 id="filtered-replication">Filtered Replication</h3>
+
+<p>The cornerstone of resharding is replicating the right data. Vitess
+implements the following functions to support filtered replication,
+the process that ensures that the correct source tablet data is
+transferred to the proper destination tablets. Since MySQL does not
+support any filtering, this functionality is all specific to Vitess.</p>
+
+<ol>
+<li>The source tablet tags transactions with comments so that MySQL binlogs
+contain the filtering data needed during the resharding process. The
+comments describe the scope of each transaction (its keyspace ID,
+table, etc.).</li>
+<li>A server process uses the comments to filter the MySQL binlogs and
+stream the correct data to the destination tablet.</li>
+<li>A client process on the destination tablet applies the filtered logs,
+which are just regular SQL statements at this point.</li>
+</ol>
+
+<h3 id="additional-tools-and-processes">Additional Tools and Processes</h3>
+
+<p>Vitess provides the following tools to help manage range-based shards:</p>
+
+<ul>
+<li>The <a href="/reference/vtctl/">vtctl</a> command-line tool supports
+functions for managing keyspaces, shards, tablets, and more.</li>
+<li>Client APIs account for sharding operations.</li>
+<li>The <a href="https://github.com/youtube/vitess/tree/master/java/hadoop/src/main/java/io/vitess/hadoop">MapReduce framework</a>
+fully utilizes key ranges to read data as quickly as possible,
+concurrently from all shards and all replicas.</li>
+</ul>
+
+<h2 id="custom-sharding">Custom Sharding</h2>
+
+<p>If your application already supports sharding or if you want to control
+exactly which shard handles each query, Vitess can support your custom
+sharding scheme. In that use case, each keyspace has a collection of
+shards, and the client code always specifies the shard to which it is
+directing a query.</p>
+
+<p>One example of a custom sharding scheme is lookup-based sharding. In
+lookup-based sharding, one keyspace is used as a lookup keyspace, and
+it contains the mapping between a record&#39;s identifying key and the name
+of the record&#39;s shard. To execute a query, the client first checks the
+lookup table to locate the correct shard name and then routes the query
+to that shard.</p>
+
+<p>In a custom sharding scheme, shards can use any name you choose, and
+they are always addressed by name. The vtgate API calls to use are
+<code>ExecuteShard</code>, <code>ExecuteBatchShard</code>, and
+<code>StreamExecuteShard</code>. None of the API calls for
+<strong>KeyspaceIds</strong>, <strong>KeyRanges</strong>, or <strong>EntityIds</strong> are compatible with
+a custom sharding scheme. Vitess&#39; tools and processes for automated
+resharding also do not support custom sharding schemes.</p>
+
+<p>If you use a custom sharding scheme, you can still use the
+<a href="https://github.com/youtube/vitess/tree/master/java/hadoop/src/main/java/io/vitess/hadoop">MapReduce framework</a>
+to iterate over the data on multiple shards.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/topology-service.html b/docs/user-guide/topology-service.html
index 4b67ca6d450..2b74d259aca 100644
--- a/docs/user-guide/topology-service.html
+++ b/docs/user-guide/topology-service.html
@@ -1,1008 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Topology Service</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Topology Service"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Topology Service</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="topology-service">Topology Service</h1>
-
-<p>This document describes the Topology Service, a key part of the Vitess
-architecture. This service is exposed to all Vitess processes, and is used to
-store small pieces of configuration data about the Vitess cluster, and provide
-cluster-wide locks. It also supports watches, which we will use soon.</p>
-
-<p>Concretely, the Topology Service features are implemented by
-a <a href="http://en.wikipedia.org/wiki/Distributed_lock_manager">Lock Server</a>, referred
-to as Topology Server in the rest of this document. We use a plug-in
-implementation and we support multiple Lock Servers (Zookeeper, etcd, Consul, …)
-as backends for the service.</p>
-
-<h2 id="requirements-and-usage">Requirements and Usage</h2>
-
-<p>The Topology Service is used to store information about the Keyspaces, the
-Shards, the Tablets, the Replication Graph, and the Serving Graph. We store
-small data structures (a few hundred bytes) per object.</p>
-
-<p>The main contract for the Topology Server is to be very highly available and
-consistent. It is understood it will come at a higher latency cost and very low
-throughput.</p>
-
-<p>We never use the Topology Server as an RPC mechanism, nor as a storage system
-for logs. We never depend on the Topology Server being responsive and fast to
-serve every query.</p>
-
-<p>The Topology Server must also support a Watch interface, to signal when certain
-conditions occur on a node. This is used for instance to know when keyspaces
-topology changes (for resharding for instance).</p>
-
-<h3 id="global-vs-local">Global vs Local</h3>
-
-<p>We differentiate two instances of the Topology Server: the Global instance, and
-the per-cell Local instance:</p>
-
-<ul>
-<li>The Global instance is used to store global data about the topology that
-doesn’t change very often, for instance information about Keyspaces and
-Shards. The data is independent of individual instances and cells, and needs
-to survive a cell going down entirely.</li>
-<li>There is one Local instance per cell, that contains cell-specific information,
-and also rolled-up data from the global + local cell to make it easier for
-clients to find the data. The Vitess local processes should not use the Global
-topology instance, but instead the rolled-up data in the Local topology
-server as much as possible.</li>
-</ul>
-
-<p>The Global instance can go down for a while and not impact the local cells (an
-exception to that is if a reparent needs to be processed, it might not work). If
-a Local instance goes down, it only affects the local tablets in that instance
-(and then the cell is usually in bad shape, and should not be used).</p>
-
-<p>Furthermore, the Vitess processes will not use the Global nor the Local Topology
-Server to serve individual queries. They only use the Topology Server to get the
-topology information at startup and in the background, but never to directly
-serve queries.</p>
-
-<h3 id="recovery">Recovery</h3>
-
-<p>If a local Topology Server dies and is not recoverable, it can be wiped out. All
-the tablets in that cell then need to be restarted so they re-initialize their
-topology records (but they won’t lose any MySQL data).</p>
-
-<p>If the global Topology Server dies and is not recoverable, this is more of a
-problem. All the Keyspace / Shard objects have to be re-created. Then the cells
-should recover.</p>
-
-<h2 id="global-data">Global Data</h2>
-
-<p>This section describes the data structures stored in the global instance of the
-topology server.</p>
-
-<h3 id="keyspace">Keyspace</h3>
-
-<p>The Keyspace object contains various information, mostly about sharding: how is
-this Keyspace sharded, what is the name of the sharding key column, is this
-Keyspace serving data yet, how to split incoming queries, …</p>
-
-<p>An entire Keyspace can be locked. We use this during resharding for instance,
-when we change which Shard is serving what inside a Keyspace. That way we
-guarantee only one operation changes the keyspace data concurrently.</p>
-
-<h3 id="shard">Shard</h3>
-
-<p>A Shard contains a subset of the data for a Keyspace. The Shard record in the
-global topology contains:</p>
-
-<ul>
-<li>the MySQL Master tablet alias for this shard</li>
-<li>the sharding key range covered by this Shard inside the Keyspace</li>
-<li>the tablet types this Shard is serving (master, replica, batch, …), per cell
-if necessary.</li>
-<li>if during filtered replication, the source shards this shard is replicating
-from</li>
-<li>the list of cells that have tablets in this shard</li>
-<li>shard-global tablet controls, like blacklisted tables no tablet should serve
-in this shard</li>
-</ul>
-
-<p>A Shard can be locked. We use this during operations that affect either the
-Shard record, or multiple tablets within a Shard (like reparenting), so multiple
-jobs don’t concurrently alter the data.</p>
-
-<h3 id="vschema-data">VSchema Data</h3>
-
-<p>The VSchema data contains sharding and routing information for
-the <a href="https://github.com/youtube/vitess/blob/master/doc/VTGateV3Features.md">VTGate V3</a> API.</p>
-
-<h2 id="local-data">Local Data</h2>
-
-<p>This section describes the data structures stored in the local instance (per
-cell) of the topology server.</p>
-
-<h3 id="tablets">Tablets</h3>
-
-<p>The Tablet record has a lot of information about a single vttablet process
-running inside a tablet (along with the MySQL process):</p>
-
-<ul>
-<li>the Tablet Alias (cell+unique id) that uniquely identifies the Tablet</li>
-<li>the Hostname, IP address and port map of the Tablet</li>
-<li>the current Tablet type (master, replica, batch, spare, …)</li>
-<li>which Keyspace / Shard the tablet is part of</li>
-<li>the sharding Key Range served by this Tablet</li>
-<li>user-specified tag map (to store per installation data for instance)</li>
-</ul>
-
-<p>A Tablet record is created before a tablet can be running (either by <code class="prettyprint">vtctl
-InitTablet</code> or by passing the <code class="prettyprint">init_*</code> parameters to vttablet). The only way a
-Tablet record will be updated is one of:</p>
-
-<ul>
-<li>The vttablet process itself owns the record while it is running, and can
-change it.</li>
-<li>At init time, before the tablet starts</li>
-<li>After shutdown, when the tablet gets deleted.</li>
-<li>If a tablet becomes unresponsive, it may be forced to spare to make it
-unhealthy when it restarts.</li>
-</ul>
-
-<h3 id="replication-graph">Replication Graph</h3>
-
-<p>The Replication Graph allows us to find Tablets in a given Cell / Keyspace /
-Shard. It used to contain information about which Tablet is replicating from
-which other Tablet, but that was too complicated to maintain. Now it is just a
-list of Tablets.</p>
-
-<h3 id="serving-graph">Serving Graph</h3>
-
-<p>The Serving Graph is what the clients use to find the per-cell topology of a
-Keyspace. It is a roll-up of global data (Keyspace + Shard). vtgates only open a
-small number of these objects and get all they need quickly.</p>
-
-<h4 id="srvkeyspace">SrvKeyspace</h4>
-
-<p>It is the local representation of a Keyspace. It contains information on what
-shard to use for getting to the data (but not information about each individual
-shard):</p>
-
-<ul>
-<li>the partitions map is keyed by the tablet type (master, replica, batch, …) and
-the values are list of shards to use for serving.</li>
-<li>it also contains the global Keyspace fields, copied for fast access.</li>
-</ul>
-
-<p>It can be rebuilt by running <code class="prettyprint">vtctl RebuildKeyspaceGraph</code>. It is
-automatically rebuilt when a tablet starts up in a cell and the SrvKeyspace
-for that cell / keyspace doesn&#39;t exist yet. It will also be changed
-during horizontal and vertical splits.</p>
-
-<h4 id="srvvschema">SrvVSchema</h4>
-
-<p>It is the local roll-up for the VSchema. It contains the VSchema for all
-keyspaces in a single object.</p>
-
-<p>It can be rebuilt by running <code class="prettyprint">vtctl RebuildVSchemaGraph</code>. It is automatically
-rebuilt when using <code class="prettyprint">vtctl ApplyVSchema</code> (unless prevented by flags).</p>
-
-<h2 id="workflows-involving-the-topology-server">Workflows Involving the Topology Server</h2>
-
-<p>The Topology Server is involved in many Vitess workflows.</p>
-
-<p>When a Tablet is initialized, we create the Tablet record, and add the Tablet to
-the Replication Graph. If it is the master for a Shard, we update the global
-Shard record as well.</p>
-
-<p>Administration tools need to find the tablets for a given Keyspace / Shard:
-first we get the list of Cells that have Tablets for the Shard (global topology
-Shard record has these) then we use the Replication Graph for that Cell /
-Keyspace / Shard to find all the tablets then we can read each tablet record.</p>
-
-<p>When a Shard is reparented, we need to update the global Shard record with the
-new master alias.</p>
-
-<p>Finding a tablet to serve the data is done in two stages: vtgate maintains a
-health check connection to all possible tablets, and they report which keyspace
-/ shard / tablet type they serve. vtgate also reads the SrvKeyspace object, to
-find out the shard map. With these two pieces of information, vtgate can route
-the query to the right vttablet.</p>
-
-<p>During resharding events, we also change the topology a lot. An horizontal split
-will change the global Shard records, and the local SrvKeyspace records. A
-vertical split will change the global Keyspace records, and the local
-SrvKeyspace records.</p>
-
-<h2 id="implementations">Implementations</h2>
-
-<p>The Topology Server interface is defined in our code in <code class="prettyprint">go/vt/topo/server.go</code>
-and we also have a set of unit tests for it in <code class="prettyprint">go/vt/topo/test</code>.</p>
-
-<p>This part describes the two implementations we have, and their specific
-behavior.</p>
-
-<p>If starting from scratch, please use the <code class="prettyprint">zk2</code>, <code class="prettyprint">etcd2</code> or <code class="prettyprint">consul</code>
-implementations, as we are deprecating the old <code class="prettyprint">zookeeper</code> and <code class="prettyprint">etcd</code>
-implementations. See the migration section below if you want to migrate.</p>
-
-<h3 id="zookeeper-zk2-implementation-new-version-of-zookeeper">Zookeeper <code class="prettyprint">zk2</code> Implementation (new version of <code class="prettyprint">zookeeper</code>)</h3>
-
-<p>This is the recommended implementation when using Zookeeper. The old <code class="prettyprint">zookeeper</code>
-implementation is deprecated, see next section.</p>
-
-<p>The global cell typically has around 5 servers, distributed one in each
-cell. The local cells typically have 3 or 5 servers, in different server racks /
-sub-networks for higher resilience. For our integration tests, we use a single
-ZK server that serves both global and local cells.</p>
-
-<p>We provide the <code class="prettyprint">zk</code> utility for easy access to the topology data in
-Zookeeper. It can list, read and write files inside any Zoopeeker server. Just
-specify the <code class="prettyprint">-server</code> parameter to point to the Zookeeper servers. Note the
-vtctld UI can also be used to see the contents of the topology data.</p>
-
-<p>To configure a Zookeeper installation, let&#39;s start with the global cell
-service. It is described by the addresses of the servers (comma separated list),
-and by the root directory to put the Vitess data in. For instance, assuming we
-want to use servers <code class="prettyprint">global_server1,global_server2</code> in path <code class="prettyprint">/vitess/global</code>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># First create the directory in the global server:</span>
-zk -server global_server1,global_server2 touch -p /vitess/global
-
-<span class="c"># Set the following flags to let Vitess use this global server:</span>
-<span class="c"># -topo_implementation zk2</span>
-<span class="c"># -topo_global_server_address global_server1,global_server2</span>
-<span class="c"># -topo_global_root /vitess/global</span>
-</code></pre></div>
-<p>Then to add a cell whose local topology servers <code class="prettyprint">cell1_server1,cell1_server2</code>
-will store their data under the directory <code class="prettyprint">/vitess/cell1</code>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">TOPOLOGY</span><span class="o">=</span><span class="s2">&quot;-topo_implementation zk2 -topo_global_server_address global_server1,global_server2 -topo_global_root /vitess/global&quot;</span>
-
-<span class="c"># Reference cell1 in the global topology service:</span>
-vtctl <span class="nv">$TOPOLOGY</span> AddCellInfo <span class="se">\</span>
-  -server_address cell1_server1,cell1_server2 <span class="se">\</span>
-  -root /vitess/cell1 <span class="se">\</span>
-  cell1
-</code></pre></div>
-<p>If only one cell is used, the same Zookeeper instance can be used for both
-global and local data. A local cell record still needs to be created, just use
-the same server address, and very importantly a <em>different</em> root directory.</p>
-
-<h4 id="implementation-details">Implementation Details</h4>
-
-<p>We use the following paths:</p>
-
-<p><em>Global Cell</em>:</p>
-
-<ul>
-<li>Election path: <code class="prettyprint">elections/&lt;name&gt;</code></li>
-<li>CellInfo path: <code class="prettyprint">cells/&lt;cell name&gt;/CellInfo</code></li>
-<li>Keyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/Keyspace</code></li>
-<li>Shard: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/Shard</code></li>
-<li>VSchema: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/VSchema</code></li>
-</ul>
-
-<p><em>Local Cell</em>:</p>
-
-<ul>
-<li>Tablet: <code class="prettyprint">tablets/&lt;cell&gt;-&lt;uid&gt;/Tablet</code></li>
-<li>Replication Graph: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/ShardReplication</code></li>
-<li>SrvKeyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/SrvKeyspace</code></li>
-<li>SrvVSchema: <code class="prettyprint">SvrVSchema</code></li>
-</ul>
-
-<p>For locks, we create a subdirectory called <code class="prettyprint">locks</code> under either the keyspace
-directory or the shard directory.</p>
-
-<p>Both locks and master election are implemented using ephemeral, sequential files
-which are stored in their respective directory.</p>
-
-<p>We store the proto3 binary data for each object. The <code class="prettyprint">zk</code> utility can decode
-these files when using the <code class="prettyprint">-p</code> option of the <code class="prettyprint">cat</code> command:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>zk --server localhost:15014 cat -p /global/keyspaces/test_keyspace/shards/-80/Shard
-master_alias: &lt;
-  cell: <span class="s2">&quot;test_nj&quot;</span>
-  uid: 62344
-&gt;
-key_range: &lt;
-  end: <span class="s2">&quot;\200&quot;</span>
-&gt;
-served_types: &lt;
-  tablet_type: MASTER
-&gt;
-served_types: &lt;
-  tablet_type: REPLICA
-&gt;
-served_types: &lt;
-  tablet_type: RDONLY
-&gt;
-cells: <span class="s2">&quot;test_nj&quot;</span>
-</code></pre></div>
-<h3 id="old-zookeeper-zookeeper-implementaion-deprecated-use-zk2-instead">Old Zookeeper <code class="prettyprint">zookeeper</code> Implementaion (deprecated, use <code class="prettyprint">zk2</code> instead)</h3>
-
-<p>This old <code class="prettyprint">zookeeper</code> topology service is deprecated, and will be removed in
-Vitess version 2.2. Please use <code class="prettyprint">zk2</code> instead, and see the <code class="prettyprint">topo2topo</code> section
-below for migration.</p>
-
-<p>Our Zookeeper implementation is based on a configuration file that describes
-where the global and each local cell ZK instances are. When adding a cell, all
-processes that may access that cell should be restarted with the new
-configuration file.</p>
-
-<p>The global cell typically has around 5 servers, distributed one in each
-cell. The local cells typically have 3 or 5 servers, in different server racks /
-sub-networks for higher resilience. For our integration tests, we use a single
-ZK server that serves both global and local cells.</p>
-
-<p>We sometimes store both data and sub-directories in a path (for a keyspace for
-instance). We use JSON to encode the data.</p>
-
-<p>For locking, we use an auto-incrementing file name in the <code class="prettyprint">/action</code> subdirectory
-of the object directory. We also move them to <code class="prettyprint">/actionlogs</code> when the lock is
-released. And we have a purge process to clear the old locks (which should be
-run on a crontab, typically).</p>
-
-<p>Note the paths used to store global and per-cell data do not overlap, so a
-single ZK can be used for both global and local ZKs. This is however not
-recommended, for reliability reasons.</p>
-
-<ul>
-<li>Keyspace: <code class="prettyprint">/zk/global/vt/keyspaces/&lt;keyspace&gt;</code></li>
-<li>Shard: <code class="prettyprint">/zk/global/vt/keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;</code></li>
-<li>Tablet: <code class="prettyprint">/zk/&lt;cell&gt;/vt/tablets/&lt;uid&gt;</code></li>
-<li>Replication Graph: <code class="prettyprint">/zk/&lt;cell&gt;/vt/replication/&lt;keyspace&gt;/&lt;shard&gt;</code></li>
-<li>SrvKeyspace: <code class="prettyprint">/zk/&lt;cell&gt;/vt/ns/&lt;keyspace&gt;</code></li>
-<li>SrvVSchema: <code class="prettyprint">/zk/&lt;cell&gt;/vt/vschema</code></li>
-</ul>
-
-<p>We provide the &#39;zk&#39; utility for easy access to the topology data in
-Zookeeper. For instance:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># NOTE: We do not set the ZK_CLIENT_CONFIG environment variable here,</span>
-<span class="c"># as the zk tool connects to a specific server. </span>
-<span class="nv">$ </span>zk -server &lt;server address&gt; ls /zk/global/vt/keyspaces/user
-action
-actionlog
-shards
-</code></pre></div>
-<h3 id="etcd-etcd2-implementation-new-version-of-etcd">etcd <code class="prettyprint">etcd2</code> Implementation (new version of <code class="prettyprint">etcd</code>)</h3>
-
-<p>This topology service plugin is meant to use etcd clusters as storage backend
-for the topology data. This topology service supports version 3 and up of the
-etcd server.</p>
-
-<p>This implementation is named <code class="prettyprint">etcd2</code> because it supersedes our previous
-implementation <code class="prettyprint">etcd</code>. Note that the storage format has been changed with the
-<code class="prettyprint">etcd2</code> implementation, i.e. existing data created by the previous <code class="prettyprint">etcd</code>
-implementation must be migrated manually (See migration section below).</p>
-
-<p>To configure an <code class="prettyprint">etcd2</code> installation, let&#39;s start with the global cell
-service. It is described by the addresses of the servers (comma separated list),
-and by the root directory to put the Vitess data in. For instance, assuming we
-want to use servers <code class="prettyprint">http://global_server1,http://global_server2</code> in path
-<code class="prettyprint">/vitess/global</code>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Set the following flags to let Vitess use this global server,</span>
-<span class="c"># and simplify the example below:</span>
-<span class="c"># -topo_implementation etcd2</span>
-<span class="c"># -topo_global_server_address http://global_server1,http://global_server2</span>
-<span class="c"># -topo_global_root /vitess/global</span>
-<span class="nv">TOPOLOGY</span><span class="o">=</span><span class="err">&quot;</span>-topo_implementation etcd2 -topo_global_server_address http://global_server1,http://global_server2 -topo_global_root /vitess/global
-</code></pre></div>
-<p>Then to add a cell whose local topology servers
-<code class="prettyprint">http://cell1_server1,http://cell1_server2</code> will store their data under the
-directory <code class="prettyprint">/vitess/cell1</code>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Reference cell1 in the global topology service:</span>
-<span class="c"># (the TOPOLOGY variable is defined in the previous section)</span>
-vtctl <span class="nv">$TOPOLOGY</span> AddCellInfo <span class="se">\</span>
-  -server_address http://cell1_server1,http://cell1_server2 <span class="se">\</span>
-  -root /vitess/cell1 <span class="se">\</span>
-  cell1
-</code></pre></div>
-<p>If only one cell is used, the same etcd instances can be used for both
-global and local data. A local cell record still needs to be created, just use
-the same server address and, very importantly, a <em>different</em> root directory.</p>
-
-<h4 id="implementation-details">Implementation Details</h4>
-
-<p>We use the following paths:</p>
-
-<p><em>Global Cell</em>:</p>
-
-<ul>
-<li>Election path: <code class="prettyprint">elections/&lt;name&gt;</code></li>
-<li>CellInfo path: <code class="prettyprint">cells/&lt;cell name&gt;/CellInfo</code></li>
-<li>Keyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/Keyspace</code></li>
-<li>Shard: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/Shard</code></li>
-<li>VSchema: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/VSchema</code></li>
-</ul>
-
-<p><em>Local Cell</em>:</p>
-
-<ul>
-<li>Tablet: <code class="prettyprint">tablets/&lt;cell&gt;-&lt;uid&gt;/Tablet</code></li>
-<li>Replication Graph: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/ShardReplication</code></li>
-<li>SrvKeyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/SrvKeyspace</code></li>
-<li>SrvVSchema: <code class="prettyprint">SvrVSchema</code></li>
-</ul>
-
-<p>For locks, we use a subdirectory named <code class="prettyprint">locks</code> in the directory to lock, and an
-ephemeral file in that subdirectory (it is associated with a lease, whose TTL
-can be set with the <code class="prettyprint">-topo_etcd_lease_duration</code> flag, defaults to 30
-seconds). The ephemeral file with the lowest ModRevision has the lock, the
-others wait for files with older ModRevisions to disappear.</p>
-
-<p>Master elections also use a subdirectory, named after the election Name, and use
-a similar method as the locks, with ephemeral files.</p>
-
-<p>We store the proto3 binary data for each object (as the v3 API allows us to store binary data).</p>
-
-<h3 id="old-etcd-etcd-implementaion-deprecated-use-etcd2-instead">Old etcd <code class="prettyprint">etcd</code> Implementaion (deprecated, use <code class="prettyprint">etcd2</code> instead)</h3>
-
-<p>This old <code class="prettyprint">etcd</code> topology service is deprecated, and will be removed in
-Vitess version 2.2. Please use <code class="prettyprint">etcd2</code> instead, and see the <code class="prettyprint">topo2topo</code> section
-below for migration.</p>
-
-<p>Our etcd implementation is based on a command-line parameter that gives the
-location(s) of the global etcd server. Then we query the path <code class="prettyprint">/vt/cells</code> and
-each file in there is named after a cell, and contains the list of etcd servers
-for that cell. Each cell server files are stored in <code class="prettyprint">/vt/</code>.</p>
-
-<p>We use the <code class="prettyprint">_Data</code> filename to store the data, JSON encoded.</p>
-
-<p>For locking, we store a <code class="prettyprint">_Lock</code> file with various contents in the directory that
-contains the object to lock.</p>
-
-<p>We use the following paths:</p>
-
-<ul>
-<li>Keyspace: <code class="prettyprint">/vt/keyspaces/&lt;keyspace&gt;/_Data</code></li>
-<li>Shard: <code class="prettyprint">/vt/keyspaces/&lt;keyspace&gt;/&lt;shard&gt;/_Data</code></li>
-<li>Tablet: <code class="prettyprint">/vt/tablets/&lt;cell&gt;-&lt;uid&gt;/_Data</code></li>
-<li>Replication Graph: <code class="prettyprint">/vt/replication/&lt;keyspace&gt;/&lt;shard&gt;/_Data</code></li>
-<li>SrvKeyspace: <code class="prettyprint">/vt/ns/&lt;keyspace&gt;/_Data</code></li>
-<li>SrvVSchema: <code class="prettyprint">/vt/ns/_VSchema</code></li>
-</ul>
-
-<h3 id="consul-consul-implementation">Consul <code class="prettyprint">consul</code> Implementation</h3>
-
-<p>This topology service plugin is meant to use Consul clusters as storage backend
-for the topology data.</p>
-
-<p>To configure a <code class="prettyprint">consul</code> installation, let&#39;s start with the global cell
-service. It is described by the address of a server,
-and by the root node path to put the Vitess data in (it cannot start with <code class="prettyprint">/</code>). For instance, assuming we
-want to use servers <code class="prettyprint">global_server:global_port</code> with node path
-<code class="prettyprint">vitess/global</code>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Set the following flags to let Vitess use this global server,</span>
-<span class="c"># and simplify the example below:</span>
-<span class="c"># -topo_implementation consul</span>
-<span class="c"># -topo_global_server_address global_server:global_port</span>
-<span class="c"># -topo_global_root vitess/global</span>
-<span class="nv">TOPOLOGY</span><span class="o">=</span><span class="err">&quot;</span>-topo_implementation consul -topo_global_server_address global_server:global_port -topo_global_root vitess/global
-</code></pre></div>
-<p>Then to add a cell whose local topology server
-<code class="prettyprint">cell1_server1:cell1_port</code> will store their data under the
-directory <code class="prettyprint">vitess/cell1</code>:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Reference cell1 in the global topology service:</span>
-<span class="c"># (the TOPOLOGY variable is defined in the previous section)</span>
-vtctl <span class="nv">$TOPOLOGY</span> AddCellInfo <span class="se">\</span>
-  -server_address cell1_server1:cell1_port <span class="se">\</span>
-  -root vitess/cell1 <span class="se">\</span>
-  cell1
-</code></pre></div>
-<p>If only one cell is used, the same consul instances can be used for both
-global and local data. A local cell record still needs to be created, just use
-the same server address and, very importantly, a <em>different</em> root node path.</p>
-
-<h4 id="implementation-details">Implementation Details</h4>
-
-<p>We use the following paths:</p>
-
-<p><em>Global Cell</em>:</p>
-
-<ul>
-<li>Election path: <code class="prettyprint">elections/&lt;name&gt;</code></li>
-<li>CellInfo path: <code class="prettyprint">cells/&lt;cell name&gt;/CellInfo</code></li>
-<li>Keyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/Keyspace</code></li>
-<li>Shard: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/Shard</code></li>
-<li>VSchema: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/VSchema</code></li>
-</ul>
-
-<p><em>Local Cell</em>:</p>
-
-<ul>
-<li>Tablet: <code class="prettyprint">tablets/&lt;cell&gt;-&lt;uid&gt;/Tablet</code></li>
-<li>Replication Graph: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/ShardReplication</code></li>
-<li>SrvKeyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/SrvKeyspace</code></li>
-<li>SrvVSchema: <code class="prettyprint">SvrVSchema</code></li>
-</ul>
-
-<p>For locks, we use a file named <code class="prettyprint">Lock</code> in the directory to lock, and the regular
-Consul Lock API.</p>
-
-<p>Master elections use a single lock file (the Election path) and the regular
-Consul Lock API. The contents of the lock file is the ID of the current master.</p>
-
-<p>Watches use the Consul long polling Get call. They cannot be interrupted, so we
-use a long poll whose duration is set by the <code class="prettyprint">-topo_consul_watch_poll_duration</code>
-flag. Canceling a watch may have to wait until the end of a polling cycle with
-that duration before returning.</p>
-
-<p>We store the proto3 binary data for each object.</p>
-
-<h2 id="running-in-only-one-cell">Running In Only One Cell</h2>
-
-<p>The topology service is meant to be distributed across multiple cells, and
-survive single cell outages. However, one common usage is to run a Vitess
-cluster in only one cell / region. This part explains how to do this, and later
-on upgrade to multiple cells / regions.</p>
-
-<p>If running in a single cell, the same topology service can be used for both
-global and local data.  A local cell record still needs to be created, just use
-the same server address and, very importantly, a <em>different</em> root node path.</p>
-
-<p>In that case, just running 3 servers for topology service quorum is probably
-sufficient. For instance, 3 etcd servers. And use their address for the local
-cell as well. Let&#39;s use a short cell name, like <code class="prettyprint">local</code>, as the local data in
-that topology server will later on be moved to a different topology service,
-which will have the real cell name.</p>
-
-<h3 id="extending-to-more-cells">Extending To More Cells</h3>
-
-<p>To then run in multiple cells, the current topology service needs to be split
-into a global instance and one local instance per cell. Whereas, the initial
-setup had 3 topology servers (used for global and local data), we recommend to
-run 5 global servers across all cells (for global topology data) and 3 local
-servers per cell (for per-cell topology data).</p>
-
-<p>To migrate to such a setup, start by adding the 3 local servers in the second
-cell and run <code class="prettyprint">vtctl AddCellinfo</code> as was done for the first cell. Tablets and
-vtgates can now be started in the second cell, and used normally.</p>
-
-<p>vtgate can then be configured with a list of cells to watch for tablets using
-the <code class="prettyprint">-cells_to_watch</code> command line parameter. It can then use all tablets in all
-cells to route traffic. Note this is necessary to access the master in another
-cell.</p>
-
-<p>After the extension to two cells, the original topo service contains both the
-global topology data, and the first cell topology data. The more symetrical
-configuration we&#39;re after would be to split that original service into two: a
-global one that only contains the global data (spread across both cells), and a
-local one to the original cells. To achieve that split:</p>
-
-<ul>
-<li>Start up a new local topology service in that original cell (3 more local
-servers in that cell).</li>
-<li>Pick a name for that cell, different from <code class="prettyprint">local</code>.</li>
-<li>Use <code class="prettyprint">vtctl AddCellInfo</code> to configure it.</li>
-<li>Make sure all vtgates can see that new local cell (again, using
-<code class="prettyprint">-cells_to_watch</code>).</li>
-<li>Restart all vttablets to be in that new cell, instead of the <code class="prettyprint">local</code> cell name
-used before.</li>
-<li>Use <code class="prettyprint">vtctl RemoveKeyspaceCell</code> to remove all mentions of the <code class="prettyprint">local</code> cell in
-all keyspaces.</li>
-<li>Use <code class="prettyprint">vtctl RemoveCellInfo</code> to remove the global configurations for that
-<code class="prettyprint">local</code> cell.</li>
-<li>Remove all remaining data in the global topology service that are in the old
-local server root.</li>
-</ul>
-
-<p>After this split, the configuration is completely symetrical:</p>
-
-<ul>
-<li>a global topology service, with servers in all cells. Only contains global
-topology data about Keyspaces, Shards and VSchema. Typically it has 5 servers
-across all cells.</li>
-<li>a local topology service to each cell, with servers only in that cell. Only
-contains local topology data about Tablets, and roll-ups of global data for
-efficient access. Typically, it has 3 servers in each cell.</li>
-</ul>
-
-<h2 id="migration-between-implementations">Migration Between Implementations</h2>
-
-<p>We provide the <code class="prettyprint">topo2topo</code> binary file to migrate between one implementation
-and another of the topology service.</p>
-
-<p>The process to follow in that case is:</p>
-
-<ul>
-<li>Start from a stable topology, where no resharding or reparenting is on-going.</li>
-<li>Configure the new topology service so it has at least all the cells of the
-source topology service. Make sure it is running.</li>
-<li>Run the <code class="prettyprint">topo2topo</code> program with the right flags. <code class="prettyprint">-from_implementation</code>,
-<code class="prettyprint">-from_root</code>, <code class="prettyprint">-from_server</code> describe the source (old) topology
-service. <code class="prettyprint">-to_implementation</code>, <code class="prettyprint">-to_root</code>, <code class="prettyprint">-to_server</code> describe the
-destination (new) topology service.</li>
-<li>Run <code class="prettyprint">vtctl RebuildKeyspaceGraph</code> for each keyspace using the new topology
-service flags.</li>
-<li>Run <code class="prettyprint">vtctl RebuildVSchemaGraph</code> using the new topology service flags.</li>
-<li>Restart all <code class="prettyprint">vtgate</code> using the new topology service flags. They will see the
-same keyspaces / shards / tablets / vschema as before, as the topology was
-copied over.</li>
-<li>Restart all <code class="prettyprint">vttablet</code> using the new topology service flags. They may use the
-same ports or not, but they will update the new topology when they start up,
-and be visible from vtgate.</li>
-<li>Restart all <code class="prettyprint">vtctld</code> processes using the new topology service flags. So that
-the UI also shows the new data.</li>
-</ul>
-
-<p>Sample commands to migrate from deprecated <code class="prettyprint">zookeeper</code> to <code class="prettyprint">zk2</code>
-topology would be:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Let&#39;s assume the zookeeper client config file is already</span>
-<span class="c"># exported in $ZK_CLIENT_CONFIG, and it contains a global record</span>
-<span class="c"># pointing to: global_server1,global_server2</span>
-<span class="c"># an a local cell cell1 pointing to cell1_server1,cell1_server2</span>
-<span class="c">#</span>
-<span class="c"># The existing directories created by Vitess are:</span>
-<span class="c"># /zk/global/vt/...</span>
-<span class="c"># /zk/cell1/vt/...</span>
-<span class="c">#</span>
-<span class="c"># The new zk2 implementation can use any root, so we will use:</span>
-<span class="c"># /vitess/global in the global topology service, and:</span>
-<span class="c"># /vitess/cell1 in the local topology service.</span>
-
-<span class="c"># Create the new topology service roots in global and local cell.</span>
-zk -server global_server1,global_server2 touch -p /vitess/global
-zk -server cell1_server1,cell1_server2 touch -p /vitess/cell1
-
-<span class="c"># Store the flags in a shell variable to simplify the example below.</span>
-<span class="nv">TOPOLOGY</span><span class="o">=</span><span class="s2">&quot;-topo_implementation zk2 -topo_global_server_address global_server1,global_server2 -topo_global_root /vitess/global&quot;</span>
-
-<span class="c"># Reference cell1 in the global topology service:</span>
-vtctl <span class="nv">$TOPOLOGY</span> AddCellInfo <span class="se">\</span>
-  -server_address cell1_server1,cell1_server2 <span class="se">\</span>
-  -root /vitess/cell1 <span class="se">\</span>
-  cell1
-
-<span class="c"># Now copy the topology. Note the old zookeeper implementation doesn&#39;t need</span>
-<span class="c"># any server or root parameter, as it reads ZK_CLIENT_CONFIG.</span>
-topo2topo <span class="se">\</span>
-  -from_implementation zookeeper <span class="se">\</span>
-  -to_implementation zk2 <span class="se">\</span>
-  -to_server global_server1,global_server2 <span class="se">\</span>
-  -to_root /vitess/global <span class="se">\</span>
-
-<span class="c"># Rebuild SvrKeyspace objects in new service, for each keyspace.</span>
-vtctl <span class="nv">$TOPOLOGY</span> RebuildKeyspaceGraph keyspace1
-vtctl <span class="nv">$TOPOLOGY</span> RebuildKeyspaceGraph keyspace2
-
-<span class="c"># Rebuild SrvVSchema objects in new service.</span>
-vtctl <span class="nv">$TOPOLOGY</span> RebuildVSchemaGraph
-
-<span class="c"># Now restart all vtgate, vttablet, vtctld processes replacing:</span>
-<span class="c"># -topo_implementation zookeeper</span>
-<span class="c"># With:</span>
-<span class="c"># -topo_implementation zk2</span>
-<span class="c"># -topo_global_server_address global_server1,global_server2</span>
-<span class="c"># -topo_global_root /vitess/global</span>
-<span class="c">#</span>
-<span class="c"># After this, the ZK_CLIENT_CONF file and environment variables are not needed</span>
-<span class="c"># any more.</span>
-</code></pre></div>
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/topology-service/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/topology-service/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/topology-service/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/topology-service/"</script>
 </html>
diff --git a/docs/user-guide/topology-service/index.html b/docs/user-guide/topology-service/index.html
new file mode 100644
index 00000000000..8e2f8180dc1
--- /dev/null
+++ b/docs/user-guide/topology-service/index.html
@@ -0,0 +1,1017 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Topology Service | Vitess</title>
+<meta property="og:title" content="Topology Service" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/topology-service/" />
+<meta property="og:url" content="http://vitess.io/user-guide/topology-service/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/topology-service/","headline":"Topology Service","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Topology Service</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="topology-service">Topology Service</h1>
+
+<p>This document describes the Topology Service, a key part of the Vitess
+architecture. This service is exposed to all Vitess processes, and is used to
+store small pieces of configuration data about the Vitess cluster, and provide
+cluster-wide locks. It also supports watches, which we will use soon.</p>
+
+<p>Concretely, the Topology Service features are implemented by
+a <a href="http://en.wikipedia.org/wiki/Distributed_lock_manager">Lock Server</a>, referred
+to as Topology Server in the rest of this document. We use a plug-in
+implementation and we support multiple Lock Servers (Zookeeper, etcd, Consul, …)
+as backends for the service.</p>
+
+<h2 id="requirements-and-usage">Requirements and Usage</h2>
+
+<p>The Topology Service is used to store information about the Keyspaces, the
+Shards, the Tablets, the Replication Graph, and the Serving Graph. We store
+small data structures (a few hundred bytes) per object.</p>
+
+<p>The main contract for the Topology Server is to be very highly available and
+consistent. It is understood it will come at a higher latency cost and very low
+throughput.</p>
+
+<p>We never use the Topology Server as an RPC mechanism, nor as a storage system
+for logs. We never depend on the Topology Server being responsive and fast to
+serve every query.</p>
+
+<p>The Topology Server must also support a Watch interface, to signal when certain
+conditions occur on a node. This is used for instance to know when keyspaces
+topology changes (for resharding for instance).</p>
+
+<h3 id="global-vs-local">Global vs Local</h3>
+
+<p>We differentiate two instances of the Topology Server: the Global instance, and
+the per-cell Local instance:</p>
+
+<ul>
+<li>The Global instance is used to store global data about the topology that
+doesn’t change very often, for instance information about Keyspaces and
+Shards. The data is independent of individual instances and cells, and needs
+to survive a cell going down entirely.</li>
+<li>There is one Local instance per cell, that contains cell-specific information,
+and also rolled-up data from the global + local cell to make it easier for
+clients to find the data. The Vitess local processes should not use the Global
+topology instance, but instead the rolled-up data in the Local topology
+server as much as possible.</li>
+</ul>
+
+<p>The Global instance can go down for a while and not impact the local cells (an
+exception to that is if a reparent needs to be processed, it might not work). If
+a Local instance goes down, it only affects the local tablets in that instance
+(and then the cell is usually in bad shape, and should not be used).</p>
+
+<p>Furthermore, the Vitess processes will not use the Global nor the Local Topology
+Server to serve individual queries. They only use the Topology Server to get the
+topology information at startup and in the background, but never to directly
+serve queries.</p>
+
+<h3 id="recovery">Recovery</h3>
+
+<p>If a local Topology Server dies and is not recoverable, it can be wiped out. All
+the tablets in that cell then need to be restarted so they re-initialize their
+topology records (but they won’t lose any MySQL data).</p>
+
+<p>If the global Topology Server dies and is not recoverable, this is more of a
+problem. All the Keyspace / Shard objects have to be re-created. Then the cells
+should recover.</p>
+
+<h2 id="global-data">Global Data</h2>
+
+<p>This section describes the data structures stored in the global instance of the
+topology server.</p>
+
+<h3 id="keyspace">Keyspace</h3>
+
+<p>The Keyspace object contains various information, mostly about sharding: how is
+this Keyspace sharded, what is the name of the sharding key column, is this
+Keyspace serving data yet, how to split incoming queries, …</p>
+
+<p>An entire Keyspace can be locked. We use this during resharding for instance,
+when we change which Shard is serving what inside a Keyspace. That way we
+guarantee only one operation changes the keyspace data concurrently.</p>
+
+<h3 id="shard">Shard</h3>
+
+<p>A Shard contains a subset of the data for a Keyspace. The Shard record in the
+global topology contains:</p>
+
+<ul>
+<li>the MySQL Master tablet alias for this shard</li>
+<li>the sharding key range covered by this Shard inside the Keyspace</li>
+<li>the tablet types this Shard is serving (master, replica, batch, …), per cell
+if necessary.</li>
+<li>if during filtered replication, the source shards this shard is replicating
+from</li>
+<li>the list of cells that have tablets in this shard</li>
+<li>shard-global tablet controls, like blacklisted tables no tablet should serve
+in this shard</li>
+</ul>
+
+<p>A Shard can be locked. We use this during operations that affect either the
+Shard record, or multiple tablets within a Shard (like reparenting), so multiple
+jobs don’t concurrently alter the data.</p>
+
+<h3 id="vschema-data">VSchema Data</h3>
+
+<p>The VSchema data contains sharding and routing information for
+the <a href="https://github.com/youtube/vitess/blob/master/doc/VTGateV3Features.md">VTGate V3</a> API.</p>
+
+<h2 id="local-data">Local Data</h2>
+
+<p>This section describes the data structures stored in the local instance (per
+cell) of the topology server.</p>
+
+<h3 id="tablets">Tablets</h3>
+
+<p>The Tablet record has a lot of information about a single vttablet process
+running inside a tablet (along with the MySQL process):</p>
+
+<ul>
+<li>the Tablet Alias (cell+unique id) that uniquely identifies the Tablet</li>
+<li>the Hostname, IP address and port map of the Tablet</li>
+<li>the current Tablet type (master, replica, batch, spare, …)</li>
+<li>which Keyspace / Shard the tablet is part of</li>
+<li>the sharding Key Range served by this Tablet</li>
+<li>user-specified tag map (to store per installation data for instance)</li>
+</ul>
+
+<p>A Tablet record is created before a tablet can be running (either by <code class="prettyprint">vtctl
+InitTablet</code> or by passing the <code class="prettyprint">init_*</code> parameters to vttablet). The only way a
+Tablet record will be updated is one of:</p>
+
+<ul>
+<li>The vttablet process itself owns the record while it is running, and can
+change it.</li>
+<li>At init time, before the tablet starts</li>
+<li>After shutdown, when the tablet gets deleted.</li>
+<li>If a tablet becomes unresponsive, it may be forced to spare to make it
+unhealthy when it restarts.</li>
+</ul>
+
+<h3 id="replication-graph">Replication Graph</h3>
+
+<p>The Replication Graph allows us to find Tablets in a given Cell / Keyspace /
+Shard. It used to contain information about which Tablet is replicating from
+which other Tablet, but that was too complicated to maintain. Now it is just a
+list of Tablets.</p>
+
+<h3 id="serving-graph">Serving Graph</h3>
+
+<p>The Serving Graph is what the clients use to find the per-cell topology of a
+Keyspace. It is a roll-up of global data (Keyspace + Shard). vtgates only open a
+small number of these objects and get all they need quickly.</p>
+
+<h4 id="srvkeyspace">SrvKeyspace</h4>
+
+<p>It is the local representation of a Keyspace. It contains information on what
+shard to use for getting to the data (but not information about each individual
+shard):</p>
+
+<ul>
+<li>the partitions map is keyed by the tablet type (master, replica, batch, …) and
+the values are list of shards to use for serving.</li>
+<li>it also contains the global Keyspace fields, copied for fast access.</li>
+</ul>
+
+<p>It can be rebuilt by running <code class="prettyprint">vtctl RebuildKeyspaceGraph</code>. It is
+automatically rebuilt when a tablet starts up in a cell and the SrvKeyspace
+for that cell / keyspace doesn&#39;t exist yet. It will also be changed
+during horizontal and vertical splits.</p>
+
+<h4 id="srvvschema">SrvVSchema</h4>
+
+<p>It is the local roll-up for the VSchema. It contains the VSchema for all
+keyspaces in a single object.</p>
+
+<p>It can be rebuilt by running <code class="prettyprint">vtctl RebuildVSchemaGraph</code>. It is automatically
+rebuilt when using <code class="prettyprint">vtctl ApplyVSchema</code> (unless prevented by flags).</p>
+
+<h2 id="workflows-involving-the-topology-server">Workflows Involving the Topology Server</h2>
+
+<p>The Topology Server is involved in many Vitess workflows.</p>
+
+<p>When a Tablet is initialized, we create the Tablet record, and add the Tablet to
+the Replication Graph. If it is the master for a Shard, we update the global
+Shard record as well.</p>
+
+<p>Administration tools need to find the tablets for a given Keyspace / Shard:
+first we get the list of Cells that have Tablets for the Shard (global topology
+Shard record has these) then we use the Replication Graph for that Cell /
+Keyspace / Shard to find all the tablets then we can read each tablet record.</p>
+
+<p>When a Shard is reparented, we need to update the global Shard record with the
+new master alias.</p>
+
+<p>Finding a tablet to serve the data is done in two stages: vtgate maintains a
+health check connection to all possible tablets, and they report which keyspace
+/ shard / tablet type they serve. vtgate also reads the SrvKeyspace object, to
+find out the shard map. With these two pieces of information, vtgate can route
+the query to the right vttablet.</p>
+
+<p>During resharding events, we also change the topology a lot. An horizontal split
+will change the global Shard records, and the local SrvKeyspace records. A
+vertical split will change the global Keyspace records, and the local
+SrvKeyspace records.</p>
+
+<h2 id="implementations">Implementations</h2>
+
+<p>The Topology Server interface is defined in our code in <code class="prettyprint">go/vt/topo/server.go</code>
+and we also have a set of unit tests for it in <code class="prettyprint">go/vt/topo/test</code>.</p>
+
+<p>This part describes the two implementations we have, and their specific
+behavior.</p>
+
+<p>If starting from scratch, please use the <code class="prettyprint">zk2</code>, <code class="prettyprint">etcd2</code> or <code class="prettyprint">consul</code>
+implementations, as we are deprecating the old <code class="prettyprint">zookeeper</code> and <code class="prettyprint">etcd</code>
+implementations. See the migration section below if you want to migrate.</p>
+
+<h3 id="zookeeper-zk2-implementation-new-version-of-zookeeper">Zookeeper <code class="prettyprint">zk2</code> Implementation (new version of <code class="prettyprint">zookeeper</code>)</h3>
+
+<p>This is the recommended implementation when using Zookeeper. The old <code class="prettyprint">zookeeper</code>
+implementation is deprecated, see next section.</p>
+
+<p>The global cell typically has around 5 servers, distributed one in each
+cell. The local cells typically have 3 or 5 servers, in different server racks /
+sub-networks for higher resilience. For our integration tests, we use a single
+ZK server that serves both global and local cells.</p>
+
+<p>We provide the <code class="prettyprint">zk</code> utility for easy access to the topology data in
+Zookeeper. It can list, read and write files inside any Zoopeeker server. Just
+specify the <code class="prettyprint">-server</code> parameter to point to the Zookeeper servers. Note the
+vtctld UI can also be used to see the contents of the topology data.</p>
+
+<p>To configure a Zookeeper installation, let&#39;s start with the global cell
+service. It is described by the addresses of the servers (comma separated list),
+and by the root directory to put the Vitess data in. For instance, assuming we
+want to use servers <code class="prettyprint">global_server1,global_server2</code> in path <code class="prettyprint">/vitess/global</code>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># First create the directory in the global server:</span>
+zk -server global_server1,global_server2 touch -p /vitess/global
+
+<span class="c"># Set the following flags to let Vitess use this global server:</span>
+<span class="c"># -topo_implementation zk2</span>
+<span class="c"># -topo_global_server_address global_server1,global_server2</span>
+<span class="c"># -topo_global_root /vitess/global</span>
+</code></pre></div>
+<p>Then to add a cell whose local topology servers <code class="prettyprint">cell1_server1,cell1_server2</code>
+will store their data under the directory <code class="prettyprint">/vitess/cell1</code>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">TOPOLOGY</span><span class="o">=</span><span class="s2">&quot;-topo_implementation zk2 -topo_global_server_address global_server1,global_server2 -topo_global_root /vitess/global&quot;</span>
+
+<span class="c"># Reference cell1 in the global topology service:</span>
+vtctl <span class="nv">$TOPOLOGY</span> AddCellInfo <span class="se">\</span>
+  -server_address cell1_server1,cell1_server2 <span class="se">\</span>
+  -root /vitess/cell1 <span class="se">\</span>
+  cell1
+</code></pre></div>
+<p>If only one cell is used, the same Zookeeper instance can be used for both
+global and local data. A local cell record still needs to be created, just use
+the same server address, and very importantly a <em>different</em> root directory.</p>
+
+<h4 id="implementation-details">Implementation Details</h4>
+
+<p>We use the following paths:</p>
+
+<p><em>Global Cell</em>:</p>
+
+<ul>
+<li>Election path: <code class="prettyprint">elections/&lt;name&gt;</code></li>
+<li>CellInfo path: <code class="prettyprint">cells/&lt;cell name&gt;/CellInfo</code></li>
+<li>Keyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/Keyspace</code></li>
+<li>Shard: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/Shard</code></li>
+<li>VSchema: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/VSchema</code></li>
+</ul>
+
+<p><em>Local Cell</em>:</p>
+
+<ul>
+<li>Tablet: <code class="prettyprint">tablets/&lt;cell&gt;-&lt;uid&gt;/Tablet</code></li>
+<li>Replication Graph: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/ShardReplication</code></li>
+<li>SrvKeyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/SrvKeyspace</code></li>
+<li>SrvVSchema: <code class="prettyprint">SvrVSchema</code></li>
+</ul>
+
+<p>For locks, we create a subdirectory called <code class="prettyprint">locks</code> under either the keyspace
+directory or the shard directory.</p>
+
+<p>Both locks and master election are implemented using ephemeral, sequential files
+which are stored in their respective directory.</p>
+
+<p>We store the proto3 binary data for each object. The <code class="prettyprint">zk</code> utility can decode
+these files when using the <code class="prettyprint">-p</code> option of the <code class="prettyprint">cat</code> command:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>zk --server localhost:15014 cat -p /global/keyspaces/test_keyspace/shards/-80/Shard
+master_alias: &lt;
+  cell: <span class="s2">&quot;test_nj&quot;</span>
+  uid: 62344
+&gt;
+key_range: &lt;
+  end: <span class="s2">&quot;\200&quot;</span>
+&gt;
+served_types: &lt;
+  tablet_type: MASTER
+&gt;
+served_types: &lt;
+  tablet_type: REPLICA
+&gt;
+served_types: &lt;
+  tablet_type: RDONLY
+&gt;
+cells: <span class="s2">&quot;test_nj&quot;</span>
+</code></pre></div>
+<h3 id="old-zookeeper-zookeeper-implementaion-deprecated-use-zk2-instead">Old Zookeeper <code class="prettyprint">zookeeper</code> Implementaion (deprecated, use <code class="prettyprint">zk2</code> instead)</h3>
+
+<p>This old <code class="prettyprint">zookeeper</code> topology service is deprecated, and will be removed in
+Vitess version 2.2. Please use <code class="prettyprint">zk2</code> instead, and see the <code class="prettyprint">topo2topo</code> section
+below for migration.</p>
+
+<p>Our Zookeeper implementation is based on a configuration file that describes
+where the global and each local cell ZK instances are. When adding a cell, all
+processes that may access that cell should be restarted with the new
+configuration file.</p>
+
+<p>The global cell typically has around 5 servers, distributed one in each
+cell. The local cells typically have 3 or 5 servers, in different server racks /
+sub-networks for higher resilience. For our integration tests, we use a single
+ZK server that serves both global and local cells.</p>
+
+<p>We sometimes store both data and sub-directories in a path (for a keyspace for
+instance). We use JSON to encode the data.</p>
+
+<p>For locking, we use an auto-incrementing file name in the <code class="prettyprint">/action</code> subdirectory
+of the object directory. We also move them to <code class="prettyprint">/actionlogs</code> when the lock is
+released. And we have a purge process to clear the old locks (which should be
+run on a crontab, typically).</p>
+
+<p>Note the paths used to store global and per-cell data do not overlap, so a
+single ZK can be used for both global and local ZKs. This is however not
+recommended, for reliability reasons.</p>
+
+<ul>
+<li>Keyspace: <code class="prettyprint">/zk/global/vt/keyspaces/&lt;keyspace&gt;</code></li>
+<li>Shard: <code class="prettyprint">/zk/global/vt/keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;</code></li>
+<li>Tablet: <code class="prettyprint">/zk/&lt;cell&gt;/vt/tablets/&lt;uid&gt;</code></li>
+<li>Replication Graph: <code class="prettyprint">/zk/&lt;cell&gt;/vt/replication/&lt;keyspace&gt;/&lt;shard&gt;</code></li>
+<li>SrvKeyspace: <code class="prettyprint">/zk/&lt;cell&gt;/vt/ns/&lt;keyspace&gt;</code></li>
+<li>SrvVSchema: <code class="prettyprint">/zk/&lt;cell&gt;/vt/vschema</code></li>
+</ul>
+
+<p>We provide the &#39;zk&#39; utility for easy access to the topology data in
+Zookeeper. For instance:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># NOTE: We do not set the ZK_CLIENT_CONFIG environment variable here,</span>
+<span class="c"># as the zk tool connects to a specific server. </span>
+<span class="nv">$ </span>zk -server &lt;server address&gt; ls /zk/global/vt/keyspaces/user
+action
+actionlog
+shards
+</code></pre></div>
+<h3 id="etcd-etcd2-implementation-new-version-of-etcd">etcd <code class="prettyprint">etcd2</code> Implementation (new version of <code class="prettyprint">etcd</code>)</h3>
+
+<p>This topology service plugin is meant to use etcd clusters as storage backend
+for the topology data. This topology service supports version 3 and up of the
+etcd server.</p>
+
+<p>This implementation is named <code class="prettyprint">etcd2</code> because it supersedes our previous
+implementation <code class="prettyprint">etcd</code>. Note that the storage format has been changed with the
+<code class="prettyprint">etcd2</code> implementation, i.e. existing data created by the previous <code class="prettyprint">etcd</code>
+implementation must be migrated manually (See migration section below).</p>
+
+<p>To configure an <code class="prettyprint">etcd2</code> installation, let&#39;s start with the global cell
+service. It is described by the addresses of the servers (comma separated list),
+and by the root directory to put the Vitess data in. For instance, assuming we
+want to use servers <code class="prettyprint">http://global_server1,http://global_server2</code> in path
+<code class="prettyprint">/vitess/global</code>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Set the following flags to let Vitess use this global server,</span>
+<span class="c"># and simplify the example below:</span>
+<span class="c"># -topo_implementation etcd2</span>
+<span class="c"># -topo_global_server_address http://global_server1,http://global_server2</span>
+<span class="c"># -topo_global_root /vitess/global</span>
+<span class="nv">TOPOLOGY</span><span class="o">=</span><span class="err">&quot;</span>-topo_implementation etcd2 -topo_global_server_address http://global_server1,http://global_server2 -topo_global_root /vitess/global
+</code></pre></div>
+<p>Then to add a cell whose local topology servers
+<code class="prettyprint">http://cell1_server1,http://cell1_server2</code> will store their data under the
+directory <code class="prettyprint">/vitess/cell1</code>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Reference cell1 in the global topology service:</span>
+<span class="c"># (the TOPOLOGY variable is defined in the previous section)</span>
+vtctl <span class="nv">$TOPOLOGY</span> AddCellInfo <span class="se">\</span>
+  -server_address http://cell1_server1,http://cell1_server2 <span class="se">\</span>
+  -root /vitess/cell1 <span class="se">\</span>
+  cell1
+</code></pre></div>
+<p>If only one cell is used, the same etcd instances can be used for both
+global and local data. A local cell record still needs to be created, just use
+the same server address and, very importantly, a <em>different</em> root directory.</p>
+
+<h4 id="implementation-details">Implementation Details</h4>
+
+<p>We use the following paths:</p>
+
+<p><em>Global Cell</em>:</p>
+
+<ul>
+<li>Election path: <code class="prettyprint">elections/&lt;name&gt;</code></li>
+<li>CellInfo path: <code class="prettyprint">cells/&lt;cell name&gt;/CellInfo</code></li>
+<li>Keyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/Keyspace</code></li>
+<li>Shard: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/Shard</code></li>
+<li>VSchema: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/VSchema</code></li>
+</ul>
+
+<p><em>Local Cell</em>:</p>
+
+<ul>
+<li>Tablet: <code class="prettyprint">tablets/&lt;cell&gt;-&lt;uid&gt;/Tablet</code></li>
+<li>Replication Graph: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/ShardReplication</code></li>
+<li>SrvKeyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/SrvKeyspace</code></li>
+<li>SrvVSchema: <code class="prettyprint">SvrVSchema</code></li>
+</ul>
+
+<p>For locks, we use a subdirectory named <code class="prettyprint">locks</code> in the directory to lock, and an
+ephemeral file in that subdirectory (it is associated with a lease, whose TTL
+can be set with the <code class="prettyprint">-topo_etcd_lease_duration</code> flag, defaults to 30
+seconds). The ephemeral file with the lowest ModRevision has the lock, the
+others wait for files with older ModRevisions to disappear.</p>
+
+<p>Master elections also use a subdirectory, named after the election Name, and use
+a similar method as the locks, with ephemeral files.</p>
+
+<p>We store the proto3 binary data for each object (as the v3 API allows us to store binary data).</p>
+
+<h3 id="old-etcd-etcd-implementaion-deprecated-use-etcd2-instead">Old etcd <code class="prettyprint">etcd</code> Implementaion (deprecated, use <code class="prettyprint">etcd2</code> instead)</h3>
+
+<p>This old <code class="prettyprint">etcd</code> topology service is deprecated, and will be removed in
+Vitess version 2.2. Please use <code class="prettyprint">etcd2</code> instead, and see the <code class="prettyprint">topo2topo</code> section
+below for migration.</p>
+
+<p>Our etcd implementation is based on a command-line parameter that gives the
+location(s) of the global etcd server. Then we query the path <code class="prettyprint">/vt/cells</code> and
+each file in there is named after a cell, and contains the list of etcd servers
+for that cell. Each cell server files are stored in <code class="prettyprint">/vt/</code>.</p>
+
+<p>We use the <code class="prettyprint">_Data</code> filename to store the data, JSON encoded.</p>
+
+<p>For locking, we store a <code class="prettyprint">_Lock</code> file with various contents in the directory that
+contains the object to lock.</p>
+
+<p>We use the following paths:</p>
+
+<ul>
+<li>Keyspace: <code class="prettyprint">/vt/keyspaces/&lt;keyspace&gt;/_Data</code></li>
+<li>Shard: <code class="prettyprint">/vt/keyspaces/&lt;keyspace&gt;/&lt;shard&gt;/_Data</code></li>
+<li>Tablet: <code class="prettyprint">/vt/tablets/&lt;cell&gt;-&lt;uid&gt;/_Data</code></li>
+<li>Replication Graph: <code class="prettyprint">/vt/replication/&lt;keyspace&gt;/&lt;shard&gt;/_Data</code></li>
+<li>SrvKeyspace: <code class="prettyprint">/vt/ns/&lt;keyspace&gt;/_Data</code></li>
+<li>SrvVSchema: <code class="prettyprint">/vt/ns/_VSchema</code></li>
+</ul>
+
+<h3 id="consul-consul-implementation">Consul <code class="prettyprint">consul</code> Implementation</h3>
+
+<p>This topology service plugin is meant to use Consul clusters as storage backend
+for the topology data.</p>
+
+<p>To configure a <code class="prettyprint">consul</code> installation, let&#39;s start with the global cell
+service. It is described by the address of a server,
+and by the root node path to put the Vitess data in (it cannot start with <code class="prettyprint">/</code>). For instance, assuming we
+want to use servers <code class="prettyprint">global_server:global_port</code> with node path
+<code class="prettyprint">vitess/global</code>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Set the following flags to let Vitess use this global server,</span>
+<span class="c"># and simplify the example below:</span>
+<span class="c"># -topo_implementation consul</span>
+<span class="c"># -topo_global_server_address global_server:global_port</span>
+<span class="c"># -topo_global_root vitess/global</span>
+<span class="nv">TOPOLOGY</span><span class="o">=</span><span class="err">&quot;</span>-topo_implementation consul -topo_global_server_address global_server:global_port -topo_global_root vitess/global
+</code></pre></div>
+<p>Then to add a cell whose local topology server
+<code class="prettyprint">cell1_server1:cell1_port</code> will store their data under the
+directory <code class="prettyprint">vitess/cell1</code>:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Reference cell1 in the global topology service:</span>
+<span class="c"># (the TOPOLOGY variable is defined in the previous section)</span>
+vtctl <span class="nv">$TOPOLOGY</span> AddCellInfo <span class="se">\</span>
+  -server_address cell1_server1:cell1_port <span class="se">\</span>
+  -root vitess/cell1 <span class="se">\</span>
+  cell1
+</code></pre></div>
+<p>If only one cell is used, the same consul instances can be used for both
+global and local data. A local cell record still needs to be created, just use
+the same server address and, very importantly, a <em>different</em> root node path.</p>
+
+<h4 id="implementation-details">Implementation Details</h4>
+
+<p>We use the following paths:</p>
+
+<p><em>Global Cell</em>:</p>
+
+<ul>
+<li>Election path: <code class="prettyprint">elections/&lt;name&gt;</code></li>
+<li>CellInfo path: <code class="prettyprint">cells/&lt;cell name&gt;/CellInfo</code></li>
+<li>Keyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/Keyspace</code></li>
+<li>Shard: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/Shard</code></li>
+<li>VSchema: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/VSchema</code></li>
+</ul>
+
+<p><em>Local Cell</em>:</p>
+
+<ul>
+<li>Tablet: <code class="prettyprint">tablets/&lt;cell&gt;-&lt;uid&gt;/Tablet</code></li>
+<li>Replication Graph: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/shards/&lt;shard&gt;/ShardReplication</code></li>
+<li>SrvKeyspace: <code class="prettyprint">keyspaces/&lt;keyspace&gt;/SrvKeyspace</code></li>
+<li>SrvVSchema: <code class="prettyprint">SvrVSchema</code></li>
+</ul>
+
+<p>For locks, we use a file named <code class="prettyprint">Lock</code> in the directory to lock, and the regular
+Consul Lock API.</p>
+
+<p>Master elections use a single lock file (the Election path) and the regular
+Consul Lock API. The contents of the lock file is the ID of the current master.</p>
+
+<p>Watches use the Consul long polling Get call. They cannot be interrupted, so we
+use a long poll whose duration is set by the <code class="prettyprint">-topo_consul_watch_poll_duration</code>
+flag. Canceling a watch may have to wait until the end of a polling cycle with
+that duration before returning.</p>
+
+<p>We store the proto3 binary data for each object.</p>
+
+<h2 id="running-in-only-one-cell">Running In Only One Cell</h2>
+
+<p>The topology service is meant to be distributed across multiple cells, and
+survive single cell outages. However, one common usage is to run a Vitess
+cluster in only one cell / region. This part explains how to do this, and later
+on upgrade to multiple cells / regions.</p>
+
+<p>If running in a single cell, the same topology service can be used for both
+global and local data.  A local cell record still needs to be created, just use
+the same server address and, very importantly, a <em>different</em> root node path.</p>
+
+<p>In that case, just running 3 servers for topology service quorum is probably
+sufficient. For instance, 3 etcd servers. And use their address for the local
+cell as well. Let&#39;s use a short cell name, like <code class="prettyprint">local</code>, as the local data in
+that topology server will later on be moved to a different topology service,
+which will have the real cell name.</p>
+
+<h3 id="extending-to-more-cells">Extending To More Cells</h3>
+
+<p>To then run in multiple cells, the current topology service needs to be split
+into a global instance and one local instance per cell. Whereas, the initial
+setup had 3 topology servers (used for global and local data), we recommend to
+run 5 global servers across all cells (for global topology data) and 3 local
+servers per cell (for per-cell topology data).</p>
+
+<p>To migrate to such a setup, start by adding the 3 local servers in the second
+cell and run <code class="prettyprint">vtctl AddCellinfo</code> as was done for the first cell. Tablets and
+vtgates can now be started in the second cell, and used normally.</p>
+
+<p>vtgate can then be configured with a list of cells to watch for tablets using
+the <code class="prettyprint">-cells_to_watch</code> command line parameter. It can then use all tablets in all
+cells to route traffic. Note this is necessary to access the master in another
+cell.</p>
+
+<p>After the extension to two cells, the original topo service contains both the
+global topology data, and the first cell topology data. The more symetrical
+configuration we&#39;re after would be to split that original service into two: a
+global one that only contains the global data (spread across both cells), and a
+local one to the original cells. To achieve that split:</p>
+
+<ul>
+<li>Start up a new local topology service in that original cell (3 more local
+servers in that cell).</li>
+<li>Pick a name for that cell, different from <code class="prettyprint">local</code>.</li>
+<li>Use <code class="prettyprint">vtctl AddCellInfo</code> to configure it.</li>
+<li>Make sure all vtgates can see that new local cell (again, using
+<code class="prettyprint">-cells_to_watch</code>).</li>
+<li>Restart all vttablets to be in that new cell, instead of the <code class="prettyprint">local</code> cell name
+used before.</li>
+<li>Use <code class="prettyprint">vtctl RemoveKeyspaceCell</code> to remove all mentions of the <code class="prettyprint">local</code> cell in
+all keyspaces.</li>
+<li>Use <code class="prettyprint">vtctl RemoveCellInfo</code> to remove the global configurations for that
+<code class="prettyprint">local</code> cell.</li>
+<li>Remove all remaining data in the global topology service that are in the old
+local server root.</li>
+</ul>
+
+<p>After this split, the configuration is completely symetrical:</p>
+
+<ul>
+<li>a global topology service, with servers in all cells. Only contains global
+topology data about Keyspaces, Shards and VSchema. Typically it has 5 servers
+across all cells.</li>
+<li>a local topology service to each cell, with servers only in that cell. Only
+contains local topology data about Tablets, and roll-ups of global data for
+efficient access. Typically, it has 3 servers in each cell.</li>
+</ul>
+
+<h2 id="migration-between-implementations">Migration Between Implementations</h2>
+
+<p>We provide the <code class="prettyprint">topo2topo</code> binary file to migrate between one implementation
+and another of the topology service.</p>
+
+<p>The process to follow in that case is:</p>
+
+<ul>
+<li>Start from a stable topology, where no resharding or reparenting is on-going.</li>
+<li>Configure the new topology service so it has at least all the cells of the
+source topology service. Make sure it is running.</li>
+<li>Run the <code class="prettyprint">topo2topo</code> program with the right flags. <code class="prettyprint">-from_implementation</code>,
+<code class="prettyprint">-from_root</code>, <code class="prettyprint">-from_server</code> describe the source (old) topology
+service. <code class="prettyprint">-to_implementation</code>, <code class="prettyprint">-to_root</code>, <code class="prettyprint">-to_server</code> describe the
+destination (new) topology service.</li>
+<li>Run <code class="prettyprint">vtctl RebuildKeyspaceGraph</code> for each keyspace using the new topology
+service flags.</li>
+<li>Run <code class="prettyprint">vtctl RebuildVSchemaGraph</code> using the new topology service flags.</li>
+<li>Restart all <code class="prettyprint">vtgate</code> using the new topology service flags. They will see the
+same keyspaces / shards / tablets / vschema as before, as the topology was
+copied over.</li>
+<li>Restart all <code class="prettyprint">vttablet</code> using the new topology service flags. They may use the
+same ports or not, but they will update the new topology when they start up,
+and be visible from vtgate.</li>
+<li>Restart all <code class="prettyprint">vtctld</code> processes using the new topology service flags. So that
+the UI also shows the new data.</li>
+</ul>
+
+<p>Sample commands to migrate from deprecated <code class="prettyprint">zookeeper</code> to <code class="prettyprint">zk2</code>
+topology would be:</p>
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="c"># Let&#39;s assume the zookeeper client config file is already</span>
+<span class="c"># exported in $ZK_CLIENT_CONFIG, and it contains a global record</span>
+<span class="c"># pointing to: global_server1,global_server2</span>
+<span class="c"># an a local cell cell1 pointing to cell1_server1,cell1_server2</span>
+<span class="c">#</span>
+<span class="c"># The existing directories created by Vitess are:</span>
+<span class="c"># /zk/global/vt/...</span>
+<span class="c"># /zk/cell1/vt/...</span>
+<span class="c">#</span>
+<span class="c"># The new zk2 implementation can use any root, so we will use:</span>
+<span class="c"># /vitess/global in the global topology service, and:</span>
+<span class="c"># /vitess/cell1 in the local topology service.</span>
+
+<span class="c"># Create the new topology service roots in global and local cell.</span>
+zk -server global_server1,global_server2 touch -p /vitess/global
+zk -server cell1_server1,cell1_server2 touch -p /vitess/cell1
+
+<span class="c"># Store the flags in a shell variable to simplify the example below.</span>
+<span class="nv">TOPOLOGY</span><span class="o">=</span><span class="s2">&quot;-topo_implementation zk2 -topo_global_server_address global_server1,global_server2 -topo_global_root /vitess/global&quot;</span>
+
+<span class="c"># Reference cell1 in the global topology service:</span>
+vtctl <span class="nv">$TOPOLOGY</span> AddCellInfo <span class="se">\</span>
+  -server_address cell1_server1,cell1_server2 <span class="se">\</span>
+  -root /vitess/cell1 <span class="se">\</span>
+  cell1
+
+<span class="c"># Now copy the topology. Note the old zookeeper implementation doesn&#39;t need</span>
+<span class="c"># any server or root parameter, as it reads ZK_CLIENT_CONFIG.</span>
+topo2topo <span class="se">\</span>
+  -from_implementation zookeeper <span class="se">\</span>
+  -to_implementation zk2 <span class="se">\</span>
+  -to_server global_server1,global_server2 <span class="se">\</span>
+  -to_root /vitess/global <span class="se">\</span>
+
+<span class="c"># Rebuild SvrKeyspace objects in new service, for each keyspace.</span>
+vtctl <span class="nv">$TOPOLOGY</span> RebuildKeyspaceGraph keyspace1
+vtctl <span class="nv">$TOPOLOGY</span> RebuildKeyspaceGraph keyspace2
+
+<span class="c"># Rebuild SrvVSchema objects in new service.</span>
+vtctl <span class="nv">$TOPOLOGY</span> RebuildVSchemaGraph
+
+<span class="c"># Now restart all vtgate, vttablet, vtctld processes replacing:</span>
+<span class="c"># -topo_implementation zookeeper</span>
+<span class="c"># With:</span>
+<span class="c"># -topo_implementation zk2</span>
+<span class="c"># -topo_global_server_address global_server1,global_server2</span>
+<span class="c"># -topo_global_root /vitess/global</span>
+<span class="c">#</span>
+<span class="c"># After this, the ZK_CLIENT_CONF file and environment variables are not needed</span>
+<span class="c"># any more.</span>
+</code></pre></div>
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/transport-security-model.html b/docs/user-guide/transport-security-model.html
index a4d61b7b3e5..c7ff60d08c8 100644
--- a/docs/user-guide/transport-security-model.html
+++ b/docs/user-guide/transport-security-model.html
@@ -1,461 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Transport Security Model</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Transport Security Model"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Transport Security Model</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="vitess-transport-security-model">Vitess Transport Security Model</h1>
-
-<p>Vitess exposes a few RPC services, and internally also uses RPCs.  These RPCs
-may use secure transport options. This document explains how to use these
-features.</p>
-
-<h2 id="overview">Overview</h2>
-
-<p>The following diagram represents all the RPCs we use in a Vitess cluster:</p>
-
-<div style="overflow-x: scroll">
-<img src="http://vitess.io/images/VitessTransportSecurityModel.svg" alt="Vitess Transport Security Model Diagram" width="400" height="300"/>
-</div>
-
-<p>There are two main categories:</p>
-
-<ul>
-<li>Internal RPCs: they are used to connect Vitess components.</li>
-<li>Externally visible RPCs: they are use by the app to talk to Vitess.</li>
-</ul>
-
-<p>A few features in the Vitess ecosystem depend on authentication, like Called ID
-and table ACLs. We&#39;ll explore the Caller ID feature first.</p>
-
-<p>The encryption and authentication scheme used depends on the transport
-used. With gRPC (the default for Vitess), TLS can be used to secure both
-internal and external RPCs. We&#39;ll detail what the options are.</p>
-
-<h2 id="caller-id">Caller ID</h2>
-
-<p>Caller ID is a feature provided by the Vitess stack to identify the source of
-queries. There are two different Caller IDs:</p>
-
-<ul>
-<li><strong>Immediate Caller ID</strong>: It represents the secure client identity when it
-enters the Vitess side:
-
-<ul>
-<li>It is a single string, represents the user connecting to Vitess (vtgate).</li>
-<li>It is authenticated by the transport layer used.</li>
-<li>It is used by the Vitess TableACL feature.</li>
-</ul></li>
-<li><strong>Effective Caller ID</strong>: It provides detailed information on who the
-individual caller process is:
-
-<ul>
-<li>It contains more information about the caller: principal, component,
-sub-component.</li>
-<li>It is provided by the application layer.</li>
-<li>It is not authenticated.</li>
-<li>It is exposed in query logs to be able to debug the source of a slow query,
-for instance.</li>
-</ul></li>
-</ul>
-
-<h2 id="grpc-transport">gRPC Transport</h2>
-
-<h3 id="grpc-encrypted-transport">gRPC Encrypted Transport</h3>
-
-<p>When using gRPC transport, Vitess can use the usual TLS security features
-(familiarity with SSL / TLS is necessary here):</p>
-
-<ul>
-<li>Any Vitess server can be configured to use TLS with the following
-command line parameters:
-
-<ul>
-<li>grpc_cert, grpc_key: server cert and key to use.</li>
-<li>grpc_ca (optional): client cert chains to trust. If specified, the client
-must use a certificate signed by one ca in the provided file.</li>
-</ul></li>
-<li>A Vitess go client can be configured with symetrical parameters to enable TLS:
-
-<ul>
-<li>..._grpc_ca: list of server cert signers to trust.</li>
-<li>..._grpc_server_name: name of the server cert to trust, instead of the
-hostname used to connect.</li>
-<li>..._grpc_cert, ..._grpc_key: client side cert and key to use (when the
-server requires client authentication)</li>
-</ul></li>
-<li>Other clients can take similar parameters, in various ways, see each client
-for more information.</li>
-</ul>
-
-<p>With these options, it is possible to use TLS-secured connections for all parts
-of the system. This enables the server side to authenticate the client, and / or
-the client to authenticate the server.</p>
-
-<p>Note this is not enabled by default, as usually the different Vitess servers
-will run on a private network (in a Cloud environment, usually all local traffic
-is already secured over a VPN, for instance).</p>
-
-<h3 id="certificates-and-caller-id">Certificates and Caller ID</h3>
-
-<p>Additionally, if a client uses a certificate to connect to Vitess (vtgate), the
-common name of that certificate is passed to vttablet as the Immediate Caller
-ID. It can then be used by table ACLs, to grant read, write or admin access to
-individual tables. This should be used if different clients should have
-different access to Vitess tables.</p>
-
-<h3 id="caller-id-override">Caller ID Override</h3>
-
-<p>In a private network, where SSL security is not required, it might still be
-desirable to use table ACLs as a safety mechanism to prevent a user from
-accessing sensitive data. The gRPC connector provides the
-grpc_use_effective_callerid flag for this purpose: if specified when running
-vtgate, the Effective Caller ID&#39;s principal is copied into the Immediate Caller
-ID, and then used throughout the Vitess stack.</p>
-
-<p><strong>Important</strong>: this is not secure. Any user code can provide any value for
-the Effective Caller ID&#39;s principal, and therefore access any data. This is
-intended as a safety feature to make sure some applications do not misbehave.
-Therefore, this flag is not enabled by default.</p>
-
-<h3 id="example">Example</h3>
-
-<p>For a concrete example, see
-<a href="https://github.com/youtube/vitess/blob/master/test/encrypted_transport.py">test/encrypted_transport.py</a>
-in the source tree. It first sets up all the certificates, and some table ACLs,
-then uses the python client to connect with SSL. It also exercises the
-grpc_use_effective_callerid flag, by connecting without SSL.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/transport-security-model/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/transport-security-model/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/transport-security-model/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/transport-security-model/"</script>
 </html>
diff --git a/docs/user-guide/transport-security-model/index.html b/docs/user-guide/transport-security-model/index.html
new file mode 100644
index 00000000000..976fbdefb86
--- /dev/null
+++ b/docs/user-guide/transport-security-model/index.html
@@ -0,0 +1,470 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Transport Security Model | Vitess</title>
+<meta property="og:title" content="Transport Security Model" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/transport-security-model/" />
+<meta property="og:url" content="http://vitess.io/user-guide/transport-security-model/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/transport-security-model/","headline":"Transport Security Model","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Transport Security Model</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="vitess-transport-security-model">Vitess Transport Security Model</h1>
+
+<p>Vitess exposes a few RPC services, and internally also uses RPCs.  These RPCs
+may use secure transport options. This document explains how to use these
+features.</p>
+
+<h2 id="overview">Overview</h2>
+
+<p>The following diagram represents all the RPCs we use in a Vitess cluster:</p>
+
+<div style="overflow-x: scroll">
+<img src="/images/VitessTransportSecurityModel.svg" alt="Vitess Transport Security Model Diagram" width="400" height="300"/>
+</div>
+
+<p>There are two main categories:</p>
+
+<ul>
+<li>Internal RPCs: they are used to connect Vitess components.</li>
+<li>Externally visible RPCs: they are use by the app to talk to Vitess.</li>
+</ul>
+
+<p>A few features in the Vitess ecosystem depend on authentication, like Called ID
+and table ACLs. We&#39;ll explore the Caller ID feature first.</p>
+
+<p>The encryption and authentication scheme used depends on the transport
+used. With gRPC (the default for Vitess), TLS can be used to secure both
+internal and external RPCs. We&#39;ll detail what the options are.</p>
+
+<h2 id="caller-id">Caller ID</h2>
+
+<p>Caller ID is a feature provided by the Vitess stack to identify the source of
+queries. There are two different Caller IDs:</p>
+
+<ul>
+<li><strong>Immediate Caller ID</strong>: It represents the secure client identity when it
+enters the Vitess side:
+
+<ul>
+<li>It is a single string, represents the user connecting to Vitess (vtgate).</li>
+<li>It is authenticated by the transport layer used.</li>
+<li>It is used by the Vitess TableACL feature.</li>
+</ul></li>
+<li><strong>Effective Caller ID</strong>: It provides detailed information on who the
+individual caller process is:
+
+<ul>
+<li>It contains more information about the caller: principal, component,
+sub-component.</li>
+<li>It is provided by the application layer.</li>
+<li>It is not authenticated.</li>
+<li>It is exposed in query logs to be able to debug the source of a slow query,
+for instance.</li>
+</ul></li>
+</ul>
+
+<h2 id="grpc-transport">gRPC Transport</h2>
+
+<h3 id="grpc-encrypted-transport">gRPC Encrypted Transport</h3>
+
+<p>When using gRPC transport, Vitess can use the usual TLS security features
+(familiarity with SSL / TLS is necessary here):</p>
+
+<ul>
+<li>Any Vitess server can be configured to use TLS with the following
+command line parameters:
+
+<ul>
+<li>grpc_cert, grpc_key: server cert and key to use.</li>
+<li>grpc_ca (optional): client cert chains to trust. If specified, the client
+must use a certificate signed by one ca in the provided file.</li>
+</ul></li>
+<li>A Vitess go client can be configured with symetrical parameters to enable TLS:
+
+<ul>
+<li>..._grpc_ca: list of server cert signers to trust.</li>
+<li>..._grpc_server_name: name of the server cert to trust, instead of the
+hostname used to connect.</li>
+<li>..._grpc_cert, ..._grpc_key: client side cert and key to use (when the
+server requires client authentication)</li>
+</ul></li>
+<li>Other clients can take similar parameters, in various ways, see each client
+for more information.</li>
+</ul>
+
+<p>With these options, it is possible to use TLS-secured connections for all parts
+of the system. This enables the server side to authenticate the client, and / or
+the client to authenticate the server.</p>
+
+<p>Note this is not enabled by default, as usually the different Vitess servers
+will run on a private network (in a Cloud environment, usually all local traffic
+is already secured over a VPN, for instance).</p>
+
+<h3 id="certificates-and-caller-id">Certificates and Caller ID</h3>
+
+<p>Additionally, if a client uses a certificate to connect to Vitess (vtgate), the
+common name of that certificate is passed to vttablet as the Immediate Caller
+ID. It can then be used by table ACLs, to grant read, write or admin access to
+individual tables. This should be used if different clients should have
+different access to Vitess tables.</p>
+
+<h3 id="caller-id-override">Caller ID Override</h3>
+
+<p>In a private network, where SSL security is not required, it might still be
+desirable to use table ACLs as a safety mechanism to prevent a user from
+accessing sensitive data. The gRPC connector provides the
+grpc_use_effective_callerid flag for this purpose: if specified when running
+vtgate, the Effective Caller ID&#39;s principal is copied into the Immediate Caller
+ID, and then used throughout the Vitess stack.</p>
+
+<p><strong>Important</strong>: this is not secure. Any user code can provide any value for
+the Effective Caller ID&#39;s principal, and therefore access any data. This is
+intended as a safety feature to make sure some applications do not misbehave.
+Therefore, this flag is not enabled by default.</p>
+
+<h3 id="example">Example</h3>
+
+<p>For a concrete example, see
+<a href="https://github.com/youtube/vitess/blob/master/test/encrypted_transport.py">test/encrypted_transport.py</a>
+in the source tree. It first sets up all the certificates, and some table ACLs,
+then uses the python client to connect with SSL. It also exercises the
+grpc_use_effective_callerid flag, by connecting without SSL.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/troubleshooting.html b/docs/user-guide/troubleshooting.html
index b95a0cb44b0..bfdc9a0e61e 100644
--- a/docs/user-guide/troubleshooting.html
+++ b/docs/user-guide/troubleshooting.html
@@ -1,389 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Troubleshooting</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Troubleshooting"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Troubleshooting</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <p>If there is a problem in the system, one or many alerts would typically fire. If a problem was found through means other than an alert, then the alert system needs to be iterated upon.</p>
-
-<p>When an alert fires, you have the following sources of information to perform your investigation:</p>
-
-<ul>
-<li>Alert values</li>
-<li>Graphs</li>
-<li>Diagnostic URLs</li>
-<li>Log files</li>
-</ul>
-
-<p>Below are a few possible scenarios.</p>
-
-<h3 id="elevated-query-latency-on-master">Elevated query latency on master</h3>
-
-<p>Diagnosis 1: Inspect the graphs to see if QPS has gone up. If yes, drill down on the more detailed QPS graphs to see which table, or user caused the increase. If a table is identified, look at /debug/queryz for queries on that table.</p>
-
-<p>Action: Inform engineer about about toxic query. If it’s a specific user, you can stop their job or throttle them to keep the load manageable. As a last resort, blacklist query to allow the rest of the system to stay healthy.</p>
-
-<p>Diagnosis 2: QPS did not go up, only latency did. Inspect the per-table latency graphs. If it’s a specific table, then it’s most likely a long-running low QPS query that’s skewing the numbers. Identify the culprit query and take necessary steps to get it optimized. Such queries usually do not cause outage. So, there may not be a need to take extreme measures.</p>
-
-<p>Diagnosis 3: Latency seems to be up across the board. Inspect transaction latency. If this has gone up, then something is causing MySQL to run too many concurrent transactions which causes slow-down. See if there are any tx pool full errors. If there is an increase, the INFO logs will dump info about all transactions. From there, you should be able to if a specific sequence of statements is causing the problem. Once that is identified, find out the root cause. It could be network issues, or it could be a recent change in app behavior.</p>
-
-<p>Diagnosis 4: No particular transaction seems to be the culprit. Nothing seems to have changed in any of the requests. Look at system variables to see if there are hardware faults. Is the disk latency too high? Are there memory parity errors? If so, you may have to failover to a new machine.</p>
-
-<h3 id="master-starts-up-read-only">Master starts up read-only</h3>
-
-<p>To prevent accidentally accepting writes, our default <code class="prettyprint">my.cnf</code> settings
-tell MySQL to always start up read-only. If the master MySQL gets restarted,
-it will thus come back read-only until you intervene to confirm that it should
-accept writes. You can use the <a href="/reference/vtctl.html#setreadwrite">SetReadWrite</a>
-command to do that.</p>
-
-<p>However, usually if something unexpected happens to the master, it&#39;s better to
-reparent to a different replica with <a href="/reference/vtctl.html#emergencyreparentshard">EmergencyReparentShard</a>. If you need to do planned maintenance on the master,
-it&#39;s best to first reparent to another replica with <a href="/reference/vtctl.html#plannedreparentshard">PlannedReparentShard</a>.</p>
-
-<h3 id="vitess-sees-the-wrong-tablet-as-master">Vitess sees the wrong tablet as master</h3>
-
-<p>If you do a failover manually (not through Vitess), you&#39;ll need to tell
-Vitess which tablet corresponds to the new master MySQL. Until then,
-writes will fail since they&#39;ll be routed to a read-only replica
-(the old master). Use the <a href="/reference/vtctl.html#tabletexternallyreparented">TabletExternallyReparented</a>
-command to tell Vitess the new master tablet for a shard.</p>
-
-<p>Tools like <a href="https://github.com/github/orchestrator">Orchestrator</a>
-can be configured to call this automatically when a failover occurs.
-See our sample <a href="https://github.com/youtube/vitess/blob/1129d69282bb738c94b8af661b984b6377a759f7/docker/orchestrator/orchestrator.conf.json#L131">orchestrator.conf.json</a>
-for an example of this.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/troubleshooting/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/troubleshooting/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/troubleshooting/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/troubleshooting/"</script>
 </html>
diff --git a/docs/user-guide/troubleshooting/index.html b/docs/user-guide/troubleshooting/index.html
new file mode 100644
index 00000000000..31a46ca0b83
--- /dev/null
+++ b/docs/user-guide/troubleshooting/index.html
@@ -0,0 +1,398 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Troubleshooting | Vitess</title>
+<meta property="og:title" content="Troubleshooting" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/troubleshooting/" />
+<meta property="og:url" content="http://vitess.io/user-guide/troubleshooting/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/troubleshooting/","headline":"Troubleshooting","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Troubleshooting</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <p>If there is a problem in the system, one or many alerts would typically fire. If a problem was found through means other than an alert, then the alert system needs to be iterated upon.</p>
+
+<p>When an alert fires, you have the following sources of information to perform your investigation:</p>
+
+<ul>
+<li>Alert values</li>
+<li>Graphs</li>
+<li>Diagnostic URLs</li>
+<li>Log files</li>
+</ul>
+
+<p>Below are a few possible scenarios.</p>
+
+<h3 id="elevated-query-latency-on-master">Elevated query latency on master</h3>
+
+<p>Diagnosis 1: Inspect the graphs to see if QPS has gone up. If yes, drill down on the more detailed QPS graphs to see which table, or user caused the increase. If a table is identified, look at /debug/queryz for queries on that table.</p>
+
+<p>Action: Inform engineer about about toxic query. If it’s a specific user, you can stop their job or throttle them to keep the load manageable. As a last resort, blacklist query to allow the rest of the system to stay healthy.</p>
+
+<p>Diagnosis 2: QPS did not go up, only latency did. Inspect the per-table latency graphs. If it’s a specific table, then it’s most likely a long-running low QPS query that’s skewing the numbers. Identify the culprit query and take necessary steps to get it optimized. Such queries usually do not cause outage. So, there may not be a need to take extreme measures.</p>
+
+<p>Diagnosis 3: Latency seems to be up across the board. Inspect transaction latency. If this has gone up, then something is causing MySQL to run too many concurrent transactions which causes slow-down. See if there are any tx pool full errors. If there is an increase, the INFO logs will dump info about all transactions. From there, you should be able to if a specific sequence of statements is causing the problem. Once that is identified, find out the root cause. It could be network issues, or it could be a recent change in app behavior.</p>
+
+<p>Diagnosis 4: No particular transaction seems to be the culprit. Nothing seems to have changed in any of the requests. Look at system variables to see if there are hardware faults. Is the disk latency too high? Are there memory parity errors? If so, you may have to failover to a new machine.</p>
+
+<h3 id="master-starts-up-read-only">Master starts up read-only</h3>
+
+<p>To prevent accidentally accepting writes, our default <code class="prettyprint">my.cnf</code> settings
+tell MySQL to always start up read-only. If the master MySQL gets restarted,
+it will thus come back read-only until you intervene to confirm that it should
+accept writes. You can use the <a href="/reference/vtctl/#setreadwrite">SetReadWrite</a>
+command to do that.</p>
+
+<p>However, usually if something unexpected happens to the master, it&#39;s better to
+reparent to a different replica with <a href="/reference/vtctl/#emergencyreparentshard">EmergencyReparentShard</a>. If you need to do planned maintenance on the master,
+it&#39;s best to first reparent to another replica with <a href="/reference/vtctl/#plannedreparentshard">PlannedReparentShard</a>.</p>
+
+<h3 id="vitess-sees-the-wrong-tablet-as-master">Vitess sees the wrong tablet as master</h3>
+
+<p>If you do a failover manually (not through Vitess), you&#39;ll need to tell
+Vitess which tablet corresponds to the new master MySQL. Until then,
+writes will fail since they&#39;ll be routed to a read-only replica
+(the old master). Use the <a href="/reference/vtctl/#tabletexternallyreparented">TabletExternallyReparented</a>
+command to tell Vitess the new master tablet for a shard.</p>
+
+<p>Tools like <a href="https://github.com/github/orchestrator">Orchestrator</a>
+can be configured to call this automatically when a failover occurs.
+See our sample <a href="https://github.com/youtube/vitess/blob/1129d69282bb738c94b8af661b984b6377a759f7/docker/orchestrator/orchestrator.conf.json#L131">orchestrator.conf.json</a>
+for an example of this.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/twopc.html b/docs/user-guide/twopc.html
index 76985d10b64..ffef6642709 100644
--- a/docs/user-guide/twopc.html
+++ b/docs/user-guide/twopc.html
@@ -1,437 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / 2PC Guide</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / 2PC Guide"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>2PC Guide</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="2pc-user-guide">2PC User guide</h1>
-
-<h1 id="overview">Overview</h1>
-
-<p>Vitess 2PC allows you to perform atomic distributed commits. The feature is implemented using traditional MySQL transactions, and hence inherits the same guarantees. With this addition, Vitess can be configured to support the following three levels of atomicty:</p>
-
-<ol>
-<li><strong>Single database</strong>: At this level, only single database transactions are allowed. Any transaction that tries to go beyond a single database will be failed.</li>
-<li><strong>Multi database</strong>: A transaction can span multiple databases, but the commit will be best effort. Partial commits are possible.</li>
-<li><strong>2PC</strong>: This is the same as Multi-database, but the commit will be atomic.</li>
-</ol>
-
-<p>2PC commits are more expensive than multi-database because the system has to save away the statements before starting the commit process, and also clean them up after a successful commit. This is the reason why it&#39;s a separate option instead of being always on.</p>
-
-<h2 id="isolation">Isolation</h2>
-
-<p>2PC transactions only guarantee atomicity: Either the whole transaction commits, or it&#39;s rolled back entirely. It does not guarantee ACID Isolation. This means that a third party that performs cross-database reads can observe partial commits while a 2PC transaction is in progress.</p>
-
-<p>Guaranteeing ACID isolation is very contentious and has high costs. Providing it by default would have made vitess impractical for the most common use cases.</p>
-
-<p>However, it is possible for the application to judiciously request ACID isolation where critical: If <code class="prettyprint">SELECT</code>s are performed with <code class="prettyprint">LOCK IN SHARE MODE</code>, then you&#39;re guaranteed that the data will not be modified by anyone else until the transaction is complete.</p>
-
-<h1 id="configuring-vtgate">Configuring VTGate</h1>
-
-<p>The atomicity policy is controlled by the <code class="prettyprint">transaction_mode</code> flag. The default value is <code class="prettyprint">multi</code>, and will set it in multi-database mode. This is the same as the previous legacy behavior.</p>
-
-<p>To enforce single-database transactions, the VTGates can be started by specifying <code class="prettyprint">transaction_mode=single</code>.</p>
-
-<p>To enable 2PC, the VTGates need to be started with <code class="prettyprint">transaction_mode=twopc</code>. The VTTablets will require a few more flags, which will be explained below.</p>
-
-<p>The VTGate <code class="prettyprint">transaction_mode</code> flag decides what to allow. The application can independently request a specific atomicity for each transaction. The request will be honored by VTGate only if it does not exceed what is allowed by the <code class="prettyprint">transaction_mode</code>. For example, <code class="prettyprint">transacion_mode=single</code> will only allow single-db transactions. On the other hand, <code class="prettyprint">transaction_mode=twopc</code> will allow all three levels of atomicity.</p>
-
-<h1 id="driver-apis">Driver APIs</h1>
-
-<p>The way to request atomicity from the application is driver-specific.</p>
-
-<h2 id="go-driver">Go driver</h2>
-
-<p>For the Go driver, you request the atomicity by adding it to the context using the <code class="prettyprint">WithAtomicity</code> function. For more details, please refer to the respective GoDocs.</p>
-
-<h2 id="python-driver">Python driver</h2>
-
-<p>For Python, the <code class="prettyprint">begin</code> function of the cursor has an optional <code class="prettyprint">single_db</code> flag. If the flag is <code class="prettyprint">True</code>, then the request is for a single-db transaction. If <code class="prettyprint">False</code> (or unspecified), then the following <code class="prettyprint">commit</code> call&#39;s <code class="prettyprint">twopc</code> flag decides if the commit is 2PC or Best Effort (<code class="prettyprint">multi</code>).</p>
-
-<h2 id="java-amp-php-todo">Java &amp; PHP (TODO)</h2>
-
-<h2 id="adding-support-in-a-new-driver">Adding support in a new driver</h2>
-
-<p>The VTGate RPC API extends the <code class="prettyprint">Begin</code> and <code class="prettyprint">Commit</code> functions to specify atomicity. The API mimics the Python driver: The <code class="prettyprint">BeginRequest</code> message provides a <code class="prettyprint">single_db</code> flag and the <code class="prettyprint">CommitRequest</code> message provides an <code class="prettyprint">atomic</code> flag which is synonymous to <code class="prettyprint">twopc</code>.</p>
-
-<h1 id="configuring-vttablet">Configuring VTTablet</h1>
-
-<p>The following flags need to be set to enable 2PC support in VTTablet:</p>
-
-<ul>
-<li><strong>twopc_enable</strong>: This flag needs to be turned on.</li>
-<li><strong>twopc_coordinator_address</strong>: This should specify the address (or VIP) of the VTGate that VTTablet will use to resolve abandoned transactions.</li>
-<li><strong>twopc_abandon_age</strong>: This is the time in seconds that specifies how long to wait before asking a VTGate to resolve an abandoned transaction.</li>
-</ul>
-
-<p>With the above flags specified, every master VTTablet also turns into a watchdog. If any 2PC transaction is left lingering for longer than <code class="prettyprint">twopc_abandon_age</code> seconds, then VTTablet invokes VTGate and requests it to resolve it. Typically, the <code class="prettyprint">abandon_age</code> needs to be substantially longer than the time it takes for a typical 2PC commit to complete (10s of seconds).</p>
-
-<h1 id="configuring-mysql">Configuring MySQL</h1>
-
-<p>The usual default values of MySQL are sufficient. However, it&#39;s important to verify that <code class="prettyprint">wait_timeout</code> (28800) has not been changed. If this value was changed to be too short, then MySQL could prematurely kill a prepared transaction causing data loss.</p>
-
-<h1 id="monitoring">Monitoring</h1>
-
-<p>A few additional variables have been added to <code class="prettyprint">/debug/vars</code>. Failures described below should be rare. But these variables are present so you can build an alert mechanism if anything were to go wrong.</p>
-
-<h2 id="critical-failures">Critical failures</h2>
-
-<p>The following errors are not expected to happen. If they do, it means that 2PC transactions have failed to commit atomically:</p>
-
-<ul>
-<li><strong>InternalErrors.TwopcCommit</strong>: This is a counter that shows the number of times a prepared transaction failed to fulfil a commit request.</li>
-<li><strong>InternalErrors.TwopcResurrection</strong>: This counter is incremented if a new master failed to resurrect a previously prepared (and unresolved) transaction.</li>
-</ul>
-
-<h2 id="alertable-failures">Alertable failures</h2>
-
-<p>The following failures are not urgent, but require someone to investigate:</p>
-
-<ul>
-<li><strong>InternalErrors.WatchdogFail</strong>: This counter is incremented if there are failures in the watchdog thread of VTTablet. This means that the watch dog is not able to alert VTGate of abandoned transactions.</li>
-<li><strong>Unresolved.Prepares</strong>: This is a gauge that is set based on the number of lingering Prepared transactions that have been alive for longer than 5x the abandon age. This usually means that a distributed transaction has repeatedly failed to resolve. A more serious condition is when the metadata for a distributed transaction has been lost and this Prepare is now permanently orphaned.</li>
-</ul>
-
-<h1 id="repairs">Repairs</h1>
-
-<p>If any of the alerts fire, it&#39;s time to investigate. Once you identify the <code class="prettyprint">dtid</code> or the VTTablet that originated the alert, you can navigate to the <code class="prettyprint">/twopcz</code> URL. This will display three lists:</p>
-
-<ol>
-<li><strong>Failed Transactions</strong>: A transaction reaches this state if it failed to commit. The only action allowed for such transactions is that you can discard it. However, you can record the DMLs that were involved and have someone come up with a plan to repair the partial commit.</li>
-<li><strong>Prepared Transactions</strong>: Prepared transactions can be rolled back or committed. Prepared transactions must be remedied only if their root Distributed Transaction has been lost or resolved.</li>
-<li><strong>Distributed Transactions</strong>: Distributed transactions can only be Concluded (marked as resolved).</li>
-</ol>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/twopc/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/twopc/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/twopc/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/twopc/"</script>
 </html>
diff --git a/docs/user-guide/twopc/index.html b/docs/user-guide/twopc/index.html
new file mode 100644
index 00000000000..91cb691c905
--- /dev/null
+++ b/docs/user-guide/twopc/index.html
@@ -0,0 +1,446 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>2PC Guide | Vitess</title>
+<meta property="og:title" content="2PC Guide" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/twopc/" />
+<meta property="og:url" content="http://vitess.io/user-guide/twopc/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/twopc/","headline":"2PC Guide","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>2PC Guide</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="2pc-user-guide">2PC User guide</h1>
+
+<h1 id="overview">Overview</h1>
+
+<p>Vitess 2PC allows you to perform atomic distributed commits. The feature is implemented using traditional MySQL transactions, and hence inherits the same guarantees. With this addition, Vitess can be configured to support the following three levels of atomicty:</p>
+
+<ol>
+<li><strong>Single database</strong>: At this level, only single database transactions are allowed. Any transaction that tries to go beyond a single database will be failed.</li>
+<li><strong>Multi database</strong>: A transaction can span multiple databases, but the commit will be best effort. Partial commits are possible.</li>
+<li><strong>2PC</strong>: This is the same as Multi-database, but the commit will be atomic.</li>
+</ol>
+
+<p>2PC commits are more expensive than multi-database because the system has to save away the statements before starting the commit process, and also clean them up after a successful commit. This is the reason why it&#39;s a separate option instead of being always on.</p>
+
+<h2 id="isolation">Isolation</h2>
+
+<p>2PC transactions only guarantee atomicity: Either the whole transaction commits, or it&#39;s rolled back entirely. It does not guarantee ACID Isolation. This means that a third party that performs cross-database reads can observe partial commits while a 2PC transaction is in progress.</p>
+
+<p>Guaranteeing ACID isolation is very contentious and has high costs. Providing it by default would have made vitess impractical for the most common use cases.</p>
+
+<p>However, it is possible for the application to judiciously request ACID isolation where critical: If <code class="prettyprint">SELECT</code>s are performed with <code class="prettyprint">LOCK IN SHARE MODE</code>, then you&#39;re guaranteed that the data will not be modified by anyone else until the transaction is complete.</p>
+
+<h1 id="configuring-vtgate">Configuring VTGate</h1>
+
+<p>The atomicity policy is controlled by the <code class="prettyprint">transaction_mode</code> flag. The default value is <code class="prettyprint">multi</code>, and will set it in multi-database mode. This is the same as the previous legacy behavior.</p>
+
+<p>To enforce single-database transactions, the VTGates can be started by specifying <code class="prettyprint">transaction_mode=single</code>.</p>
+
+<p>To enable 2PC, the VTGates need to be started with <code class="prettyprint">transaction_mode=twopc</code>. The VTTablets will require a few more flags, which will be explained below.</p>
+
+<p>The VTGate <code class="prettyprint">transaction_mode</code> flag decides what to allow. The application can independently request a specific atomicity for each transaction. The request will be honored by VTGate only if it does not exceed what is allowed by the <code class="prettyprint">transaction_mode</code>. For example, <code class="prettyprint">transacion_mode=single</code> will only allow single-db transactions. On the other hand, <code class="prettyprint">transaction_mode=twopc</code> will allow all three levels of atomicity.</p>
+
+<h1 id="driver-apis">Driver APIs</h1>
+
+<p>The way to request atomicity from the application is driver-specific.</p>
+
+<h2 id="go-driver">Go driver</h2>
+
+<p>For the Go driver, you request the atomicity by adding it to the context using the <code class="prettyprint">WithAtomicity</code> function. For more details, please refer to the respective GoDocs.</p>
+
+<h2 id="python-driver">Python driver</h2>
+
+<p>For Python, the <code class="prettyprint">begin</code> function of the cursor has an optional <code class="prettyprint">single_db</code> flag. If the flag is <code class="prettyprint">True</code>, then the request is for a single-db transaction. If <code class="prettyprint">False</code> (or unspecified), then the following <code class="prettyprint">commit</code> call&#39;s <code class="prettyprint">twopc</code> flag decides if the commit is 2PC or Best Effort (<code class="prettyprint">multi</code>).</p>
+
+<h2 id="java-amp-php-todo">Java &amp; PHP (TODO)</h2>
+
+<h2 id="adding-support-in-a-new-driver">Adding support in a new driver</h2>
+
+<p>The VTGate RPC API extends the <code class="prettyprint">Begin</code> and <code class="prettyprint">Commit</code> functions to specify atomicity. The API mimics the Python driver: The <code class="prettyprint">BeginRequest</code> message provides a <code class="prettyprint">single_db</code> flag and the <code class="prettyprint">CommitRequest</code> message provides an <code class="prettyprint">atomic</code> flag which is synonymous to <code class="prettyprint">twopc</code>.</p>
+
+<h1 id="configuring-vttablet">Configuring VTTablet</h1>
+
+<p>The following flags need to be set to enable 2PC support in VTTablet:</p>
+
+<ul>
+<li><strong>twopc_enable</strong>: This flag needs to be turned on.</li>
+<li><strong>twopc_coordinator_address</strong>: This should specify the address (or VIP) of the VTGate that VTTablet will use to resolve abandoned transactions.</li>
+<li><strong>twopc_abandon_age</strong>: This is the time in seconds that specifies how long to wait before asking a VTGate to resolve an abandoned transaction.</li>
+</ul>
+
+<p>With the above flags specified, every master VTTablet also turns into a watchdog. If any 2PC transaction is left lingering for longer than <code class="prettyprint">twopc_abandon_age</code> seconds, then VTTablet invokes VTGate and requests it to resolve it. Typically, the <code class="prettyprint">abandon_age</code> needs to be substantially longer than the time it takes for a typical 2PC commit to complete (10s of seconds).</p>
+
+<h1 id="configuring-mysql">Configuring MySQL</h1>
+
+<p>The usual default values of MySQL are sufficient. However, it&#39;s important to verify that <code class="prettyprint">wait_timeout</code> (28800) has not been changed. If this value was changed to be too short, then MySQL could prematurely kill a prepared transaction causing data loss.</p>
+
+<h1 id="monitoring">Monitoring</h1>
+
+<p>A few additional variables have been added to <code class="prettyprint">/debug/vars</code>. Failures described below should be rare. But these variables are present so you can build an alert mechanism if anything were to go wrong.</p>
+
+<h2 id="critical-failures">Critical failures</h2>
+
+<p>The following errors are not expected to happen. If they do, it means that 2PC transactions have failed to commit atomically:</p>
+
+<ul>
+<li><strong>InternalErrors.TwopcCommit</strong>: This is a counter that shows the number of times a prepared transaction failed to fulfil a commit request.</li>
+<li><strong>InternalErrors.TwopcResurrection</strong>: This counter is incremented if a new master failed to resurrect a previously prepared (and unresolved) transaction.</li>
+</ul>
+
+<h2 id="alertable-failures">Alertable failures</h2>
+
+<p>The following failures are not urgent, but require someone to investigate:</p>
+
+<ul>
+<li><strong>InternalErrors.WatchdogFail</strong>: This counter is incremented if there are failures in the watchdog thread of VTTablet. This means that the watch dog is not able to alert VTGate of abandoned transactions.</li>
+<li><strong>Unresolved.Prepares</strong>: This is a gauge that is set based on the number of lingering Prepared transactions that have been alive for longer than 5x the abandon age. This usually means that a distributed transaction has repeatedly failed to resolve. A more serious condition is when the metadata for a distributed transaction has been lost and this Prepare is now permanently orphaned.</li>
+</ul>
+
+<h1 id="repairs">Repairs</h1>
+
+<p>If any of the alerts fire, it&#39;s time to investigate. Once you identify the <code class="prettyprint">dtid</code> or the VTTablet that originated the alert, you can navigate to the <code class="prettyprint">/twopcz</code> URL. This will display three lists:</p>
+
+<ol>
+<li><strong>Failed Transactions</strong>: A transaction reaches this state if it failed to commit. The only action allowed for such transactions is that you can discard it. However, you can record the DMLs that were involved and have someone come up with a plan to repair the partial commit.</li>
+<li><strong>Prepared Transactions</strong>: Prepared transactions can be rolled back or committed. Prepared transactions must be remedied only if their root Distributed Transaction has been lost or resolved.</li>
+<li><strong>Distributed Transactions</strong>: Distributed transactions can only be Concluded (marked as resolved).</li>
+</ol>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/update-stream.html b/docs/user-guide/update-stream.html
index db08c75eba9..937a6d7dcfc 100644
--- a/docs/user-guide/update-stream.html
+++ b/docs/user-guide/update-stream.html
@@ -1,834 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Update Stream</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Update Stream"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Update Stream</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="update-stream">Update Stream</h1>
-
-<p>Update Stream is a Vitess service that provides a change stream for any keyspace.
-The use cases for this service include:</p>
-
-<ul>
-<li><p>Providing an <em>invalidation stream</em>, that an application can use to maintain a cache.</p></li>
-<li><p>Maintain an external copy of the data in another system, that is only updated
-when the data changes.</p></li>
-<li><p>Maintain a change record of all the transactions that have been applied to the data.</p></li>
-</ul>
-
-<p>A good understanding
-of <a href="/user-guide/vitess-replication.html">Vitess Replication</a> is required to
-understand this document better. We will go through the use cases in a bit more
-details, then introduce the EventToken notion, and finally explain the service.</p>
-
-<h2 id="use-cases">Use Cases</h2>
-
-<h3 id="maintaining-cache-consistency">Maintaining Cache Consistency</h3>
-
-<p>The first use case we’re trying to address is to maintain a consistent cache of
-the data. The problem here has two parts:</p>
-
-<ul>
-<li><p>When data changes, we need to invalidate the cache.</p></li>
-<li><p>When we want to re-populate the cache after an invalidation, we need to make
-sure we get data that is more recent than the data change. For instance, we
-can’t just re-query any replica, as it might be behind on replication.</p></li>
-</ul>
-
-<p>This process can be somewhat resilient to some stream anomalies. For instance,
-invalidating the same record twice in some corner cases is fine, as long as we
-don’t poison the cache with an old value.</p>
-
-<p>Note the location / ownership of the cache is not set in stone:</p>
-
-<ul>
-<li><p>Application-layer cache: the app servers maintain the cache. It’s very early
-in the serving chain, so in case of a cache hit, it’s lower latency. However,
-an invalidation process needs to run and is probably also owned by the
-application layer, which is somewhat annoying.</p></li>
-<li><p>vtgate-layer cache: it would be a row cache accessed by vtgate, transparent to
-the app. It requires vtgate to do a lot of extra heavy-lifting, depending on
-what we want to support. Cache invalidation is still required, at a row level.</p></li>
-<li><p>vttablet-layer cache: this is the old rowcache. Since the cache is not shared
-across instances, and the app still needs a cache, we abandoned this one.</p></li>
-</ul>
-
-<p>Since the vtgate-layer cache is much harder to work on (because of the query
-implications), and will probably require similar components as the app-layer
-cache, we decided to work on the app-layer cache for now, with possibly an
-invalidation process that is somewhat tied to the app.</p>
-
-<p>The <em>composite object cache</em> is an interesting use case: if the application is
-in charge of the cache, it would seem possible to put in the cache higher level
-composite objects, that are built from multiple table records. They would be
-invalidated any time one of the composing table record is changed. They need to
-be addressed by a part of the primary key, so they’re easy to find.</p>
-
-<h3 id="change-log">Change Log</h3>
-
-<p>A Change Log provides a stream of all data changes, so an external application
-can either record these changes, or keep an external database up to date with
-the latest data.</p>
-
-<p>Unlike the Cache Invalidation use case, this is not as forgiving. If we have
-duplicate updates, they will need to be handled.</p>
-
-<h2 id="design-considerations">Design Considerations</h2>
-
-<h3 id="single-shard-update-stream">Single Shard Update Stream</h3>
-
-<p>This has been supported in Vitess for a while, but not exposed. It works as follows:</p>
-
-<ul>
-<li><p>vttablet adds an SQL comment to every DML, that contains the Primary Key of
-the modified row.</p></li>
-<li><p>vttablet provides a streaming service that can connect to the local MySQL
-replication stream, extract the comment, and stream events to the client.</p></li>
-<li><p>Use the GTID as the start / restart position. It is sent back with each
-update, and an Update Stream can be started from it.</p></li>
-</ul>
-
-<p>Note Vitess supports both the MariaDB GTIDs (domain:server:sequence) and the
-MySQL 5.6 GTID Sets (encoded in SID blocks).</p>
-
-<h3 id="surviving-resharding-problem">Surviving Resharding: Problem</h3>
-
-<p>The Vitess tools are supposed to provide transparent sharding for the user’s
-data. Most of the trouble we run into is surviving resharding events, when we
-hop over from one set of shards to another set of shards.</p>
-
-<p>Two strategies then come to mind:</p>
-
-<ul>
-<li><p>Provide a per-shard update stream. Let the user handle the hop when resharding
-happens. If we were to do this for the Cache use case, we would also need to
-provide some way of preventing bad corner cases, like a full cache flush, or
-no cache update for a while, or lost cache invalidations. Simple for us, but
-the app can be a lot more complicated. And the Change Log use case is also
-hard to do.</p></li>
-<li><p>Provide a per-keyrange update stream. Vtgate would connect to the right
-shards, and resolve all conflicts. We can add the restriction that the client
-only asks for keyranges that are exactly matching to one or more shards. For
-instance, if a keyspace is sharded four ways, -40, 40-80, 80-c0, c0-, we can
-support clients asking for -40, -80, -, but not for 60-a0 for instance.</p></li>
-</ul>
-
-<p>As a reminder, the resharding process is somewhat simple:</p>
-
-<ul>
-<li><p>Let’s say we want to split a shard 20-40 into two shards, 20-30 and 30-40. At
-first, only 20-40 exists and has a GTID stream.</p></li>
-<li><p>We create 20-30 and 30-40, each has its own GTID stream. We copy the schema,
-and the data.</p></li>
-<li><p>Filtered replication is enabled. A transaction in 20-40 is replayed on both
-20-30 and 30-40, with an extra blp_checkpoint statement, that saves the 20-40
-GTID.</p></li>
-<li><p>At some point, we migrate the read-only traffic from 20-40 replicas to 20-30
-and 30-40 replicas. (Note: this is probably when we want to migrate any
-invalidation process as well).</p></li>
-<li><p>Then as a final step, the writes are migrated from 20-40 to 20-30 and 30-40.</p></li>
-</ul>
-
-<p>So we have a window of time when both streams are available simultaneously. For
-the resharding process to be operationally better, that window should be as
-small as possible (so we don&#39;t run with two copies of the data for too long). So
-we will make sure an Update Stream can hop from the source shards to the
-destination shards quickly.</p>
-
-<h3 id="surviving-resharding-first-try">Surviving Resharding: First Try</h3>
-
-<p>To solve the shard hop problem during resharding, we tried to explore adding
-good timing information to the replication stream. However:</p>
-
-<ul>
-<li><p>Since the time is added by vttablet, not MySQL, it is not accurate, not
-monotonic, and provides no guarantees.</p></li>
-<li><p>Which such loose guarantees, it is no better than the second-accurate
-timestamp added by MySQL to each transaction.</p></li>
-</ul>
-
-<p>So this idea was abandoned.</p>
-
-<p>The GTID stream maintained by MySQL is the only true source of IDs for
-changes. It’s the only one we can trivially seek on, and get binlogs. The main
-issue with it is that it’s not maintained across shards when resharding.</p>
-
-<p>However, it is worth noting that a transaction replicated by the binlog streamer
-using Filtered Replication also saves the original GTID and the source
-transaction timestamp in the blp_checkpoint table. So we could extract the
-original GTID and timestamp from at least that statement (and if not, from an
-added comment).</p>
-
-<h3 id="change-log-and-sbr">Change Log and SBR</h3>
-
-<p>If all we have is Statement Based Replication (SBR), we cannot get an accurate
-Change Log. SBR only provides the SQL statements, there is no easy way for us to
-parse them to get the final values of the columns (OK, there is, it’s just too
-complicated). And we cannot just query MySQL, as it may have already applied
-more transactions related to that record. So for Change Log, we need Row Based
-Replication (or a more advanced replication system).</p>
-
-<p>Note we can use the following setup:</p>
-
-<ul>
-<li><p>Master and replicas use SBR.</p></li>
-<li><p>Rdonly use SBR to connect to master, but log RBR logs locally.</p></li>
-<li><p>We get the replication stream from rdonly servers.</p></li>
-</ul>
-
-<p>This is a bit awkward, and the main question is: what happens if a rdonly server
-is the only server that has replicated and semi-sync-acked a transaction, while
-the master is dying? Then to get that change, the other servers would get the
-RBR version of the change.</p>
-
-<p>Vitess support for RBR is coming. We will then explore these use cases further.</p>
-
-<h2 id="detailed-design">Detailed Design</h2>
-
-<p>In the rest of this document, we’ll explore using the GTID when tracking a
-single shard, and revert to the timestamp when we hop across shards.</p>
-
-<p>As we do not want the application layer to understand / parse / compare the
-GTIDs, we’ll use an opaque token, and just pass it around the various
-layers. Vtgate / vttablet will understand it. The invalidation process should
-not have to, but will as there is no better solution.</p>
-
-<p>This approach can be made to work for the cache invalidation use case, but it
-might be difficult to provide an exact point in time for recovery / switching
-over to a different set of shards during resharding.</p>
-
-<p>For the Change Log, we’ll see what we can provide.</p>
-
-<h3 id="event-token">Event Token</h3>
-
-<p>We define an Event Token structure that contains:</p>
-
-<ul>
-<li><p>a MySQL replication timestamp (int64, seconds since Epoch).</p></li>
-<li><p>a shard name</p></li>
-<li><p>A GTIDSet position.</p></li>
-</ul>
-
-<p>It basically describes a position in a replication stream.</p>
-
-<p>An Event Token is always constructed from reading a transaction from the
-binlogs. If filtered replication is running, we use the source shard timestamp.</p>
-
-<p>Event Token comparison:</p>
-
-<ul>
-<li><p>First, if the timestamps are different, just use that.</p></li>
-<li><p>Then, if both use the same shard name, compare the GTIDs.</p></li>
-<li><p>Otherwise we do not know for sure. It will depend on the usage to figure out
-what we do.</p></li>
-</ul>
-
-<p><em>Possible Extension</em>: when filtered replication is running, we also update
-blp_checkpoint with the source GTID. We could add that information to the Event
-Token. Let’s try to go without in the first version, to remain simple. More on
-this later in the ‘Data Dump, Keeping it up to Date’ section.</p>
-
-<h3 id="vttablet-changes">Vttablet Changes</h3>
-
-<h4 id="watching-the-replication-stream">Watching the Replication Stream</h4>
-
-<p>Replicas are changed to add a background routine that reads the binlogs
-(controlled by the <code class="prettyprint">watch_replication_stream</code> flag). When a tablet’s type is set
-to <code class="prettyprint">replica</code>, the routine starts. It stops when the tablet is not <code class="prettyprint">replica</code> any
-more (goes to <code class="prettyprint">master</code>, <code class="prettyprint">worker</code>, …).</p>
-
-<p>The routine starts reading the binlog from the current position. It then remembers:</p>
-
-<ul>
-<li><p>The Event Token of the last seen transaction.</p></li>
-<li><p><em>Possible Optimization</em>: A map of the first time a timestamp is seen to the
-corresponding GTID position and filename / position. This would be a value per
-second. Let’s age these out: we keep the values for the last N seconds, then
-we keep a value for every minute for the last M hours. We forget values older
-than 3 days (or whatever the binlog retention time is).</p></li>
-</ul>
-
-<h4 id="include_event_token-option"><code class="prettyprint">include_event_token</code> Option</h4>
-
-<p>We added an option to the Query Service API for Execute calls, called
-<code class="prettyprint">include_event_token</code>. If set, vttablet will get the last seen Event Token right
-before issuing the query to MySQL, and include it in the response. This
-essentially represents the last known replication position that we’re sure the
-data we’re returning is fresher than.</p>
-
-<h4 id="compare_event_token-option"><code class="prettyprint">compare_event_token</code> Option</h4>
-
-<p>We added an option to the Query Service API for Execute calls, called
-<code class="prettyprint">compare_event_token</code>. The provided event token is sent along with the call, and
-vttablet compares that token with the one its current replication stream watcher
-has. It returns the result of the comparison in ResultExtras.</p>
-
-<h4 id="update-stream-api-change">Update Stream API Change</h4>
-
-<p>The Update Stream API in vttablet right now can only start from a GTID. We added a
-new API that can start from a timestamp as well. It will look for the right
-binlog file to start with, and start streaming events, discarding events until
-it finds the provided timestamp. <em>Optimization</em>: It can also look in the map to
-find the closest value it can start with, and then read from the binlogs until
-it finds the first timestamp. If it doesn’t have old enough values in its map,
-it errors out (the goal is to have vtgate then try another tablet to start
-from). For each event, we will also return the corresponding Event Token.</p>
-
-<p><em>Optimization</em>: if an Update Stream client is caught up to the current binlog
-reading thread, we can just tee the binlog stream to that client. We won’t do
-that in the first version, as we don’t expect that many clients.</p>
-
-<p>Note that when filtered replication is running, we need to have the timestamp of
-the source transaction on the source shard, not the local timestamp of the
-applied transaction. Which also means that timestamps will not be always
-linearly increasing in the stream, in the case of a shard merge (although they
-will be linearly increasing for a given keyspace_id).</p>
-
-<h3 id="vtgate-changes">Vtgate Changes</h3>
-
-<p>We added a new Update Stream service to vtgate. It takes as input a keyspace and
-an optional KeyRange (for sharded keyspaces). As a starting point, it takes a
-timestamp.</p>
-
-<p><em>Caveat</em>: As previously mentioned, at first, we can add the restriction that the
-client only asks for KeyRanges that are exactly matching to one or more
-shards. For instance, if a keyspace is sharded four ways, -40, 40-80, 80-c0,
-c0-, we can support clients asking for -40, -80, -, but not for 60-a0 for
-instance. Lifting that restriction is somewhat easy, we’d just have to filter
-the returned keyspace_ids by KeyRange, but that’s extra work for not much gain
-in the short term (and we don’t parse keyspace_id in Binlog Streamer right now,
-just the PK).</p>
-
-<p>After using the partition map in SrvKeyspace, vtgate will have a list of shards
-to query. It will need to create a connection for every shard that overlaps with
-the input KeyRange. For every shard, it will pick an up-to-date replica and use
-the Update Stream API mentioned above. If the vttablet cannot provide the
-stream, it will failover to another one. It will then start an Update Stream on
-all sources, and just merge and stream the results back to the source. For each
-Event Token that is read from a source, vtgate will also send the smallest
-timestamp of all Events it’s seen in all sources. That way the client has a
-value to start back from in case it needs to restart.</p>
-
-<p>In case of resharding event, the list of shards to connect to may change. Vtgate
-will build a map of overlapping shards, to know which source shards are mapped
-to which destination shards. It will then stop reading from all the source
-shards, find the minimum timestamp of the last event it got from each source,
-and use that to restart the stream on the destination shards.</p>
-
-<p><em>Alternate Simpler Solution</em>: when vtgate notices a SrvKeyspace change in the
-serving shards, it just aborts the invalidation stream. The client is
-responsible for reconnecting with the last timestamp it’s seen. The client will
-need to handle this error case anyway (when vtgates get upgraded at least).</p>
-
-<p><em>Caveat</em>: this will produce duplicate Event Tokens, with the same timestamp but
-with GTID positions from two different streams. More on this later, but for a
-Cache Invalidation scenario, no issue, and for a Change Log application, we’ll
-see how we can deal with it.</p>
-
-<p>We also add the same <code class="prettyprint">include_event_token</code> flag to vtgate query service. It just
-passes it along to the underlying vttablet. It’s only supported for
-single-keyspace_id queries. The resulting EventToken is just returned back as
-is.</p>
-
-<h2 id="use-cases-how-to">Use Cases How To</h2>
-
-<p>Let&#39;s revisit our use cases and see how this addresses them.</p>
-
-<h3 id="cache-invalidation">Cache Invalidation</h3>
-
-<p>The idea is to use the Event Token coming from both the Execute results and the
-Update Stream to maintain cache consistency.</p>
-
-<p>The cache contains entries with both:</p>
-
-<ul>
-<li><p>An Event Token. It describes either the invalidation, or the last population.</p></li>
-<li><p>An optional value.</p></li>
-</ul>
-
-<p>The invalidation process works as follows:</p>
-
-<ul>
-<li><p>It asks vtgate for an Update Stream for a provided keyspace / KeyRange,
-starting at the current timestamp (or from a few seconds/minutes/hours in the
-past, or from the last checkpointed timestamp it had saved).</p></li>
-<li><p>Vtgate resolves the keyrange into shards. It starts an invalidation stream
-with a healthy replica in each shard from the provided timestamp.</p></li>
-<li><p>Vtgate sends back all Event Tokens it collects, with all of timestamp, shard
-name and GTID.</p></li>
-<li><p>For each change it gets, the invalidation process reads the cache record. Two cases:</p>
-
-<ul>
-<li>No entry in the cache: it stores the Event Token (to indicate the cache
-should not be populated unless the value is greater) with no value.</li>
-<li>An entry in the cache exists, with an Event Token:</li>
-<li>If the cached Event Token is strictly older, update it with the new Event
-Token, clear the value.</li>
-<li>If the cached Event Token is strictly more recent, discard the new Event.</li>
-<li>If we don’t know which Event Token is the most recent (meaning they have
-the same timestamp, and are read from different invalidation stream), we
-need to do the safest thing: invalidate the cache with the current Event
-Token. This is the safest because we’re guaranteed to get duplicate
-events, and not miss events.</li>
-<li>In any case the invalidation process only updates the cache if it still
-contains the value it read (CAS). Otherwise it rereads and tries again
-(means an appserver or another invalidator somehow also updated the cache).</li>
-</ul></li>
-</ul>
-
-<p>A regular appserver will query the cache for the value it wants. It will get either:</p>
-
-<ul>
-<li><p>No entry: asks vtgate for the Event Token when querying the database, use a
-CAS operation to set the value the returned Event Token + Value.</p></li>
-<li><p>An entry with both an Event Token and a Value: Just use the value.</p></li>
-<li><p>An entry with just an Event Token and no Value:</p>
-
-<ul>
-<li>Send the Event Token along with the query to vtgate as
-<code class="prettyprint">compare_event_token</code>, and also asking for Event Token using <code class="prettyprint">include_event_token</code>.</li>
-<li>Vtgate will query vttablet as usual, but also passing both flags.</li>
-<li>Vttablet will then compare the provided Event Token with the one that was
-included. It will include in the response the knowledge of the Event Token
-comparison as a boolean, only set if the data read is <code class="prettyprint">fresher</code>.</li>
-<li>Depending on the <code class="prettyprint">fresher</code> boolean flag, the app will:</li>
-<li>Data read is more recent: Update the cache with new Event Token / Value.</li>
-<li>Data read is not more recent (or we don&#39;t know for sure): don’t update the cache.</li>
-</ul></li>
-</ul>
-
-<p><em>Constraints</em>:</p>
-
-<ul>
-<li><p>When restarting the invalidation process, we start from a point back in time,
-let’s say N seconds behind now. Since we can ask destination shards at this
-point for events that are N seconds old, filtered replication has to have been
-running for at least N seconds. (Alternatively, the invalidators can
-checkpoint their current position from time to time, and restart from that
-when starting up, and revert back to N seconds behind now).</p></li>
-<li><p>As mentioned before, the shard range queried by the invalidation process
-should cover a round number of actual shards.</p></li>
-<li><p>The invalidation process needs to know how to compare tokens. This is a
-bummer, I don’t see any way around it. We could simplify and only do the
-timestamp comparison part, but that would mean the cache is unused for up to
-an entire second upon changes. The appserver doesn’t need to compare, it gives
-the value to vtgate and let it do the work.</p></li>
-</ul>
-
-<p>To see a sample use of the Update Stream feature, look at
-the
-<a href="https://github.com/youtube/vitess/blob/master/test/cache_invalidation.py">cache_invalidation.py</a> integration
-test. It shows how to do the invalidaiton in python, and the application
-component.</p>
-
-<h3 id="extension-removing-duplicate-events">Extension: Removing Duplicate Events</h3>
-
-<p>In the previous section, we use timestamps to easily seek on replication
-streams. If we added the ability to seek on any source GTID that appears in the
-destination stream, we should be able to precisely seek at the right spot. That
-would make exact transitions from one stream to the next possible. Again, as
-long as the destination shard in a resharding event has been running filtered
-replication for as long as we want to go back.</p>
-
-<p>However, describing a position on a replication stream becomes tricky: it needs
-one Event Token per replication stream. When resharding the Event Tokens would
-jump around. When restarting a stream from an Event Token list, we may need to
-restart earlier in some cases and skip some items.</p>
-
-<p><em>Bottom Line</em>:</p>
-
-<ul>
-<li><p>This would require a bunch of non-trivial code.</p></li>
-<li><p>This requires that filtered replication would be running for at least as long
-as we want to go back in time for the starting point.</p></li>
-</ul>
-
-<p>If there is no use case for it, let’s not do it.</p>
-
-<h3 id="extension-adding-update-data-to-the-stream-towards-change-log">Extension: Adding Update Data to the Stream, Towards Change Log</h3>
-
-<p>Let’s add a flag to the streaming query, that, if specified, asks for the
-changed columns as well as the PK.</p>
-
-<ul>
-<li><p>If using SBR, and the flag is present, vttablet can just query the row at the
-time we get the event, and send it along. As already mentioned, the data may
-not be exactly up to date. It is however guaranteed to be newer than the Event
-Token, which might be good enough to put in a cache for instance.</p></li>
-<li><p>If using RBR, we just get the data for free, just send it along.</p></li>
-</ul>
-
-<p><em>Bottom Line</em>: Let’s try to go without this extension and see how it goes. We
-can implement the additional data when we fully support RBR.</p>
-
-<h3 id="extension-data-dump-keeping-it-up-to-date">Extension: Data Dump, Keeping It Up To Date</h3>
-
-<p><em>Use Case</em>: keep a secondary database (like a HBase database) up to date.
-<em>Requirements</em>: RBR replication, plus Data included in the Stream (previous extension).</p>
-
-<p>It’s simple:</p>
-
-<ul>
-<li><p>The external database has the same schema as MySQL. Each row is indexed by
-PK. It also has an extra field, for the last Event Token.</p></li>
-<li><p>Remember start time of the process, let’s call it StartTime</p></li>
-<li><p>Dump the data to other database. Using Map/Reduce, whatever. Do not populate
-the Event Tokens.</p></li>
-<li><p>Start an invalidation process, asking for changes from StartTime. When getting
-updates, read the current external database row and its Event Token:</p>
-
-<ul>
-<li>If there is no existing row / no Event token, save the new value.</li>
-<li>If there is an existing row with a strictly more recent Event Token, ignore
-the event.</li>
-<li>Otherwise (when the existing Event Token is older or we don’t know), store
-the new Value / Event Token.</li>
-</ul></li>
-</ul>
-
-<p>Note this again means the dumping process needs to be able to compare Event
-Tokens, as the invalidator does.</p>
-
-<p><em>Caveat</em>: As described, the values in the secondary storage will converge, but
-they may go back in time for a bit, as we will process duplicate events during
-resharding, and we may not know how to compare them.</p>
-
-<p><em>Extension</em>: if we also add the source GTID in Event Tokens read from a
-destination shard during filtered replication, we can break the tie easily on
-duplicate events, and guarantee we only move forward. This seems like the
-easiest solution, and we can then use only timestamps as starting times for
-restarting the sync process.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/update-stream/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/update-stream/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/update-stream/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/update-stream/"</script>
 </html>
diff --git a/docs/user-guide/update-stream/index.html b/docs/user-guide/update-stream/index.html
new file mode 100644
index 00000000000..01627c64a60
--- /dev/null
+++ b/docs/user-guide/update-stream/index.html
@@ -0,0 +1,843 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Update Stream | Vitess</title>
+<meta property="og:title" content="Update Stream" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/update-stream/" />
+<meta property="og:url" content="http://vitess.io/user-guide/update-stream/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/update-stream/","headline":"Update Stream","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Update Stream</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="update-stream">Update Stream</h1>
+
+<p>Update Stream is a Vitess service that provides a change stream for any keyspace.
+The use cases for this service include:</p>
+
+<ul>
+<li><p>Providing an <em>invalidation stream</em>, that an application can use to maintain a cache.</p></li>
+<li><p>Maintain an external copy of the data in another system, that is only updated
+when the data changes.</p></li>
+<li><p>Maintain a change record of all the transactions that have been applied to the data.</p></li>
+</ul>
+
+<p>A good understanding
+of <a href="/user-guide/vitess-replication/">Vitess Replication</a> is required to
+understand this document better. We will go through the use cases in a bit more
+details, then introduce the EventToken notion, and finally explain the service.</p>
+
+<h2 id="use-cases">Use Cases</h2>
+
+<h3 id="maintaining-cache-consistency">Maintaining Cache Consistency</h3>
+
+<p>The first use case we’re trying to address is to maintain a consistent cache of
+the data. The problem here has two parts:</p>
+
+<ul>
+<li><p>When data changes, we need to invalidate the cache.</p></li>
+<li><p>When we want to re-populate the cache after an invalidation, we need to make
+sure we get data that is more recent than the data change. For instance, we
+can’t just re-query any replica, as it might be behind on replication.</p></li>
+</ul>
+
+<p>This process can be somewhat resilient to some stream anomalies. For instance,
+invalidating the same record twice in some corner cases is fine, as long as we
+don’t poison the cache with an old value.</p>
+
+<p>Note the location / ownership of the cache is not set in stone:</p>
+
+<ul>
+<li><p>Application-layer cache: the app servers maintain the cache. It’s very early
+in the serving chain, so in case of a cache hit, it’s lower latency. However,
+an invalidation process needs to run and is probably also owned by the
+application layer, which is somewhat annoying.</p></li>
+<li><p>vtgate-layer cache: it would be a row cache accessed by vtgate, transparent to
+the app. It requires vtgate to do a lot of extra heavy-lifting, depending on
+what we want to support. Cache invalidation is still required, at a row level.</p></li>
+<li><p>vttablet-layer cache: this is the old rowcache. Since the cache is not shared
+across instances, and the app still needs a cache, we abandoned this one.</p></li>
+</ul>
+
+<p>Since the vtgate-layer cache is much harder to work on (because of the query
+implications), and will probably require similar components as the app-layer
+cache, we decided to work on the app-layer cache for now, with possibly an
+invalidation process that is somewhat tied to the app.</p>
+
+<p>The <em>composite object cache</em> is an interesting use case: if the application is
+in charge of the cache, it would seem possible to put in the cache higher level
+composite objects, that are built from multiple table records. They would be
+invalidated any time one of the composing table record is changed. They need to
+be addressed by a part of the primary key, so they’re easy to find.</p>
+
+<h3 id="change-log">Change Log</h3>
+
+<p>A Change Log provides a stream of all data changes, so an external application
+can either record these changes, or keep an external database up to date with
+the latest data.</p>
+
+<p>Unlike the Cache Invalidation use case, this is not as forgiving. If we have
+duplicate updates, they will need to be handled.</p>
+
+<h2 id="design-considerations">Design Considerations</h2>
+
+<h3 id="single-shard-update-stream">Single Shard Update Stream</h3>
+
+<p>This has been supported in Vitess for a while, but not exposed. It works as follows:</p>
+
+<ul>
+<li><p>vttablet adds an SQL comment to every DML, that contains the Primary Key of
+the modified row.</p></li>
+<li><p>vttablet provides a streaming service that can connect to the local MySQL
+replication stream, extract the comment, and stream events to the client.</p></li>
+<li><p>Use the GTID as the start / restart position. It is sent back with each
+update, and an Update Stream can be started from it.</p></li>
+</ul>
+
+<p>Note Vitess supports both the MariaDB GTIDs (domain:server:sequence) and the
+MySQL 5.6 GTID Sets (encoded in SID blocks).</p>
+
+<h3 id="surviving-resharding-problem">Surviving Resharding: Problem</h3>
+
+<p>The Vitess tools are supposed to provide transparent sharding for the user’s
+data. Most of the trouble we run into is surviving resharding events, when we
+hop over from one set of shards to another set of shards.</p>
+
+<p>Two strategies then come to mind:</p>
+
+<ul>
+<li><p>Provide a per-shard update stream. Let the user handle the hop when resharding
+happens. If we were to do this for the Cache use case, we would also need to
+provide some way of preventing bad corner cases, like a full cache flush, or
+no cache update for a while, or lost cache invalidations. Simple for us, but
+the app can be a lot more complicated. And the Change Log use case is also
+hard to do.</p></li>
+<li><p>Provide a per-keyrange update stream. Vtgate would connect to the right
+shards, and resolve all conflicts. We can add the restriction that the client
+only asks for keyranges that are exactly matching to one or more shards. For
+instance, if a keyspace is sharded four ways, -40, 40-80, 80-c0, c0-, we can
+support clients asking for -40, -80, -, but not for 60-a0 for instance.</p></li>
+</ul>
+
+<p>As a reminder, the resharding process is somewhat simple:</p>
+
+<ul>
+<li><p>Let’s say we want to split a shard 20-40 into two shards, 20-30 and 30-40. At
+first, only 20-40 exists and has a GTID stream.</p></li>
+<li><p>We create 20-30 and 30-40, each has its own GTID stream. We copy the schema,
+and the data.</p></li>
+<li><p>Filtered replication is enabled. A transaction in 20-40 is replayed on both
+20-30 and 30-40, with an extra blp_checkpoint statement, that saves the 20-40
+GTID.</p></li>
+<li><p>At some point, we migrate the read-only traffic from 20-40 replicas to 20-30
+and 30-40 replicas. (Note: this is probably when we want to migrate any
+invalidation process as well).</p></li>
+<li><p>Then as a final step, the writes are migrated from 20-40 to 20-30 and 30-40.</p></li>
+</ul>
+
+<p>So we have a window of time when both streams are available simultaneously. For
+the resharding process to be operationally better, that window should be as
+small as possible (so we don&#39;t run with two copies of the data for too long). So
+we will make sure an Update Stream can hop from the source shards to the
+destination shards quickly.</p>
+
+<h3 id="surviving-resharding-first-try">Surviving Resharding: First Try</h3>
+
+<p>To solve the shard hop problem during resharding, we tried to explore adding
+good timing information to the replication stream. However:</p>
+
+<ul>
+<li><p>Since the time is added by vttablet, not MySQL, it is not accurate, not
+monotonic, and provides no guarantees.</p></li>
+<li><p>Which such loose guarantees, it is no better than the second-accurate
+timestamp added by MySQL to each transaction.</p></li>
+</ul>
+
+<p>So this idea was abandoned.</p>
+
+<p>The GTID stream maintained by MySQL is the only true source of IDs for
+changes. It’s the only one we can trivially seek on, and get binlogs. The main
+issue with it is that it’s not maintained across shards when resharding.</p>
+
+<p>However, it is worth noting that a transaction replicated by the binlog streamer
+using Filtered Replication also saves the original GTID and the source
+transaction timestamp in the blp_checkpoint table. So we could extract the
+original GTID and timestamp from at least that statement (and if not, from an
+added comment).</p>
+
+<h3 id="change-log-and-sbr">Change Log and SBR</h3>
+
+<p>If all we have is Statement Based Replication (SBR), we cannot get an accurate
+Change Log. SBR only provides the SQL statements, there is no easy way for us to
+parse them to get the final values of the columns (OK, there is, it’s just too
+complicated). And we cannot just query MySQL, as it may have already applied
+more transactions related to that record. So for Change Log, we need Row Based
+Replication (or a more advanced replication system).</p>
+
+<p>Note we can use the following setup:</p>
+
+<ul>
+<li><p>Master and replicas use SBR.</p></li>
+<li><p>Rdonly use SBR to connect to master, but log RBR logs locally.</p></li>
+<li><p>We get the replication stream from rdonly servers.</p></li>
+</ul>
+
+<p>This is a bit awkward, and the main question is: what happens if a rdonly server
+is the only server that has replicated and semi-sync-acked a transaction, while
+the master is dying? Then to get that change, the other servers would get the
+RBR version of the change.</p>
+
+<p>Vitess support for RBR is coming. We will then explore these use cases further.</p>
+
+<h2 id="detailed-design">Detailed Design</h2>
+
+<p>In the rest of this document, we’ll explore using the GTID when tracking a
+single shard, and revert to the timestamp when we hop across shards.</p>
+
+<p>As we do not want the application layer to understand / parse / compare the
+GTIDs, we’ll use an opaque token, and just pass it around the various
+layers. Vtgate / vttablet will understand it. The invalidation process should
+not have to, but will as there is no better solution.</p>
+
+<p>This approach can be made to work for the cache invalidation use case, but it
+might be difficult to provide an exact point in time for recovery / switching
+over to a different set of shards during resharding.</p>
+
+<p>For the Change Log, we’ll see what we can provide.</p>
+
+<h3 id="event-token">Event Token</h3>
+
+<p>We define an Event Token structure that contains:</p>
+
+<ul>
+<li><p>a MySQL replication timestamp (int64, seconds since Epoch).</p></li>
+<li><p>a shard name</p></li>
+<li><p>A GTIDSet position.</p></li>
+</ul>
+
+<p>It basically describes a position in a replication stream.</p>
+
+<p>An Event Token is always constructed from reading a transaction from the
+binlogs. If filtered replication is running, we use the source shard timestamp.</p>
+
+<p>Event Token comparison:</p>
+
+<ul>
+<li><p>First, if the timestamps are different, just use that.</p></li>
+<li><p>Then, if both use the same shard name, compare the GTIDs.</p></li>
+<li><p>Otherwise we do not know for sure. It will depend on the usage to figure out
+what we do.</p></li>
+</ul>
+
+<p><em>Possible Extension</em>: when filtered replication is running, we also update
+blp_checkpoint with the source GTID. We could add that information to the Event
+Token. Let’s try to go without in the first version, to remain simple. More on
+this later in the ‘Data Dump, Keeping it up to Date’ section.</p>
+
+<h3 id="vttablet-changes">Vttablet Changes</h3>
+
+<h4 id="watching-the-replication-stream">Watching the Replication Stream</h4>
+
+<p>Replicas are changed to add a background routine that reads the binlogs
+(controlled by the <code class="prettyprint">watch_replication_stream</code> flag). When a tablet’s type is set
+to <code class="prettyprint">replica</code>, the routine starts. It stops when the tablet is not <code class="prettyprint">replica</code> any
+more (goes to <code class="prettyprint">master</code>, <code class="prettyprint">worker</code>, …).</p>
+
+<p>The routine starts reading the binlog from the current position. It then remembers:</p>
+
+<ul>
+<li><p>The Event Token of the last seen transaction.</p></li>
+<li><p><em>Possible Optimization</em>: A map of the first time a timestamp is seen to the
+corresponding GTID position and filename / position. This would be a value per
+second. Let’s age these out: we keep the values for the last N seconds, then
+we keep a value for every minute for the last M hours. We forget values older
+than 3 days (or whatever the binlog retention time is).</p></li>
+</ul>
+
+<h4 id="include_event_token-option"><code class="prettyprint">include_event_token</code> Option</h4>
+
+<p>We added an option to the Query Service API for Execute calls, called
+<code class="prettyprint">include_event_token</code>. If set, vttablet will get the last seen Event Token right
+before issuing the query to MySQL, and include it in the response. This
+essentially represents the last known replication position that we’re sure the
+data we’re returning is fresher than.</p>
+
+<h4 id="compare_event_token-option"><code class="prettyprint">compare_event_token</code> Option</h4>
+
+<p>We added an option to the Query Service API for Execute calls, called
+<code class="prettyprint">compare_event_token</code>. The provided event token is sent along with the call, and
+vttablet compares that token with the one its current replication stream watcher
+has. It returns the result of the comparison in ResultExtras.</p>
+
+<h4 id="update-stream-api-change">Update Stream API Change</h4>
+
+<p>The Update Stream API in vttablet right now can only start from a GTID. We added a
+new API that can start from a timestamp as well. It will look for the right
+binlog file to start with, and start streaming events, discarding events until
+it finds the provided timestamp. <em>Optimization</em>: It can also look in the map to
+find the closest value it can start with, and then read from the binlogs until
+it finds the first timestamp. If it doesn’t have old enough values in its map,
+it errors out (the goal is to have vtgate then try another tablet to start
+from). For each event, we will also return the corresponding Event Token.</p>
+
+<p><em>Optimization</em>: if an Update Stream client is caught up to the current binlog
+reading thread, we can just tee the binlog stream to that client. We won’t do
+that in the first version, as we don’t expect that many clients.</p>
+
+<p>Note that when filtered replication is running, we need to have the timestamp of
+the source transaction on the source shard, not the local timestamp of the
+applied transaction. Which also means that timestamps will not be always
+linearly increasing in the stream, in the case of a shard merge (although they
+will be linearly increasing for a given keyspace_id).</p>
+
+<h3 id="vtgate-changes">Vtgate Changes</h3>
+
+<p>We added a new Update Stream service to vtgate. It takes as input a keyspace and
+an optional KeyRange (for sharded keyspaces). As a starting point, it takes a
+timestamp.</p>
+
+<p><em>Caveat</em>: As previously mentioned, at first, we can add the restriction that the
+client only asks for KeyRanges that are exactly matching to one or more
+shards. For instance, if a keyspace is sharded four ways, -40, 40-80, 80-c0,
+c0-, we can support clients asking for -40, -80, -, but not for 60-a0 for
+instance. Lifting that restriction is somewhat easy, we’d just have to filter
+the returned keyspace_ids by KeyRange, but that’s extra work for not much gain
+in the short term (and we don’t parse keyspace_id in Binlog Streamer right now,
+just the PK).</p>
+
+<p>After using the partition map in SrvKeyspace, vtgate will have a list of shards
+to query. It will need to create a connection for every shard that overlaps with
+the input KeyRange. For every shard, it will pick an up-to-date replica and use
+the Update Stream API mentioned above. If the vttablet cannot provide the
+stream, it will failover to another one. It will then start an Update Stream on
+all sources, and just merge and stream the results back to the source. For each
+Event Token that is read from a source, vtgate will also send the smallest
+timestamp of all Events it’s seen in all sources. That way the client has a
+value to start back from in case it needs to restart.</p>
+
+<p>In case of resharding event, the list of shards to connect to may change. Vtgate
+will build a map of overlapping shards, to know which source shards are mapped
+to which destination shards. It will then stop reading from all the source
+shards, find the minimum timestamp of the last event it got from each source,
+and use that to restart the stream on the destination shards.</p>
+
+<p><em>Alternate Simpler Solution</em>: when vtgate notices a SrvKeyspace change in the
+serving shards, it just aborts the invalidation stream. The client is
+responsible for reconnecting with the last timestamp it’s seen. The client will
+need to handle this error case anyway (when vtgates get upgraded at least).</p>
+
+<p><em>Caveat</em>: this will produce duplicate Event Tokens, with the same timestamp but
+with GTID positions from two different streams. More on this later, but for a
+Cache Invalidation scenario, no issue, and for a Change Log application, we’ll
+see how we can deal with it.</p>
+
+<p>We also add the same <code class="prettyprint">include_event_token</code> flag to vtgate query service. It just
+passes it along to the underlying vttablet. It’s only supported for
+single-keyspace_id queries. The resulting EventToken is just returned back as
+is.</p>
+
+<h2 id="use-cases-how-to">Use Cases How To</h2>
+
+<p>Let&#39;s revisit our use cases and see how this addresses them.</p>
+
+<h3 id="cache-invalidation">Cache Invalidation</h3>
+
+<p>The idea is to use the Event Token coming from both the Execute results and the
+Update Stream to maintain cache consistency.</p>
+
+<p>The cache contains entries with both:</p>
+
+<ul>
+<li><p>An Event Token. It describes either the invalidation, or the last population.</p></li>
+<li><p>An optional value.</p></li>
+</ul>
+
+<p>The invalidation process works as follows:</p>
+
+<ul>
+<li><p>It asks vtgate for an Update Stream for a provided keyspace / KeyRange,
+starting at the current timestamp (or from a few seconds/minutes/hours in the
+past, or from the last checkpointed timestamp it had saved).</p></li>
+<li><p>Vtgate resolves the keyrange into shards. It starts an invalidation stream
+with a healthy replica in each shard from the provided timestamp.</p></li>
+<li><p>Vtgate sends back all Event Tokens it collects, with all of timestamp, shard
+name and GTID.</p></li>
+<li><p>For each change it gets, the invalidation process reads the cache record. Two cases:</p>
+
+<ul>
+<li>No entry in the cache: it stores the Event Token (to indicate the cache
+should not be populated unless the value is greater) with no value.</li>
+<li>An entry in the cache exists, with an Event Token:</li>
+<li>If the cached Event Token is strictly older, update it with the new Event
+Token, clear the value.</li>
+<li>If the cached Event Token is strictly more recent, discard the new Event.</li>
+<li>If we don’t know which Event Token is the most recent (meaning they have
+the same timestamp, and are read from different invalidation stream), we
+need to do the safest thing: invalidate the cache with the current Event
+Token. This is the safest because we’re guaranteed to get duplicate
+events, and not miss events.</li>
+<li>In any case the invalidation process only updates the cache if it still
+contains the value it read (CAS). Otherwise it rereads and tries again
+(means an appserver or another invalidator somehow also updated the cache).</li>
+</ul></li>
+</ul>
+
+<p>A regular appserver will query the cache for the value it wants. It will get either:</p>
+
+<ul>
+<li><p>No entry: asks vtgate for the Event Token when querying the database, use a
+CAS operation to set the value the returned Event Token + Value.</p></li>
+<li><p>An entry with both an Event Token and a Value: Just use the value.</p></li>
+<li><p>An entry with just an Event Token and no Value:</p>
+
+<ul>
+<li>Send the Event Token along with the query to vtgate as
+<code class="prettyprint">compare_event_token</code>, and also asking for Event Token using <code class="prettyprint">include_event_token</code>.</li>
+<li>Vtgate will query vttablet as usual, but also passing both flags.</li>
+<li>Vttablet will then compare the provided Event Token with the one that was
+included. It will include in the response the knowledge of the Event Token
+comparison as a boolean, only set if the data read is <code class="prettyprint">fresher</code>.</li>
+<li>Depending on the <code class="prettyprint">fresher</code> boolean flag, the app will:</li>
+<li>Data read is more recent: Update the cache with new Event Token / Value.</li>
+<li>Data read is not more recent (or we don&#39;t know for sure): don’t update the cache.</li>
+</ul></li>
+</ul>
+
+<p><em>Constraints</em>:</p>
+
+<ul>
+<li><p>When restarting the invalidation process, we start from a point back in time,
+let’s say N seconds behind now. Since we can ask destination shards at this
+point for events that are N seconds old, filtered replication has to have been
+running for at least N seconds. (Alternatively, the invalidators can
+checkpoint their current position from time to time, and restart from that
+when starting up, and revert back to N seconds behind now).</p></li>
+<li><p>As mentioned before, the shard range queried by the invalidation process
+should cover a round number of actual shards.</p></li>
+<li><p>The invalidation process needs to know how to compare tokens. This is a
+bummer, I don’t see any way around it. We could simplify and only do the
+timestamp comparison part, but that would mean the cache is unused for up to
+an entire second upon changes. The appserver doesn’t need to compare, it gives
+the value to vtgate and let it do the work.</p></li>
+</ul>
+
+<p>To see a sample use of the Update Stream feature, look at
+the
+<a href="https://github.com/youtube/vitess/blob/master/test/cache_invalidation.py">cache_invalidation.py</a> integration
+test. It shows how to do the invalidaiton in python, and the application
+component.</p>
+
+<h3 id="extension-removing-duplicate-events">Extension: Removing Duplicate Events</h3>
+
+<p>In the previous section, we use timestamps to easily seek on replication
+streams. If we added the ability to seek on any source GTID that appears in the
+destination stream, we should be able to precisely seek at the right spot. That
+would make exact transitions from one stream to the next possible. Again, as
+long as the destination shard in a resharding event has been running filtered
+replication for as long as we want to go back.</p>
+
+<p>However, describing a position on a replication stream becomes tricky: it needs
+one Event Token per replication stream. When resharding the Event Tokens would
+jump around. When restarting a stream from an Event Token list, we may need to
+restart earlier in some cases and skip some items.</p>
+
+<p><em>Bottom Line</em>:</p>
+
+<ul>
+<li><p>This would require a bunch of non-trivial code.</p></li>
+<li><p>This requires that filtered replication would be running for at least as long
+as we want to go back in time for the starting point.</p></li>
+</ul>
+
+<p>If there is no use case for it, let’s not do it.</p>
+
+<h3 id="extension-adding-update-data-to-the-stream-towards-change-log">Extension: Adding Update Data to the Stream, Towards Change Log</h3>
+
+<p>Let’s add a flag to the streaming query, that, if specified, asks for the
+changed columns as well as the PK.</p>
+
+<ul>
+<li><p>If using SBR, and the flag is present, vttablet can just query the row at the
+time we get the event, and send it along. As already mentioned, the data may
+not be exactly up to date. It is however guaranteed to be newer than the Event
+Token, which might be good enough to put in a cache for instance.</p></li>
+<li><p>If using RBR, we just get the data for free, just send it along.</p></li>
+</ul>
+
+<p><em>Bottom Line</em>: Let’s try to go without this extension and see how it goes. We
+can implement the additional data when we fully support RBR.</p>
+
+<h3 id="extension-data-dump-keeping-it-up-to-date">Extension: Data Dump, Keeping It Up To Date</h3>
+
+<p><em>Use Case</em>: keep a secondary database (like a HBase database) up to date.
+<em>Requirements</em>: RBR replication, plus Data included in the Stream (previous extension).</p>
+
+<p>It’s simple:</p>
+
+<ul>
+<li><p>The external database has the same schema as MySQL. Each row is indexed by
+PK. It also has an extra field, for the last Event Token.</p></li>
+<li><p>Remember start time of the process, let’s call it StartTime</p></li>
+<li><p>Dump the data to other database. Using Map/Reduce, whatever. Do not populate
+the Event Tokens.</p></li>
+<li><p>Start an invalidation process, asking for changes from StartTime. When getting
+updates, read the current external database row and its Event Token:</p>
+
+<ul>
+<li>If there is no existing row / no Event token, save the new value.</li>
+<li>If there is an existing row with a strictly more recent Event Token, ignore
+the event.</li>
+<li>Otherwise (when the existing Event Token is older or we don’t know), store
+the new Value / Event Token.</li>
+</ul></li>
+</ul>
+
+<p>Note this again means the dumping process needs to be able to compare Event
+Tokens, as the invalidator does.</p>
+
+<p><em>Caveat</em>: As described, the values in the secondary storage will converge, but
+they may go back in time for a bit, as we will process duplicate events during
+resharding, and we may not know how to compare them.</p>
+
+<p><em>Extension</em>: if we also add the source GTID in Event Tokens read from a
+destination shard during filtered replication, we can break the tie easily on
+duplicate events, and guarantee we only move forward. This seems like the
+easiest solution, and we can then use only timestamps as starting times for
+restarting the sync process.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/upgrading.html b/docs/user-guide/upgrading.html
index d82038e902a..556a8950d31 100644
--- a/docs/user-guide/upgrading.html
+++ b/docs/user-guide/upgrading.html
@@ -1,393 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Upgrading</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Upgrading"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Upgrading</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="upgrading-a-vitess-installation">Upgrading a Vitess Installation</h1>
-
-<p>This document highlights things to look after when upgrading a Vitess production installation to a newer Vitess release.</p>
-
-<p>Generally speaking, upgrading Vitess is a safe and and easy process because it is explicitly designed for it. This is because in YouTube we follow the practice of releasing new versions often (usually from the tip of the Git master branch).</p>
-
-<h2 id="compatibility">Compatibility</h2>
-
-<p>Our versioning strategy is based on <a href="http://semver.org/">Semantic Versioning</a>.</p>
-
-<p>Vitess version numbers follow the format <code class="prettyprint">MAJOR.MINOR.PATCH</code>.
-We guarantee compatibility when upgrading to a newer <strong>patch</strong> or <strong>minor</strong> version.
-Upgrades to a higher <strong>major</strong> version may require manual configuration changes.</p>
-
-<p>In general, always <strong>read the &#39;Upgrading&#39; section of the release notes</strong>.
-It will mention any incompatible changes and necessary manual steps.</p>
-
-<h2 id="upgrade-order">Upgrade Order</h2>
-
-<p>We recommend to upgrade components in a bottom-to-top order such that &quot;old&quot; clients will talk to &quot;new&quot; servers during the transition.</p>
-
-<p>Please use this upgrade order (unless otherwise noted in the release notes):</p>
-
-<ul>
-<li>vtctld</li>
-<li>vttablet</li>
-<li>vtgate</li>
-<li>application code which links client libraries</li>
-</ul>
-
-<p><em>vtctld</em> is listed first to make sure that you can still adminstrate Vitess - or if not find out as soon as possible.</p>
-
-<h2 id="canary-testing">Canary Testing</h2>
-
-<p>Within the vtgate and vttablet components, we recommend to <a href="http://martinfowler.com/bliki/CanaryRelease.html">canary</a> single instances, keyspaces and cells. Upgraded canary instances can &quot;bake&quot; for several hours or days to verify that the upgrade did not introduce a regression. Eventually, you can upgrade the remaining instances.</p>
-
-<h2 id="rolling-upgrades">Rolling Upgrades</h2>
-
-<p>We recommend to automate the upgrade process with a configuration management software. It will reduce the possibility of human errors and simplify the process of managing all instances.</p>
-
-<p>As of June 2016 we do not have templates for any major open-source configuration management software because our internal upgrade process is based on a proprietary software. Therefore, we invite open-source users to contribute such templates.</p>
-
-<p>Any upgrade should be a rolling release i.e. usually one tablet at a time within a shard. This ensures that the remaining tablets continue serving live traffic and there is no interruption.</p>
-
-<h2 id="upgrading-the-master-tablet">Upgrading the Master Tablet</h2>
-
-<p>The <em>master</em> tablet of each shard should always be updated last in the following manner:</p>
-
-<ul>
-<li>verify that all <em>replica</em> tablets in the shard have been upgraded</li>
-<li>reparent away from the current <em>master</em> to a <em>replica</em> tablet</li>
-<li>upgrade old <em>master</em> tablet</li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/upgrading/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/upgrading/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/upgrading/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/upgrading/"</script>
 </html>
diff --git a/docs/user-guide/upgrading/index.html b/docs/user-guide/upgrading/index.html
new file mode 100644
index 00000000000..93befeb9a4f
--- /dev/null
+++ b/docs/user-guide/upgrading/index.html
@@ -0,0 +1,402 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Upgrading | Vitess</title>
+<meta property="og:title" content="Upgrading" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/upgrading/" />
+<meta property="og:url" content="http://vitess.io/user-guide/upgrading/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/upgrading/","headline":"Upgrading","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Upgrading</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="upgrading-a-vitess-installation">Upgrading a Vitess Installation</h1>
+
+<p>This document highlights things to look after when upgrading a Vitess production installation to a newer Vitess release.</p>
+
+<p>Generally speaking, upgrading Vitess is a safe and and easy process because it is explicitly designed for it. This is because in YouTube we follow the practice of releasing new versions often (usually from the tip of the Git master branch).</p>
+
+<h2 id="compatibility">Compatibility</h2>
+
+<p>Our versioning strategy is based on <a href="http://semver.org/">Semantic Versioning</a>.</p>
+
+<p>Vitess version numbers follow the format <code class="prettyprint">MAJOR.MINOR.PATCH</code>.
+We guarantee compatibility when upgrading to a newer <strong>patch</strong> or <strong>minor</strong> version.
+Upgrades to a higher <strong>major</strong> version may require manual configuration changes.</p>
+
+<p>In general, always <strong>read the &#39;Upgrading&#39; section of the release notes</strong>.
+It will mention any incompatible changes and necessary manual steps.</p>
+
+<h2 id="upgrade-order">Upgrade Order</h2>
+
+<p>We recommend to upgrade components in a bottom-to-top order such that &quot;old&quot; clients will talk to &quot;new&quot; servers during the transition.</p>
+
+<p>Please use this upgrade order (unless otherwise noted in the release notes):</p>
+
+<ul>
+<li>vtctld</li>
+<li>vttablet</li>
+<li>vtgate</li>
+<li>application code which links client libraries</li>
+</ul>
+
+<p><em>vtctld</em> is listed first to make sure that you can still adminstrate Vitess - or if not find out as soon as possible.</p>
+
+<h2 id="canary-testing">Canary Testing</h2>
+
+<p>Within the vtgate and vttablet components, we recommend to <a href="http://martinfowler.com/bliki/CanaryRelease.html">canary</a> single instances, keyspaces and cells. Upgraded canary instances can &quot;bake&quot; for several hours or days to verify that the upgrade did not introduce a regression. Eventually, you can upgrade the remaining instances.</p>
+
+<h2 id="rolling-upgrades">Rolling Upgrades</h2>
+
+<p>We recommend to automate the upgrade process with a configuration management software. It will reduce the possibility of human errors and simplify the process of managing all instances.</p>
+
+<p>As of June 2016 we do not have templates for any major open-source configuration management software because our internal upgrade process is based on a proprietary software. Therefore, we invite open-source users to contribute such templates.</p>
+
+<p>Any upgrade should be a rolling release i.e. usually one tablet at a time within a shard. This ensures that the remaining tablets continue serving live traffic and there is no interruption.</p>
+
+<h2 id="upgrading-the-master-tablet">Upgrading the Master Tablet</h2>
+
+<p>The <em>master</em> tablet of each shard should always be updated last in the following manner:</p>
+
+<ul>
+<li>verify that all <em>replica</em> tablets in the shard have been upgraded</li>
+<li>reparent away from the current <em>master</em> to a <em>replica</em> tablet</li>
+<li>upgrade old <em>master</em> tablet</li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/vitess-replication.html b/docs/user-guide/vitess-replication.html
index 4ae9b7b26cc..7b107a44119 100644
--- a/docs/user-guide/vitess-replication.html
+++ b/docs/user-guide/vitess-replication.html
@@ -1,559 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Vitess and Replication</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Vitess and Replication"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Vitess and Replication</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="vitess-mysql-replication-and-schema-changes">Vitess, MySQL Replication, and Schema Changes</h1>
-
-<h2 id="statement-vs-row-based-replication">Statement vs Row Based Replication</h2>
-
-<p>MySQL supports two primary modes of replication in its binary logs: statement or
-row based.</p>
-
-<p><strong>Statement Based Replication</strong>:</p>
-
-<ul>
-<li>The statements executed on the master are copied almost as-is in the master
-logs.</li>
-<li>The slaves replay these statements as is.</li>
-<li>If the statements are expensive (especially an update with a complicated WHERE
-clause), they will be expensive on the slaves too.</li>
-<li>For current timestamp and auto-increment values, the master also puts
-additional SET statements in the logs to make the statement have the same
-effect, so the slaves end up with the same values.</li>
-</ul>
-
-<p><strong>Row Based Replication</strong>:</p>
-
-<ul>
-<li>The statements executed on the master result in updated rows. The new full
-values for these rows are copied to the master logs.</li>
-<li>The slaves change their records for the rows they receive. The update is by
-primary key, and contains the new values for each column, so usually it’s very
-fast.</li>
-<li>Each updated row contains the entire row, not just the columns that were
-updated (unless the flag --binlog_row_image=minimal is used).</li>
-<li>The replication stream is harder to read, as it contains almost binary data,
-that don’t easily map to the original statements.</li>
-<li>There is a configurable limit on how many rows can be affected by one
-binlog event, so the master logs are not flooded.</li>
-<li>The format of the logs depends on the master schema: each row has a list of
-values, one value for each column. So if the master schema is different from
-the slave schema, updates will misbehave (exception being if slave has extra
-columns at the end).</li>
-<li>It is possible to revert to statement based replication for some commands to
-avoid these drawbacks (for instance for DELETE statements that affect a large
-number of rows).</li>
-<li>Schema changes always use statement based replication.</li>
-<li>If comments are added to a statement, they are stripped from the
-replication stream (as only rows are transmitted). There is a flag
---binlog_rows_query_log_events to add the original statement to each row
-update, but it is costly in terms of binlog size.</li>
-</ul>
-
-<p>For the longest time, MySQL replication has been single-threaded: only one
-statement is applied by the slaves at a time. Since the master applies more
-statements in parallel, replication can fall behind on the slaves fairly easily,
-under higher load. Even though the situation has improved (parallel slave
-apply), the slave replication speed is still a limiting factor for a lot of
-applications. Since row based replication achieves higher update rates on the
-slaves in most cases, it has been the only viable option for most performance
-sensitive applications.</p>
-
-<p>Schema changes however are not easy to achieve with row based
-replication. Adding columns can be done offline, but removing or changing
-columns cannot easily be done (there are multiple ways to achieve this, but they
-all have limitations or performance implications, and are not that easy to
-setup).</p>
-
-<p>Vitess helps by using statement based replication (therefore allowing complex
-schema changes), while at the same time simplifying the replication stream (so
-slaves can be fast), by rewriting Update statements.</p>
-
-<p>Then, with statement based replication, it becomes easier to perform offline
-advanced schema changes, or large data updates. Vitess’s solution is called
-schema swap.</p>
-
-<p>We plan to also support row based replication in the future, and adapt our tools
-to provide the same features when possible. See Appendix for our plan.</p>
-
-<h2 id="rewriting-update-statements">Rewriting Update Statements</h2>
-
-<p>Vitess rewrites ‘UPDATE’ SQL statements to always know what rows will be
-affected. For instance, this statement:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">UPDATE &lt;table&gt; SET &lt;set values&gt; WHERE &lt;clause&gt;
-</code></pre></div>
-<p>Will be rewritten into:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">SELECT &lt;primary key columns&gt; FROM &lt;table&gt; WHERE &lt;clause&gt; FOR UPDATE
-UPDATE &lt;table&gt; SET &lt;set values&gt; WHERE &lt;primary key columns&gt; IN &lt;result from previous SELECT&gt; /* primary key values: … */
-</code></pre></div>
-<p>With this rewrite in effect, we know exactly which rows are affected, by primary
-key, and we also document them as a SQL comment.</p>
-
-<p>The replication stream then doesn’t contain the expensive WHERE clauses, but
-only the UPDATE statements by primary key. In a sense, it is combining the best
-of row based and statement based replication: the slaves only do primary key
-based updates, but the replication stream is very friendly for schema changes.</p>
-
-<p>Also, Vitess adds comments to the rewritten statements that identify the primary
-key affected by that statement. This allows us to produce an Update Stream (see
-section below).</p>
-
-<h2 id="vitess-schema-swap">Vitess Schema Swap</h2>
-
-<p>Within YouTube, we also use a combination of statement based replication and
-backups to apply long-running schema changes without disrupting ongoing
-operations. See the <a href="/user-guide/schema-swap.html">schema swap tutorial</a>
-for a detailed example.</p>
-
-<p>This operation, which is called <strong>schema swap</strong>, works as follows:</p>
-
-<ul>
-<li>Pick a slave, take it out of service. It is not used by clients any more.</li>
-<li>Apply whatever schema or large data change is needed, on the slave.</li>
-<li>Take a backup of that slave.</li>
-<li>On all the other slaves, one at a time, take them out of service, restore the
-backup, catch up on replication, put them back into service.</li>
-<li>When all slaves are done, reparent to a slave that has applied the change.</li>
-<li>The old master can then be restored from a backup too, and put back into
-service.</li>
-</ul>
-
-<p>With this process, the only guarantee we need is for the change (schema or data)
-to be backward compatible: the clients won’t know if they talk to a server
-that has applied the change yet or not. This is usually fairly easy to deal
-with:</p>
-
-<ul>
-<li>When adding a column, clients cannot use it until the schema swap is done.</li>
-<li>When removing a column, all clients must stop referring to it before the
-schema swap begins.</li>
-<li>A column rename is still tricky: the best way to do it is to add a new column
-with the new name in one schema swap, then change the client to populate both
-(and backfill the values), then change the client again to use the new
-column only, then use another schema swap to remove the original column.</li>
-<li>A whole bunch of operations are really easy to perform though: index changes,
-optimize table, …</li>
-</ul>
-
-<p>Note the real change is only applied to one instance. We then rely on the backup
-/ restore process to propagate the change. This is a very good improvement from
-letting the changes through the replication stream, where they are applied to
-all hosts, not just one. This is also a very good improvement over the industry
-practice of online schema change, which also must run on all hosts.
-Since Vitess’s backup / restore and reparent processes
-are very reliable (they need to be reliable on their own, independently of this
-process!), this does not add much more complexity to a running system.</p>
-
-<h2 id="update-stream">Update Stream</h2>
-
-<p>Since the SBR replication stream also contains comments of which primary key is
-affected by a change, it is possible to look at the replication stream and know
-exactly what objects have changed. This Vitess feature is
-called <a href="/user-guide/update-stream.html">Update Stream</a>.</p>
-
-<p>By subscribing to the Update Stream for a given shard, one can know what values
-change. This stream can be used to create a stream of data changes (export to an
-Apache Kafka for instance), or even invalidate an application layer cache.</p>
-
-<p>Note: the Update Stream only reliably contains the primary key values of the
-rows that have changed, not the actual values for all columns. To get these
-values, it is necessary to re-query the database.</p>
-
-<p>We have plans to make this <a href="/user-guide/update-stream.html">Update Stream</a>
-feature more consistent, very resilient, fast, and transparent to sharding.</p>
-
-<h2 id="semi-sync">Semi-Sync</h2>
-
-<p>If you tell Vitess to enforce semi-sync
-(<a href="https://dev.mysql.com/doc/refman/5.7/en/replication-semisync.html">semisynchronous replication</a>)
-by passing the <code class="prettyprint">-enable_semi_sync</code> flag to vttablets,
-then the following will happen:</p>
-
-<ul>
-<li><p>The master will only accept writes if it has at least one slave connected
-and sending semi-sync ACK. It will never fall back to asynchronous
-(not requiring ACKs) because of timeouts while waiting for ACK, nor because
-of having zero slaves connected (although it will fall back to asynchronous
-in case of shutdown, abrupt or graceful).</p>
-
-<p>This is important to prevent split brain (or alternate futures) in case of a
-network partition. If we can verify all slaves have stopped replicating,
-we know the old master is not accepting writes, even if we are unable to
-contact the old master itself.</p></li>
-<li><p>Slaves of <em>replica</em> type will send semi-sync ACK. Slaves of <em>rdonly</em> type will
-<strong>not</strong> send ACK. This is because rdonly slaves are not eligible to be
-promoted to master, so we want to avoid the case where a rdonly slave is the
-single best candidate for election at the time of master failure (though
-a split brain is possible when all rdonly slaves have transactions that
-none of replica slaves have).</p></li>
-</ul>
-
-<p>These behaviors combine to give you the property that, in case of master
-failure, there is at least one other <em>replica</em> type slave that has every
-transaction that was ever reported to clients as having completed.
-You can then (<a href="http://vitess.io/reference/vtctl.html#emergencyreparentshard">manually</a>,
-or with an automated tool like <a href="https://github.com/github/orchestrator">Orchestrator</a>)
-pick the replica that is farthest ahead in GTID position and promote that to be
-the new master.</p>
-
-<p>Thus, you can survive sudden master failure without losing any transactions that
-were reported to clients as completed. In MySQL 5.7+, this guarantee is
-strengthened slightly to preventing loss of any transactions that were ever
-<strong>committed</strong> on the original master, eliminating so-called
-<a href="http://bugs.mysql.com/bug.php?id=62174">phantom reads</a>.</p>
-
-<p>On the other hand these behaviors also give a requirement that each shard must
-have at least 2 tablets with type <em>replica</em> (with addition of the master that
-can be demoted to type <em>replica</em> this gives a minimum of 3 tablets with initial
-type <em>replica</em>). This will allow for the master to have a semi-sync acker when
-one of the <em>replica</em> tablets is down for any reason (for a version update,
-machine reboot, schema swap or anything else).</p>
-
-<p>With regard to replication lag, note that this does <strong>not</strong> guarantee there is
-always at least one <em>replica</em> type slave from which queries will always return
-up-to-date results. Semi-sync guarantees that at least one slave has the
-transaction in its relay log, but it has not necessarily been applied yet.
-The only way to guarantee a fully up-to-date read is to send the request to the
-master.</p>
-
-<h2 id="appendix-adding-support-for-rbr-in-vitess">Appendix: Adding support for RBR in Vitess</h2>
-
-<p>We are in the process of adding support for RBR in Vitess.</p>
-
-<p>See <a href="/user-guide/row-based-replication.html">this document</a>) for more information.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/vitess-replication/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/vitess-replication/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/vitess-replication/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/vitess-replication/"</script>
 </html>
diff --git a/docs/user-guide/vitess-replication/index.html b/docs/user-guide/vitess-replication/index.html
new file mode 100644
index 00000000000..9640e9ab901
--- /dev/null
+++ b/docs/user-guide/vitess-replication/index.html
@@ -0,0 +1,568 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Vitess and Replication | Vitess</title>
+<meta property="og:title" content="Vitess and Replication" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/vitess-replication/" />
+<meta property="og:url" content="http://vitess.io/user-guide/vitess-replication/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/vitess-replication/","headline":"Vitess and Replication","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Vitess and Replication</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="vitess-mysql-replication-and-schema-changes">Vitess, MySQL Replication, and Schema Changes</h1>
+
+<h2 id="statement-vs-row-based-replication">Statement vs Row Based Replication</h2>
+
+<p>MySQL supports two primary modes of replication in its binary logs: statement or
+row based.</p>
+
+<p><strong>Statement Based Replication</strong>:</p>
+
+<ul>
+<li>The statements executed on the master are copied almost as-is in the master
+logs.</li>
+<li>The slaves replay these statements as is.</li>
+<li>If the statements are expensive (especially an update with a complicated WHERE
+clause), they will be expensive on the slaves too.</li>
+<li>For current timestamp and auto-increment values, the master also puts
+additional SET statements in the logs to make the statement have the same
+effect, so the slaves end up with the same values.</li>
+</ul>
+
+<p><strong>Row Based Replication</strong>:</p>
+
+<ul>
+<li>The statements executed on the master result in updated rows. The new full
+values for these rows are copied to the master logs.</li>
+<li>The slaves change their records for the rows they receive. The update is by
+primary key, and contains the new values for each column, so usually it’s very
+fast.</li>
+<li>Each updated row contains the entire row, not just the columns that were
+updated (unless the flag --binlog_row_image=minimal is used).</li>
+<li>The replication stream is harder to read, as it contains almost binary data,
+that don’t easily map to the original statements.</li>
+<li>There is a configurable limit on how many rows can be affected by one
+binlog event, so the master logs are not flooded.</li>
+<li>The format of the logs depends on the master schema: each row has a list of
+values, one value for each column. So if the master schema is different from
+the slave schema, updates will misbehave (exception being if slave has extra
+columns at the end).</li>
+<li>It is possible to revert to statement based replication for some commands to
+avoid these drawbacks (for instance for DELETE statements that affect a large
+number of rows).</li>
+<li>Schema changes always use statement based replication.</li>
+<li>If comments are added to a statement, they are stripped from the
+replication stream (as only rows are transmitted). There is a flag
+--binlog_rows_query_log_events to add the original statement to each row
+update, but it is costly in terms of binlog size.</li>
+</ul>
+
+<p>For the longest time, MySQL replication has been single-threaded: only one
+statement is applied by the slaves at a time. Since the master applies more
+statements in parallel, replication can fall behind on the slaves fairly easily,
+under higher load. Even though the situation has improved (parallel slave
+apply), the slave replication speed is still a limiting factor for a lot of
+applications. Since row based replication achieves higher update rates on the
+slaves in most cases, it has been the only viable option for most performance
+sensitive applications.</p>
+
+<p>Schema changes however are not easy to achieve with row based
+replication. Adding columns can be done offline, but removing or changing
+columns cannot easily be done (there are multiple ways to achieve this, but they
+all have limitations or performance implications, and are not that easy to
+setup).</p>
+
+<p>Vitess helps by using statement based replication (therefore allowing complex
+schema changes), while at the same time simplifying the replication stream (so
+slaves can be fast), by rewriting Update statements.</p>
+
+<p>Then, with statement based replication, it becomes easier to perform offline
+advanced schema changes, or large data updates. Vitess’s solution is called
+schema swap.</p>
+
+<p>We plan to also support row based replication in the future, and adapt our tools
+to provide the same features when possible. See Appendix for our plan.</p>
+
+<h2 id="rewriting-update-statements">Rewriting Update Statements</h2>
+
+<p>Vitess rewrites ‘UPDATE’ SQL statements to always know what rows will be
+affected. For instance, this statement:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">UPDATE &lt;table&gt; SET &lt;set values&gt; WHERE &lt;clause&gt;
+</code></pre></div>
+<p>Will be rewritten into:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">SELECT &lt;primary key columns&gt; FROM &lt;table&gt; WHERE &lt;clause&gt; FOR UPDATE
+UPDATE &lt;table&gt; SET &lt;set values&gt; WHERE &lt;primary key columns&gt; IN &lt;result from previous SELECT&gt; /* primary key values: … */
+</code></pre></div>
+<p>With this rewrite in effect, we know exactly which rows are affected, by primary
+key, and we also document them as a SQL comment.</p>
+
+<p>The replication stream then doesn’t contain the expensive WHERE clauses, but
+only the UPDATE statements by primary key. In a sense, it is combining the best
+of row based and statement based replication: the slaves only do primary key
+based updates, but the replication stream is very friendly for schema changes.</p>
+
+<p>Also, Vitess adds comments to the rewritten statements that identify the primary
+key affected by that statement. This allows us to produce an Update Stream (see
+section below).</p>
+
+<h2 id="vitess-schema-swap">Vitess Schema Swap</h2>
+
+<p>Within YouTube, we also use a combination of statement based replication and
+backups to apply long-running schema changes without disrupting ongoing
+operations. See the <a href="/user-guide/schema-swap/">schema swap tutorial</a>
+for a detailed example.</p>
+
+<p>This operation, which is called <strong>schema swap</strong>, works as follows:</p>
+
+<ul>
+<li>Pick a slave, take it out of service. It is not used by clients any more.</li>
+<li>Apply whatever schema or large data change is needed, on the slave.</li>
+<li>Take a backup of that slave.</li>
+<li>On all the other slaves, one at a time, take them out of service, restore the
+backup, catch up on replication, put them back into service.</li>
+<li>When all slaves are done, reparent to a slave that has applied the change.</li>
+<li>The old master can then be restored from a backup too, and put back into
+service.</li>
+</ul>
+
+<p>With this process, the only guarantee we need is for the change (schema or data)
+to be backward compatible: the clients won’t know if they talk to a server
+that has applied the change yet or not. This is usually fairly easy to deal
+with:</p>
+
+<ul>
+<li>When adding a column, clients cannot use it until the schema swap is done.</li>
+<li>When removing a column, all clients must stop referring to it before the
+schema swap begins.</li>
+<li>A column rename is still tricky: the best way to do it is to add a new column
+with the new name in one schema swap, then change the client to populate both
+(and backfill the values), then change the client again to use the new
+column only, then use another schema swap to remove the original column.</li>
+<li>A whole bunch of operations are really easy to perform though: index changes,
+optimize table, …</li>
+</ul>
+
+<p>Note the real change is only applied to one instance. We then rely on the backup
+/ restore process to propagate the change. This is a very good improvement from
+letting the changes through the replication stream, where they are applied to
+all hosts, not just one. This is also a very good improvement over the industry
+practice of online schema change, which also must run on all hosts.
+Since Vitess’s backup / restore and reparent processes
+are very reliable (they need to be reliable on their own, independently of this
+process!), this does not add much more complexity to a running system.</p>
+
+<h2 id="update-stream">Update Stream</h2>
+
+<p>Since the SBR replication stream also contains comments of which primary key is
+affected by a change, it is possible to look at the replication stream and know
+exactly what objects have changed. This Vitess feature is
+called <a href="/user-guide/update-stream/">Update Stream</a>.</p>
+
+<p>By subscribing to the Update Stream for a given shard, one can know what values
+change. This stream can be used to create a stream of data changes (export to an
+Apache Kafka for instance), or even invalidate an application layer cache.</p>
+
+<p>Note: the Update Stream only reliably contains the primary key values of the
+rows that have changed, not the actual values for all columns. To get these
+values, it is necessary to re-query the database.</p>
+
+<p>We have plans to make this <a href="/user-guide/update-stream/">Update Stream</a>
+feature more consistent, very resilient, fast, and transparent to sharding.</p>
+
+<h2 id="semi-sync">Semi-Sync</h2>
+
+<p>If you tell Vitess to enforce semi-sync
+(<a href="https://dev.mysql.com/doc/refman/5.7/en/replication-semisync.html">semisynchronous replication</a>)
+by passing the <code class="prettyprint">-enable_semi_sync</code> flag to vttablets,
+then the following will happen:</p>
+
+<ul>
+<li><p>The master will only accept writes if it has at least one slave connected
+and sending semi-sync ACK. It will never fall back to asynchronous
+(not requiring ACKs) because of timeouts while waiting for ACK, nor because
+of having zero slaves connected (although it will fall back to asynchronous
+in case of shutdown, abrupt or graceful).</p>
+
+<p>This is important to prevent split brain (or alternate futures) in case of a
+network partition. If we can verify all slaves have stopped replicating,
+we know the old master is not accepting writes, even if we are unable to
+contact the old master itself.</p></li>
+<li><p>Slaves of <em>replica</em> type will send semi-sync ACK. Slaves of <em>rdonly</em> type will
+<strong>not</strong> send ACK. This is because rdonly slaves are not eligible to be
+promoted to master, so we want to avoid the case where a rdonly slave is the
+single best candidate for election at the time of master failure (though
+a split brain is possible when all rdonly slaves have transactions that
+none of replica slaves have).</p></li>
+</ul>
+
+<p>These behaviors combine to give you the property that, in case of master
+failure, there is at least one other <em>replica</em> type slave that has every
+transaction that was ever reported to clients as having completed.
+You can then (<a href="/reference/vtctl/#emergencyreparentshard">manually</a>,
+or with an automated tool like <a href="https://github.com/github/orchestrator">Orchestrator</a>)
+pick the replica that is farthest ahead in GTID position and promote that to be
+the new master.</p>
+
+<p>Thus, you can survive sudden master failure without losing any transactions that
+were reported to clients as completed. In MySQL 5.7+, this guarantee is
+strengthened slightly to preventing loss of any transactions that were ever
+<strong>committed</strong> on the original master, eliminating so-called
+<a href="http://bugs.mysql.com/bug.php?id=62174">phantom reads</a>.</p>
+
+<p>On the other hand these behaviors also give a requirement that each shard must
+have at least 2 tablets with type <em>replica</em> (with addition of the master that
+can be demoted to type <em>replica</em> this gives a minimum of 3 tablets with initial
+type <em>replica</em>). This will allow for the master to have a semi-sync acker when
+one of the <em>replica</em> tablets is down for any reason (for a version update,
+machine reboot, schema swap or anything else).</p>
+
+<p>With regard to replication lag, note that this does <strong>not</strong> guarantee there is
+always at least one <em>replica</em> type slave from which queries will always return
+up-to-date results. Semi-sync guarantees that at least one slave has the
+transaction in its relay log, but it has not necessarily been applied yet.
+The only way to guarantee a fully up-to-date read is to send the request to the
+master.</p>
+
+<h2 id="appendix-adding-support-for-rbr-in-vitess">Appendix: Adding support for RBR in Vitess</h2>
+
+<p>We are in the process of adding support for RBR in Vitess.</p>
+
+<p>See <a href="/user-guide/row-based-replication/">this document</a>) for more information.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/vitess-sequences.html b/docs/user-guide/vitess-sequences.html
index adec88ecc08..f407dab20ca 100644
--- a/docs/user-guide/vitess-sequences.html
+++ b/docs/user-guide/vitess-sequences.html
@@ -1,523 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / Vitess Sequences</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / Vitess Sequences"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>Vitess Sequences</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="vitess-sequences">Vitess Sequences</h1>
-
-<p>This document describes the Vitess Sequences feature, and how to use it.</p>
-
-<h2 id="motivation">Motivation</h2>
-
-<p>MySQL provides the <code class="prettyprint">auto-increment</code> feature to assign monotonically incrementing
-IDs to a column in a table. However, when a table is sharded across multiple
-instances, maintaining the same feature is a lot more tricky.</p>
-
-<p>Vitess Sequences fill that gap:</p>
-
-<ul>
-<li><p>Inspired from the usual SQL sequences (implemented in different ways by
-Oracle, SQL Server and PostgreSQL).</p></li>
-<li><p>Very high throughput for ID creation, using a configurable in-memory block allocation.</p></li>
-<li><p>Transparent use, similar to MySQL auto-increment: when the field is omitted in
-an <code class="prettyprint">insert</code> statement, the next sequence value is used.</p></li>
-</ul>
-
-<h2 id="when-not-to-use-auto-increment">When <em>not</em> to Use Auto-Increment</h2>
-
-<p>Before we go any further, an auto-increment column has limitations and
-drawbacks. let&#39;s explore this topic a bit here.</p>
-
-<h3 id="security-considerations">Security Considerations</h3>
-
-<p>Using auto-increment can leak confidential information about a service. Let&#39;s
-take the example of a web site that store user information, and assign user IDs
-to its users as they sign in. The user ID is then passed in a cookie for all
-subsequent requests.</p>
-
-<p>The client then knows their own user ID. It is now possible to:</p>
-
-<ul>
-<li><p>Try other user IDs and expose potential system vulnerabilities.</p></li>
-<li><p>Get an approximate number of users of the system (using the user ID).</p></li>
-<li><p>Get an approximate number of sign-ins during a week (creating two accounts a
-week apart, and diffing the two IDs).</p></li>
-</ul>
-
-<p>Auto-incrementing IDs should be reserved for either internal applications, or
-exposed to the clients only when safe.</p>
-
-<h3 id="alternatives">Alternatives</h3>
-
-<p>Alternative to auto-incrementing IDs are:</p>
-
-<ul>
-<li><p>use a 64 bits random generator number. Try to insert a new row with that
-ID. If taken (because the statement returns an integrity error), try another
-ID.</p></li>
-<li><p>use a UUID scheme, and generate trully unique IDs.</p></li>
-</ul>
-
-<p>Now that this is out of the way, let&#39;s get to MySQL auto-increment.</p>
-
-<h2 id="mysql-auto-increment-feature">MySQL Auto-increment Feature</h2>
-
-<p>Let&#39;s start by looking at the MySQL auto-increment feature:</p>
-
-<ul>
-<li><p>A row that has no value for the auto-increment value will be given the next ID.</p></li>
-<li><p>The current value is stored in the table metadata.</p></li>
-<li><p>Values may be ‘burned’ (by rolled back transactions).</p></li>
-<li><p>Inserting a row with a given value that is higher than the current value will
-set the current value.</p></li>
-<li><p>The value used by the master in a statement is sent in the replication stream,
-so slaves will have the same value when re-playing the stream.</p></li>
-<li><p>There is no strict guarantee about ordering: two concurrent statements may
-have their commit time in one order, but their auto-incrementing ID in the
-opposite order (as the value for the ID is reserved when the statement is
-issued, not when the transaction is committed).</p></li>
-<li><p>MySQL has multiple options for auto-increment, like only using every N number
-(for multi-master configurations), or performance related features (locking
-that table’s current ID may have concurrency implications).</p></li>
-<li><p>When inserting a row in a table with an auto-increment column, if the value
-for the auto-increment row is not set, the value for the column is returned to
-the client alongside the statement result.</p></li>
-</ul>
-
-<h2 id="vitess-sequences">Vitess Sequences</h2>
-
-<p>An early design was to use a single unsharded database and a table with an
-auto-increment value to generate new values. However, this has serious
-limitations, in particular throughtput, and storing one entry for each value in
-that table, for no reason.</p>
-
-<p>So we decided instead to base sequences on a MySQL table, and use a single value
-in that table to describe which values the sequence should have next. To
-increase performance, we also support block allocation of IDs: each update to
-the MySQL table is only done every N IDs (N being configurable), and in between
-only memory structures in vttablet are updated, making the QPS only limited by
-RPC latency.</p>
-
-<p>In a sharded keyspace, a Sequence&#39;s data is only present in one shard (but its
-schema is in all the shards). We configure which shard has the data by using a
-keyspace_id for the sequence, and route all sequence traffic to the shard that
-hold that keyspace_id. That way we are completely compatible with any horizontal
-resharding.</p>
-
-<p>The final goal is to have Sequences supported with SQL statements, like:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="cm">/* DDL support */</span>
-<span class="k">CREATE</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
-
-<span class="k">SELECT</span> <span class="k">NEXT</span> <span class="n">VALUE</span> <span class="k">FROM</span> <span class="n">my_sequence</span><span class="p">;</span>
-
-<span class="k">ALTER</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span> <span class="p">...;</span>
-
-<span class="k">DROP</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
-
-<span class="k">SHOW</span> <span class="k">CREATE</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
-</code></pre></div>
-<p>In the current implementation, we support the query access to Sequences, but not
-the administration commands yet.</p>
-
-<h3 id="creating-a-sequence">Creating a Sequence</h3>
-
-<p><em>Note</em>: The names in this section are extracted from the examples/demo sample
-application.</p>
-
-<p>To create a Sequence, a backing table must first be created. The columns for
-that table have to be respected.</p>
-
-<p>This is an example:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="k">create</span> <span class="k">table</span> <span class="n">user_seq</span><span class="p">(</span><span class="n">id</span> <span class="nb">int</span><span class="p">,</span> <span class="n">next_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">cache</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">id</span><span class="p">))</span> <span class="k">comment</span> <span class="s1">&#39;vitess_sequence&#39;</span><span class="p">;</span>
-</code></pre></div>
-<p>Then, the Sequence has to be define in the VSchema for that keyspace:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span>
-  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
-  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;user_seq&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;sequence&quot;</span>
-    <span class="p">},</span>
-    <span class="err">...</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-</code></pre></div>
-<p>And the table it is going to be using it can also reference the Sequence in its VSchema:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span>
-  <span class="err">...</span>
-  <span class="nt">&quot;tables&quot;</span> <span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
-           <span class="err">...</span>
-      <span class="p">],</span>
-      <span class="nt">&quot;auto_increment&quot;</span><span class="p">:</span> <span class="p">{</span>
-        <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span><span class="p">,</span>
-        <span class="nt">&quot;sequence&quot;</span><span class="p">:</span> <span class="s2">&quot;user_seq&quot;</span>
-      <span class="p">}</span>
-    <span class="p">},</span>
-</code></pre></div>
-<p>After this done (and the Schema has been reloaded on master tablet, and the
-VSchema has been pushed), the sequence can be used.</p>
-
-<h3 id="accessing-a-sequence">Accessing a Sequence</h3>
-
-<p>If a Sequence is used to fill in a column for a table, nothing further needs to
-be done. Just sending no value for the column will make vtgate insert the next
-Sequence value in its place.</p>
-
-<p>It is also possible to access the Sequence directly with the following SQL constructs:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="cm">/* Returns the next value for the sequence */</span>
-<span class="k">select</span> <span class="k">next</span> <span class="n">value</span> <span class="k">from</span> <span class="n">my_sequence</span><span class="p">;</span>
-
-<span class="cm">/* Returns the next value for the sequence, and also reserve 4 values after that. */</span>
-<span class="k">select</span> <span class="k">next</span> <span class="mi">5</span> <span class="k">values</span> <span class="k">from</span> <span class="n">my_sequence</span><span class="p">;</span>
-</code></pre></div>
-<h2 id="to-do-list">TO-DO List</h2>
-
-<h3 id="ddl-support">DDL Support</h3>
-
-<p>We want to add DDL support for sequences, as previously mentioned:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="k">CREATE</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
-
-<span class="k">ALTER</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span> <span class="p">...;</span>
-
-<span class="k">DROP</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
-
-<span class="k">SHOW</span> <span class="k">CREATE</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
-</code></pre></div>
-<p>But for now, the Sequence backing table has to be created and managed using the
-usual schema management features, with the right column definitions and table comment.</p>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/vitess-sequences/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/vitess-sequences/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/vitess-sequences/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/vitess-sequences/"</script>
 </html>
diff --git a/docs/user-guide/vitess-sequences/index.html b/docs/user-guide/vitess-sequences/index.html
new file mode 100644
index 00000000000..f6dc319621b
--- /dev/null
+++ b/docs/user-guide/vitess-sequences/index.html
@@ -0,0 +1,532 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>Vitess Sequences | Vitess</title>
+<meta property="og:title" content="Vitess Sequences" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/vitess-sequences/" />
+<meta property="og:url" content="http://vitess.io/user-guide/vitess-sequences/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/vitess-sequences/","headline":"Vitess Sequences","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>Vitess Sequences</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="vitess-sequences">Vitess Sequences</h1>
+
+<p>This document describes the Vitess Sequences feature, and how to use it.</p>
+
+<h2 id="motivation">Motivation</h2>
+
+<p>MySQL provides the <code class="prettyprint">auto-increment</code> feature to assign monotonically incrementing
+IDs to a column in a table. However, when a table is sharded across multiple
+instances, maintaining the same feature is a lot more tricky.</p>
+
+<p>Vitess Sequences fill that gap:</p>
+
+<ul>
+<li><p>Inspired from the usual SQL sequences (implemented in different ways by
+Oracle, SQL Server and PostgreSQL).</p></li>
+<li><p>Very high throughput for ID creation, using a configurable in-memory block allocation.</p></li>
+<li><p>Transparent use, similar to MySQL auto-increment: when the field is omitted in
+an <code class="prettyprint">insert</code> statement, the next sequence value is used.</p></li>
+</ul>
+
+<h2 id="when-not-to-use-auto-increment">When <em>not</em> to Use Auto-Increment</h2>
+
+<p>Before we go any further, an auto-increment column has limitations and
+drawbacks. let&#39;s explore this topic a bit here.</p>
+
+<h3 id="security-considerations">Security Considerations</h3>
+
+<p>Using auto-increment can leak confidential information about a service. Let&#39;s
+take the example of a web site that store user information, and assign user IDs
+to its users as they sign in. The user ID is then passed in a cookie for all
+subsequent requests.</p>
+
+<p>The client then knows their own user ID. It is now possible to:</p>
+
+<ul>
+<li><p>Try other user IDs and expose potential system vulnerabilities.</p></li>
+<li><p>Get an approximate number of users of the system (using the user ID).</p></li>
+<li><p>Get an approximate number of sign-ins during a week (creating two accounts a
+week apart, and diffing the two IDs).</p></li>
+</ul>
+
+<p>Auto-incrementing IDs should be reserved for either internal applications, or
+exposed to the clients only when safe.</p>
+
+<h3 id="alternatives">Alternatives</h3>
+
+<p>Alternative to auto-incrementing IDs are:</p>
+
+<ul>
+<li><p>use a 64 bits random generator number. Try to insert a new row with that
+ID. If taken (because the statement returns an integrity error), try another
+ID.</p></li>
+<li><p>use a UUID scheme, and generate trully unique IDs.</p></li>
+</ul>
+
+<p>Now that this is out of the way, let&#39;s get to MySQL auto-increment.</p>
+
+<h2 id="mysql-auto-increment-feature">MySQL Auto-increment Feature</h2>
+
+<p>Let&#39;s start by looking at the MySQL auto-increment feature:</p>
+
+<ul>
+<li><p>A row that has no value for the auto-increment value will be given the next ID.</p></li>
+<li><p>The current value is stored in the table metadata.</p></li>
+<li><p>Values may be ‘burned’ (by rolled back transactions).</p></li>
+<li><p>Inserting a row with a given value that is higher than the current value will
+set the current value.</p></li>
+<li><p>The value used by the master in a statement is sent in the replication stream,
+so slaves will have the same value when re-playing the stream.</p></li>
+<li><p>There is no strict guarantee about ordering: two concurrent statements may
+have their commit time in one order, but their auto-incrementing ID in the
+opposite order (as the value for the ID is reserved when the statement is
+issued, not when the transaction is committed).</p></li>
+<li><p>MySQL has multiple options for auto-increment, like only using every N number
+(for multi-master configurations), or performance related features (locking
+that table’s current ID may have concurrency implications).</p></li>
+<li><p>When inserting a row in a table with an auto-increment column, if the value
+for the auto-increment row is not set, the value for the column is returned to
+the client alongside the statement result.</p></li>
+</ul>
+
+<h2 id="vitess-sequences">Vitess Sequences</h2>
+
+<p>An early design was to use a single unsharded database and a table with an
+auto-increment value to generate new values. However, this has serious
+limitations, in particular throughtput, and storing one entry for each value in
+that table, for no reason.</p>
+
+<p>So we decided instead to base sequences on a MySQL table, and use a single value
+in that table to describe which values the sequence should have next. To
+increase performance, we also support block allocation of IDs: each update to
+the MySQL table is only done every N IDs (N being configurable), and in between
+only memory structures in vttablet are updated, making the QPS only limited by
+RPC latency.</p>
+
+<p>In a sharded keyspace, a Sequence&#39;s data is only present in one shard (but its
+schema is in all the shards). We configure which shard has the data by using a
+keyspace_id for the sequence, and route all sequence traffic to the shard that
+hold that keyspace_id. That way we are completely compatible with any horizontal
+resharding.</p>
+
+<p>The final goal is to have Sequences supported with SQL statements, like:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="cm">/* DDL support */</span>
+<span class="k">CREATE</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
+
+<span class="k">SELECT</span> <span class="k">NEXT</span> <span class="n">VALUE</span> <span class="k">FROM</span> <span class="n">my_sequence</span><span class="p">;</span>
+
+<span class="k">ALTER</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span> <span class="p">...;</span>
+
+<span class="k">DROP</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
+
+<span class="k">SHOW</span> <span class="k">CREATE</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
+</code></pre></div>
+<p>In the current implementation, we support the query access to Sequences, but not
+the administration commands yet.</p>
+
+<h3 id="creating-a-sequence">Creating a Sequence</h3>
+
+<p><em>Note</em>: The names in this section are extracted from the examples/demo sample
+application.</p>
+
+<p>To create a Sequence, a backing table must first be created. The columns for
+that table have to be respected.</p>
+
+<p>This is an example:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="k">create</span> <span class="k">table</span> <span class="n">user_seq</span><span class="p">(</span><span class="n">id</span> <span class="nb">int</span><span class="p">,</span> <span class="n">next_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">cache</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">id</span><span class="p">))</span> <span class="k">comment</span> <span class="s1">&#39;vitess_sequence&#39;</span><span class="p">;</span>
+</code></pre></div>
+<p>Then, the Sequence has to be define in the VSchema for that keyspace:</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;user_seq&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;sequence&quot;</span>
+    <span class="p">},</span>
+    <span class="err">...</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</code></pre></div>
+<p>And the table it is going to be using it can also reference the Sequence in its VSchema:</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span>
+  <span class="err">...</span>
+  <span class="nt">&quot;tables&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
+           <span class="err">...</span>
+      <span class="p">],</span>
+      <span class="nt">&quot;auto_increment&quot;</span><span class="p">:</span> <span class="p">{</span>
+        <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span><span class="p">,</span>
+        <span class="nt">&quot;sequence&quot;</span><span class="p">:</span> <span class="s2">&quot;user_seq&quot;</span>
+      <span class="p">}</span>
+    <span class="p">},</span>
+</code></pre></div>
+<p>After this done (and the Schema has been reloaded on master tablet, and the
+VSchema has been pushed), the sequence can be used.</p>
+
+<h3 id="accessing-a-sequence">Accessing a Sequence</h3>
+
+<p>If a Sequence is used to fill in a column for a table, nothing further needs to
+be done. Just sending no value for the column will make vtgate insert the next
+Sequence value in its place.</p>
+
+<p>It is also possible to access the Sequence directly with the following SQL constructs:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="cm">/* Returns the next value for the sequence */</span>
+<span class="k">select</span> <span class="k">next</span> <span class="n">value</span> <span class="k">from</span> <span class="n">my_sequence</span><span class="p">;</span>
+
+<span class="cm">/* Returns the next value for the sequence, and also reserve 4 values after that. */</span>
+<span class="k">select</span> <span class="k">next</span> <span class="mi">5</span> <span class="k">values</span> <span class="k">from</span> <span class="n">my_sequence</span><span class="p">;</span>
+</code></pre></div>
+<h2 id="to-do-list">TO-DO List</h2>
+
+<h3 id="ddl-support">DDL Support</h3>
+
+<p>We want to add DDL support for sequences, as previously mentioned:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="k">CREATE</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
+
+<span class="k">ALTER</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span> <span class="p">...;</span>
+
+<span class="k">DROP</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
+
+<span class="k">SHOW</span> <span class="k">CREATE</span> <span class="n">SEQUENCE</span> <span class="n">my_sequence</span><span class="p">;</span>
+</code></pre></div>
+<p>But for now, the Sequence backing table has to be created and managed using the
+usual schema management features, with the right column definitions and table comment.</p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/user-guide/vschema.html b/docs/user-guide/vschema.html
index 3ae5309f6f3..8304a374a9e 100644
--- a/docs/user-guide/vschema.html
+++ b/docs/user-guide/vschema.html
@@ -1,753 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="https://schema.org/WebPage">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Vitess / VSchema User Guide</title>
-
-        <!-- Webfont -->
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-    
-    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
-
-    <!-- Bootstrap -->
-    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/css/site.css" />
-    <!-- Font Awesome icons -->
-    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
-          rel="stylesheet"
-          type="text/css">
-    
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
-
-
-    <!-- metadata -->
-    <meta name="og:title" content="Vitess / VSchema User Guide"/>
-    <meta name="og:image" content="/images/vitess_logo_with_border.svg"/>
-    <meta name="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL."/>
-
-    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
-
-    
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-60219601-1', 'auto');
-  ga('send', 'pageview');
-</script>
-
-    
-  </head>
-  <body class="docs" id="top_of_page">
-
-    <span id="toc-depth" data-toc-depth="h2,h3"></span>
-
-
-    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
-  <div class="container">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
-      </a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
-        <li><a href="http://blog.vitess.io">Blog</a></li>
-        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
-        <!-- Hide link to blog unless we have actual posts -->
-        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
-      </ul>
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-
-    
-<div id="masthead">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-9">
-        <h1>VSchema User Guide</h1>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container">
-    <div class="row scroll-margin" id="toc-content-row">
-    <div class="col-md-2" id="leftCol">
-      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
-                <li class="submenu">
-          <h4 class="arrow-r no-top-margin">Overview</h4>
-          <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Getting Started</h4>
-          <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
-              </ul>
-            </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">User Guide</h4>
-          <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
-              <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
-              </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
-              <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
-              </ul>
-            </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Reference Guides</h4>
-          <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Other Resources</h4>
-          <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
-            <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Contributing</h4>
-          <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
-          </ul>
-        </li>
-        <li class="submenu">
-          <h4 class="arrow-r">Internal</h4>
-          <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
-          </ul>
-        </li>
-
-        <div>
-          <form method="get" action="/search/">
-            <input id="search-form" name="q" type="text" placeholder="Search">
-          </form>
-        </div>
-
-      </ul>
-    </div>
-    <div class="col-md-3" id="rightCol">
-      <div class="nav nav-stacked" id="tocSidebar">
-        <div id="toc"></div>
-      </div>
-    </div>
-    <div class="col-md-7" id="centerCol">
-      <div id="centerTextCol">
-        <h1 id="vschema-user-guide">VSchema User Guide</h1>
-
-<p>VSchema stands for Vitess Schema. In contrast to a traditional database schema that contains metadata about tables, a VSchema contains metadata about how tables are organized across keyspaces and shards. Simply put, it contains the information needed to make Vitess look like a single database server.</p>
-
-<p>For example, the VSchema will contain the information about the sharding key for a sharded table. When the application issues a query with a WHERE clause that references the key, the VSchema information will be used to route the query to the appropriate shard.</p>
-
-<h2 id="sharding-model">Sharding Model</h2>
-
-<p>In Vitess, a <code class="prettyprint">keyspace</code> is sharded by <code class="prettyprint">keyspace ID</code> ranges. Each row is assigned a keyspace ID, which acts like a street address, and it determines the shard where the row lives. In some respect, one could say that the <code class="prettyprint">keyspace ID</code> is the equivalent of a NoSQL sharding key. However, there are some differences:</p>
-
-<ol>
-<li>The <code class="prettyprint">keyspace ID</code> is a concept that is internal to Vitess. The application does not need to know anything about it.</li>
-<li>There is no physical column that stores the actual <code class="prettyprint">keyspace ID</code>. This value is computed as needed.</li>
-</ol>
-
-<p>This difference is significant enough that we do not refer to the keyspace ID as the sharding key. we will later introduce the concept of a Primary Vindex which more closely ressembles the NoSQL sharding key.</p>
-
-<p>Mapping to a <code class="prettyprint">keyspace ID</code>, and then to a shard, gives us the flexibility to reshard the data with minimal disruption because the <code class="prettyprint">keyspace ID</code> of each row remains unchanged through the process.</p>
-
-<h2 id="vindex">Vindex</h2>
-
-<p>The Sharding Key is a concept that was introduced by NoSQL datastores. It is based on the fact that there is only one access path to the data, which is the Key. However, relational databases are more versatile about the data and their relationships. So, sharding a database by only designating a sharding key is often insufficient.</p>
-
-<p>If one were to draw an analogy, the indexes in a database would be the equivalent of the key in a NoSQL datastore, except that databases allow you to define multiple indexes per table, and there are many types of indexes. Extending this analogy to a sharded database results in different types of cross-shard indexes. In Vitess, these are called Vindexes.</p>
-
-<p>Simplistically stated, a Vindex provides a way to map a column value to a <code class="prettyprint">keyspace ID</code>. This mapping can be used to identify the location of a row. A variety of vindexes are available to choose from with different trade-offs, and you can choose one that best suits your needs.</p>
-
-<p>Vindexes offer many flexibilities:</p>
-
-<ul>
-<li>A table can have multiple Vindexes.</li>
-<li>Vindexes could be NonUnique, which allows a column value to yield multiple keyspace IDs.</li>
-<li>They could be a simple function or be based on a lookup table.</li>
-<li>They could be shared across multiple tables.</li>
-<li>Custom Vindexes can be plugged in, and Vitess will still know how to reshard using such Vindexes.</li>
-</ul>
-
-<h3 id="the-primary-vindex">The Primary Vindex</h3>
-
-<p>The Primary Vindex is analogous to a database primary key. Every sharded table must have one defined. A Primary Vindex must be unique: given an input value, it must produce a single keyspace ID. This unique mapping will be used at the time of insert to decide the target shard for a row. Conceptually, this is also equivalent to the NoSQL Sharding Key, and we often refer to the Primary Vindex as the Sharding Key.</p>
-
-<p>Uniqueness for a Primary Vindex does not mean that the column has to be a primary key or unique in the MySQL schema. You can have multiple rows that map to the same keyspace ID. The Vindex uniqueness constraint is only used to make sure that all rows for a keyspace ID live in the same shard.</p>
-
-<p>However, there is a subtle difference: NoSQL datastores let you choose the Sharding Key, but the Sharding Scheme is generally hardcoded in the engine. In Vitess, the choice of Vindex lets you control how a column value maps to a keyspace ID. In other words, a Primary Vindex in Vitess not only defines the Sharding Key, it also decides the Sharding Scheme.</p>
-
-<p>Vindexes come in many varieties. Some of them can be used as Primary Vindex, and others have different purposes. The following sections will describe their properties.</p>
-
-<h3 id="secondary-vindexes">Secondary Vindexes</h3>
-
-<p>Secondary Vindexes are additional vindexes you can define against other columns of a table offering you optimizations for WHERE clauses that do not use the Primary Vindex. Secondary Vindexes return a single or a limited set of <code class="prettyprint">keyspace IDs</code> which will allow VTGate to only target shards where the relevant data is present. In the absence of a Secondary Vindex, VTGate would have to send the query to all shards.</p>
-
-<p>Secondary Vindexes are also commonly known as cross-shard indexes. It is important to note that Secondary Vindexes are only for making routing decisions. The underlying database shards will most likely need traditional indexes on those same columns.</p>
-
-<h3 id="unique-and-nonunique-vindex">Unique and NonUnique Vindex</h3>
-
-<p>A Unique Vindex is one that yields at most one keyspace ID for a given input. Knowing that a Vindex is Unique is useful because VTGate can push down some complex queries into VTTablet if it knows that the scope of that query cannot exceed a shard. Uniqueness is also a prerequisite for a Vindex to be used as Primary Vindex.</p>
-
-<p>A NonUnique Vindex is analogous to a database non-unique index. It is a secondary index for searching by an alternate WHERE clause. An input value could yield multiple keyspace IDs, and rows could be matched from multiple shards. For example, if a table has a <code class="prettyprint">name</code> column that allows duplicates, you can define a cross-shard NonUnique Vindex for it, and this will let you efficiently search for users that match a certain <code class="prettyprint">name</code>.</p>
-
-<h3 id="functional-and-lookup-vindex">Functional and Lookup Vindex</h3>
-
-<p>A Functional Vindex is one where the column value to keyspace ID mapping is pre-established, typically through an algorithmic function. In contrast, a Lookup Vindex is one that gives you the ability to create an association between a value and a keyspace ID, and recall it later when needed.</p>
-
-<p>Typically, the Primary Vindex is Functional. In some cases, it is the identity function where the input value yields itself as the kesypace id. However, one could also choose other algorithms like hashing or mod functions.</p>
-
-<p>A Lookup Vindex is usually backed by a lookup table. This is analogous to the traditional database index, except that it is cross-shard. At the time of insert, the computed keyspace ID of the row is stored in the lookup table against the column value.</p>
-
-<h3 id="shared-vindexes">Shared Vindexes</h3>
-
-<p>Relational databases encourage normalization, which lets you split data into different tables to avoid duplication in the case of one-to-many relationships. In such cases, a key is shared between the two tables to indicate that the rows are related, aka <code class="prettyprint">Foreign Key</code>.</p>
-
-<p>In a sharded environment, it is often beneficial to keep those rows in the same shard. If a Lookup Vindex was created on the foreign key column of each of those tables, you would find that the backing tables would actually be identical. In such cases, Vitess lets you share a single Lookup Vindex for multiple tables. Of these, one of them is designated as the owner, which is responsible for creating and deleting these associations. The other tables just reuse these associations.</p>
-
-<p>Caveat: If you delete a row from the owner table, Vitess will not perform cascading deletes. This is mainly for efficiency reasons; The application is likely capable of doing this more efficiently.</p>
-
-<p>Functional Vindexes can be also be shared. However, there is no concept of ownership because the column to keyspace ID mapping is pre-established.</p>
-
-<h3 id="orthogonality">Orthogonality</h3>
-
-<p>The previously described properties are mostly orthogonal. Combining them gives rise to the following valid categories:</p>
-
-<ul>
-<li><strong>Functional Unique</strong>: This is the most popular category because it is the one best suited to be a Primary Vindex.</li>
-<li><strong>Functional NonUnique</strong>: There are currently no use cases that need this category.</li>
-<li><strong>Lookup Unique Owned</strong>: This gets used for optimizing high QPS queries that do not use the Primary Vindex columns in their WHERE clause. There is a price to pay: You incur an extra write to the lookup table for insert and delete operations, and an extra lookup for read operations. However, it is worth it if you do not want these high QPS queries to be sent to all shards.</li>
-<li><strong>Lookup Unique Unowned</strong>: This category is used as an optimization as described in the Shared Vindexes section.</li>
-<li><strong>Lookup NonUnique Owned</strong>: This gets used for high QPS queries on columns that are non-unique.</li>
-<li><strong>Lookup NonUnique Unowned</strong>: You would rarely have to use this category because it is unlikely that you will be using a column as foreign key that is not unique within a shard. But it is theoretically possible.</li>
-</ul>
-
-<p>Of the above categories, <code class="prettyprint">Functional Unique</code> and <code class="prettyprint">Lookup Unique Unowned</code> Vindexes can be Primary. This is because those are the only ones that are unique and have the column to keyspace ID mapping pre-established. This is required because the Primary Vindex is responsible for assigning the keyspace ID for a row when it is created.</p>
-
-<p>However, it is generally not recommended to use a Lookup vindex as Primary because it is too slow for resharding. If absolutely unavoidable, you can use a Lookup Vindex as Primary. In such cases, it is recommended that you add a <code class="prettyprint">keyspace ID</code> column to such tables. While resharding, Vitess can use that column to efficiently compute the target shard. You can even configure Vitess to auto-populate that column on inserts. This is done using the reverse map feature explained below.</p>
-
-<h3 id="how-vindexes-are-used">How vindexes are used</h3>
-
-<h4 id="cost">Cost</h4>
-
-<p>Vindexes have costs. For routing a query, the Vindex with the lowest cost is chosen. The current costs are:</p>
-
-<table><thead>
-<tr>
-<th>Vindex Type</th>
-<th>Cost</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>Indentity</td>
-<td>0</td>
-</tr>
-<tr>
-<td>Functional</td>
-<td>1</td>
-</tr>
-<tr>
-<td>Lookup Unique</td>
-<td>10</td>
-</tr>
-<tr>
-<td>Lookup NonUnique</td>
-<td>20</td>
-</tr>
-</tbody></table>
-
-<h4 id="select">Select</h4>
-
-<p>In the case of a simple select, Vitess scans the WHERE clause to match references to Vindex columns and chooses the best one to use. If there is no match and the query is simple without complex constructs like aggreates, etc, it is sent to all shards.</p>
-
-<p>Vitess can handle more complex queries. For now, you can refer to the <a href="https://github.com/youtube/vitess/blob/master/doc/V3HighLevelDesign.md">design doc</a> on how it handles them.</p>
-
-<h4 id="insert">Insert</h4>
-
-<ul>
-<li>The Primary Vindex is used to generate a keyspace ID.</li>
-<li>The keyspace ID is validated against the rest of the Vindexes on the table. There must exist a mapping from the column value to the keyspace ID.</li>
-<li>If a column value was not provided for a Vindex and the Vindex is capable of reverse mapping a keyspace ID to an input value, that function is used to auto-fill the column. If there is no reverse map, it is an error.</li>
-</ul>
-
-<h4 id="update">Update</h4>
-
-<p>The WHERE clause is used to route the update. Changing the value of a Vindex column is unsupported because this may result in a row being migrated from one shard to another.</p>
-
-<h4 id="delete">Delete</h4>
-
-<p>If the table owns lookup vindexes, then the rows to be deleted are first read and the associated Vindex entries are deleted. Following this, the query is routed according to the WHERE clause.</p>
-
-<h3 id="predefined-vindexes">Predefined Vindexes</h3>
-
-<p>Vitess provides the following predefined Vindexes:</p>
-
-<table><thead>
-<tr>
-<th>Name</th>
-<th>Type</th>
-<th>Description</th>
-<th>Primary</th>
-<th>Reversible</th>
-<th>Cost</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>binary</td>
-<td>Functional Unique</td>
-<td>Identity</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>0</td>
-</tr>
-<tr>
-<td>binary_md5</td>
-<td>Functional Unique</td>
-<td>md5 hash</td>
-<td>Yes</td>
-<td>No</td>
-<td>1</td>
-</tr>
-<tr>
-<td>hash</td>
-<td>Functional Unique</td>
-<td>3DES null-key hash</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>1</td>
-</tr>
-<tr>
-<td>lookup</td>
-<td>Lookup NonUnique</td>
-<td>Lookup table non-unique values</td>
-<td>No</td>
-<td>Yes</td>
-<td>20</td>
-</tr>
-<tr>
-<td>lookup_unique</td>
-<td>Lookup Unique</td>
-<td>Lookup table unique values</td>
-<td>If unowned</td>
-<td>Yes</td>
-<td>10</td>
-</tr>
-<tr>
-<td>numeric</td>
-<td>Functional Unique</td>
-<td>Identity</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>0</td>
-</tr>
-<tr>
-<td>numeric_static_map</td>
-<td>Functional Unique</td>
-<td>A JSON file that maps input values to keyspace IDs</td>
-<td>Yes</td>
-<td>No</td>
-<td>1</td>
-</tr>
-<tr>
-<td>unicode_loose_md5</td>
-<td>Functional Unique</td>
-<td>Case-insensitive (UCA level 1) md5 hash</td>
-<td>Yes</td>
-<td>No</td>
-<td>1</td>
-</tr>
-</tbody></table>
-
-<p>Custom vindexes can also be plugged in as needed.</p>
-
-<h2 id="sequences">Sequences</h2>
-
-<p>Auto-increment columns do not work very well for sharded tables. <a href="/user-guide/vitess-sequences.html">Vitess sequences</a> solve this problem. Sequence tables must be specified in the VSchema, and then tied to table columns. At the time of insert, if no value is specified for such a column, VTGate will generate a number for it using the sequence table.</p>
-
-<h2 id="vschema">VSchema</h2>
-
-<p>As mentioned in the beginning of the document, a VSchema is needed to tie together all the databases that Vitess manages. For a very trivial setup where there is only one unsharded keyspace, there is no need to specify a VSchema because Vitess will know that there is no other place to route a query.</p>
-
-<p>If you have multiple unsharded keyspaces, you can still avoid defining a VSchema in one of two ways:</p>
-
-<ol>
-<li>Connect to a keyspace and all queries are sent to it.</li>
-<li>Connect to Vitess without specifying a keyspace, but use qualifed names for tables, like <code class="prettyprint">keyspace.table</code> in your queries.</li>
-</ol>
-
-<p>However, once the setup exceeds the above complexity, VSchemas become a necessity. Vitess has a <a href="https://github.com/youtube/vitess/tree/master/examples/demo">working demo</a> of VSchemas. This section documents the various features highlighted with snippets pulled from the demo.</p>
-
-<h3 id="unsharded-table">Unsharded Table</h3>
-
-<p>The following snippets show the necessary configs for creating a table in an unsharded keyspace:</p>
-
-<p>Schema:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="o">#</span> <span class="n">lookup</span> <span class="n">keyspace</span>
-<span class="k">create</span> <span class="k">table</span> <span class="n">name_user_idx</span><span class="p">(</span><span class="n">name</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">128</span><span class="p">),</span> <span class="n">user_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">user_id</span><span class="p">));</span>
-</code></pre></div>
-<p>VSchema:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="err">//</span> <span class="err">lookup</span> <span class="err">keyspace</span>
-<span class="p">{</span>
-  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
-  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;name_user_idx&quot;</span><span class="p">:</span> <span class="p">{}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-</code></pre></div>
-<p>For a normal unsharded table, the VSchema only needs to know the table name.  No additional metadata is needed.</p>
-
-<h3 id="sharded-table-with-simple-primary-vindex">Sharded Table With Simple Primary Vindex</h3>
-
-<p>To create a sharded table with a simple Primary Vindex, the VSchema requires more information:</p>
-
-<p>Schema:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="o">#</span> <span class="k">user</span> <span class="n">keyspace</span>
-<span class="k">create</span> <span class="k">table</span> <span class="k">user</span><span class="p">(</span><span class="n">user_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="n">name</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">128</span><span class="p">),</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">user_id</span><span class="p">));</span>
-</code></pre></div>
-<p>VSchema:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="err">//</span> <span class="err">user</span> <span class="err">keyspace</span>
-<span class="p">{</span>
-  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
-  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;hash&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
-    <span class="p">},</span>
-  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="p">{</span>
-          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span><span class="p">,</span>
-          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
-        <span class="p">}</span>
-      <span class="p">]</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-</code></pre></div>
-<p>Because Vindexes can be shared, the JSON requires them to be specified in a separate <code class="prettyprint">vindexes</code> section, and then referenced by name from the <code class="prettyprint">tables</code> section. The VSchema above simply states that <code class="prettyprint">user_id</code> uses <code class="prettyprint">hash</code> as Primary Vindex. The first Vindex of every table must be the Primary Vindex.</p>
-
-<h3 id="specifying-a-sequence">Specifying A Sequence</h3>
-
-<p>Since user is a sharded table, it will be beneficial to tie it to a Sequence. However, the sequence must be defined in the lookup (unsharded) keyspace. It is then referred from the user (sharded) keyspace. In this example, we are designating the user_id (Primary Vindex) column as the auto-increment.</p>
-
-<p>Schema:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="o">#</span> <span class="n">lookup</span> <span class="n">keyspace</span>
-<span class="k">create</span> <span class="k">table</span> <span class="n">user_seq</span><span class="p">(</span><span class="n">id</span> <span class="nb">int</span><span class="p">,</span> <span class="n">next_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">cache</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">id</span><span class="p">))</span> <span class="k">comment</span> <span class="s1">&#39;vitess_sequence&#39;</span><span class="p">;</span>
-<span class="k">insert</span> <span class="k">into</span> <span class="n">user_seq</span><span class="p">(</span><span class="n">id</span><span class="p">,</span> <span class="n">next_id</span><span class="p">,</span> <span class="k">cache</span><span class="p">)</span> <span class="k">values</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">3</span><span class="p">);</span>
-</code></pre></div>
-<p>For the sequence table, <code class="prettyprint">id</code> is always 0. <code class="prettyprint">next_id</code> starts off as 1, and the cache is usually a medium-sized number like 1000. In our example, we are using a small number to showcase how it works.</p>
-
-<p>VSchema:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="err">//</span> <span class="err">lookup</span> <span class="err">keyspace</span>
-<span class="p">{</span>
-  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
-  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;user_seq&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;sequence&quot;</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-
-<span class="err">//</span> <span class="err">user</span> <span class="err">keyspace</span>
-<span class="p">{</span>
-  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
-  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;hash&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
-    <span class="p">},</span>
-  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="p">{</span>
-          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span><span class="p">,</span>
-          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
-        <span class="p">}</span>
-      <span class="p">],</span>
-      <span class="nt">&quot;auto_increment&quot;</span><span class="p">:</span> <span class="p">{</span>
-        <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span><span class="p">,</span>
-        <span class="nt">&quot;sequence&quot;</span><span class="p">:</span> <span class="s2">&quot;user_seq&quot;</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-</code></pre></div>
-<h3 id="specifying-a-secondary-vindex">Specifying A Secondary Vindex</h3>
-
-<p>The following snippet shows how to configure a Secondary Vindex that is backed by a lookup table. In this case, the lookup table is configured to be in the unsharded lookup keyspace:</p>
-
-<p>Schema:</p>
-<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="o">#</span> <span class="n">lookup</span> <span class="n">keyspace</span>
-<span class="k">create</span> <span class="k">table</span> <span class="n">name_user_idx</span><span class="p">(</span><span class="n">name</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">128</span><span class="p">),</span> <span class="n">user_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">user_id</span><span class="p">));</span>
-</code></pre></div>
-<p>VSchema:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="err">//</span> <span class="err">lookup</span> <span class="err">keyspace</span>
-<span class="p">{</span>
-  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
-  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;name_user_idx&quot;</span><span class="p">:</span> <span class="p">{}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-
-<span class="err">//</span> <span class="err">user</span> <span class="err">keyspace</span>
-<span class="p">{</span>
-  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
-  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;name_user_idx&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;lookup_hash&quot;</span><span class="p">,</span>
-      <span class="nt">&quot;params&quot;</span><span class="p">:</span> <span class="p">{</span>
-        <span class="nt">&quot;table&quot;</span><span class="p">:</span> <span class="s2">&quot;name_user_idx&quot;</span><span class="p">,</span>
-        <span class="nt">&quot;from&quot;</span><span class="p">:</span> <span class="s2">&quot;name&quot;</span><span class="p">,</span>
-        <span class="nt">&quot;to&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span>
-      <span class="p">},</span>
-      <span class="nt">&quot;owner&quot;</span><span class="p">:</span> <span class="s2">&quot;user&quot;</span>
-    <span class="p">},</span>
-  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="nt">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="p">{</span>
-          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;name&quot;</span><span class="p">,</span>
-          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;name_user_idx&quot;</span>
-        <span class="p">}</span>
-      <span class="p">]</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-</code></pre></div>
-<p>To recap, a checklist for creating the shared Secondary Vindex is:</p>
-
-<ul>
-<li>Create physical <code class="prettyprint">name_user_idx</code> table in lookup database.</li>
-<li>Define a routing for it in the lookup VSchema.</li>
-<li>Define a Vindex as type <code class="prettyprint">lookup_hash</code> that points to it. Ensure that the <code class="prettyprint">params</code> match the table name and columns.</li>
-<li>Define the owner for the Vindex as the <code class="prettyprint">user</code> table.</li>
-<li>Specify that <code class="prettyprint">name</code> uses the Vindex.</li>
-</ul>
-
-<p>Currently, these steps have to be currently performed manually. However, extended DDLs backed by improved automation will simplify these tasks in the future.</p>
-
-<h3 id="advanced-usage">Advanced usage</h3>
-
-<p>The examples/demo also shows more tricks you can perform:</p>
-
-<ul>
-<li>The <code class="prettyprint">music</code> table uses a secondary lookup vindex <code class="prettyprint">music_user_idx</code>. However, this lookup vindex is itself a sharded table.</li>
-<li><code class="prettyprint">music_extra</code> shares <code class="prettyprint">music_user_idx</code> with <code class="prettyprint">music</code>, and uses it as Primary Vindex.</li>
-<li><code class="prettyprint">music_extra</code> defines an additional Functional Vindex called <code class="prettyprint">keyspace_id</code> which the demo auto-populates using the reverse mapping capability.</li>
-<li>There is also a <code class="prettyprint">name_info</code> table that showcases a case-insensitive Vindex <code class="prettyprint">unicode_loose_md5</code>.</li>
-</ul>
-
-<h2 id="roadmap">Roadmap</h2>
-
-<p>VSchema is still evolving. Features are mostly added on demand. The following features are currently on our roadmap:</p>
-
-<ul>
-<li>DDL support</li>
-<li>Lookup Vindex backfill</li>
-<li>Pinned tables: This feature will allow unsharded tables to be pinned to a keypsace id. This avoids the need for a separate unsharded keyspace to contain them.</li>
-</ul>
-
-      </div>
-    </div>
-  </div>
-
-</div>
-
-    <div class="page-spacer"></div>
-    <footer role="contentinfo" id="site-footer">
-  <nav role="navigation" class="menu bottom-menu">
-    
-    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
-    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
-  </nav>
-</footer>
-
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-<!--
-    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
--->
-    <!-- Include the common site javascript -->
-    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/vschema/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/vschema/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/vschema/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/vschema/"</script>
 </html>
diff --git a/docs/user-guide/vschema/index.html b/docs/user-guide/vschema/index.html
new file mode 100644
index 00000000000..c86a11fbd60
--- /dev/null
+++ b/docs/user-guide/vschema/index.html
@@ -0,0 +1,762 @@
+<!DOCTYPE html>
+<html lang="en" itemscope itemtype="https://schema.org/WebPage">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Webfont -->
+    <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    
+    <!--<link rel="shortcut icon" type="image/png" href="/favicon.png">-->
+
+    <!-- Bootstrap -->
+    <link href="/libs/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Styles -->
+    <link rel="stylesheet" type="text/css" href="/css/site.css" />
+    <!-- Font Awesome icons -->
+    <link href="/libs/font-awesome-4.4.0/css/font-awesome.min.css"
+          rel="stylesheet"
+          type="text/css">
+    
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <link rel="icon" href="/images/vitess_logo_icon_size.png" type="image/png">
+
+    
+    <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-60219601-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
+    
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    <!-- Begin Jekyll SEO tag v2.3.0 -->
+<title>VSchema User Guide | Vitess</title>
+<meta property="og:title" content="VSchema User Guide" />
+<meta property="og:locale" content="en_US" />
+<meta name="description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<meta property="og:description" content="Vitess is a database clustering system for horizontal scaling of MySQL." />
+<link rel="canonical" href="http://vitess.io/user-guide/vschema/" />
+<meta property="og:url" content="http://vitess.io/user-guide/vschema/" />
+<meta property="og:site_name" content="Vitess" />
+<script type="application/ld+json">
+{"name":null,"description":"Vitess is a database clustering system for horizontal scaling of MySQL.","url":"http://vitess.io/user-guide/vschema/","headline":"VSchema User Guide","dateModified":null,"datePublished":null,"sameAs":null,"@type":"WebPage","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"http://vitess.io/vitess_logo_with_border.svg"}},"mainEntityOfPage":null,"@context":"http://schema.org"}</script>
+<!-- End Jekyll SEO tag -->
+
+  </head>
+  <body class="docs" id="top_of_page">
+
+    <span id="toc-depth" data-toc-depth="h2,h3"></span>
+
+
+    <nav id="common-nav" class="navbar navbar-fixed-top inverse">
+  <div class="container">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img class="logo" src="/images/vitess_logo_with_border.svg" alt="Vitess">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
+        <li><a href="/overview/">Overview</a></li>
+        <li><a href="/user-guide/introduction/">Guides</a></li>
+        <li><a href="/reference/vitess-api/">Reference</a></li>
+        <li><a href="http://blog.vitess.io">Blog</a></li>
+        <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
+        <!-- Hide link to blog unless we have actual posts -->
+        <!-- <li><a href="/blog/" title="">Blog</a></li> -->
+      </ul>
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="collapsed-left-menu">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+        <li><a href="https://github.com/youtube/vitess" id="collapsed-left-menu-repo-link"><i class="fa fa-github"></i> GitHub</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+
+    
+<div id="masthead">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9">
+        <h1>VSchema User Guide</h1>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="container">
+    <div class="row scroll-margin" id="toc-content-row">
+    <div class="col-md-2" id="leftCol">
+      <ul class="nav nav-stacked mobile-left-nav-menu" id="sidebar">
+                <li class="submenu">
+          <h4 class="arrow-r no-top-margin">Overview</h4>
+          <ul style="display: none">
+            <li><a href="/overview/">What is Vitess</a></li>
+            <li><a href="/overview/scaling-mysql/">Scaling MySQL with Vitess</a></li>
+            <li><a href="/overview/concepts/">Key Concepts</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Getting Started</h4>
+          <ul style="display: none">
+            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/getting-started/docker-build/">Custom Docker Build</a></li>
+              </ul>
+            </li>
+            <li><a href="/getting-started/local-instance/">Run Vitess Locally</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">User Guide</h4>
+          <ul style="display: none">
+            <li><a href="/user-guide/introduction/">Introduction</a>
+            <li><a href="/user-guide/client-libraries/">Client Libraries</a>
+            <li><a href="/user-guide/backup-and-restore/">Backing Up Data</a>
+            <li><a href="/user-guide/reparenting/">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/schema-management/">Schema Management</a></li>
+              <ul style="display: block">
+                <li style="padding-bottom: 0"><a href="/user-guide/vschema/">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap/">Schema Swap (Tutorial)</a></li>
+              </ul>
+            <li style="padding-bottom: 0"><a href="/user-guide/sharding/">Sharding</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/horizontal-sharding-workflow/">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="/user-guide/horizontal-sharding/">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="/user-guide/sharding-kubernetes-workflow/">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes/">Sharding in Kubernetes (Tutorial, manual)</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/vitess-sequences/">Vitess Sequences</a></li>
+            <li><a href="/user-guide/mysql-server-protocol/">MySQL Server Protocol</a></li>
+            <li><a href="/user-guide/vitess-replication/">Vitess and Replication</a></li>
+            <li><a href="/user-guide/update-stream/">Update Stream</a></li>
+            <li><a href="/user-guide/row-based-replication/">Row Based Replication</a></li>
+            <li><a href="/user-guide/topology-service/">Topology Service</a></li>
+            <li><a href="/user-guide/transport-security-model/">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="/user-guide/launching/">Launching</a>
+              <ul style="display: block">
+                <li><a href="/user-guide/scalability-philosophy/">Scalability Philosophy</a></li>
+                <li><a href="/user-guide/production-planning/">Production Planning</a></li>
+                <li><a href="/user-guide/server-configuration/">Server Configuration</a></li>
+                <li><a href="/user-guide/twopc/">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting/">Troubleshooting</a></li>
+              </ul>
+            </li>
+            <li><a href="/user-guide/upgrading/">Upgrading</a></li>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Reference Guides</h4>
+          <ul style="display: none">
+            <li><a href="/reference/vitess-api/">Vitess API</a>
+            <li><a href="/reference/vtctl/">vtctl Commands</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Other Resources</h4>
+          <ul style="display: none">
+            <li><a href="/resources/presentations/">Presentations</a>
+            <li><a href="http://blog.vitess.io/">Blog</a>
+            <li><a href="/resources/roadmap/">Roadmap</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Contributing</h4>
+          <ul style="display: none">
+            <li><a href="/contributing/">Contributing to Vitess</a>
+            <li><a href="/contributing/github-workflow/">GitHub Workflow</a>
+            <li><a href="/contributing/code-reviews/">Code Reviews</a>
+          </ul>
+        </li>
+        <li class="submenu">
+          <h4 class="arrow-r">Internal</h4>
+          <ul style="display: none">
+            <li><a href="/internal/">Overview</a>
+            <li><a href="/internal/release-instructions/">Release Instructions</a>
+            <li><a href="/internal/publish-website/">Publish Website</a>
+          </ul>
+        </li>
+
+        <div>
+          <form method="get" action="/search/">
+            <input id="search-form" name="q" type="text" placeholder="Search">
+          </form>
+        </div>
+
+      </ul>
+    </div>
+    <div class="col-md-3" id="rightCol">
+      <div class="nav nav-stacked" id="tocSidebar">
+        <div id="toc"></div>
+      </div>
+    </div>
+    <div class="col-md-7" id="centerCol">
+      <div id="centerTextCol">
+        <h1 id="vschema-user-guide">VSchema User Guide</h1>
+
+<p>VSchema stands for Vitess Schema. In contrast to a traditional database schema that contains metadata about tables, a VSchema contains metadata about how tables are organized across keyspaces and shards. Simply put, it contains the information needed to make Vitess look like a single database server.</p>
+
+<p>For example, the VSchema will contain the information about the sharding key for a sharded table. When the application issues a query with a WHERE clause that references the key, the VSchema information will be used to route the query to the appropriate shard.</p>
+
+<h2 id="sharding-model">Sharding Model</h2>
+
+<p>In Vitess, a <code class="prettyprint">keyspace</code> is sharded by <code class="prettyprint">keyspace ID</code> ranges. Each row is assigned a keyspace ID, which acts like a street address, and it determines the shard where the row lives. In some respect, one could say that the <code class="prettyprint">keyspace ID</code> is the equivalent of a NoSQL sharding key. However, there are some differences:</p>
+
+<ol>
+<li>The <code class="prettyprint">keyspace ID</code> is a concept that is internal to Vitess. The application does not need to know anything about it.</li>
+<li>There is no physical column that stores the actual <code class="prettyprint">keyspace ID</code>. This value is computed as needed.</li>
+</ol>
+
+<p>This difference is significant enough that we do not refer to the keyspace ID as the sharding key. we will later introduce the concept of a Primary Vindex which more closely ressembles the NoSQL sharding key.</p>
+
+<p>Mapping to a <code class="prettyprint">keyspace ID</code>, and then to a shard, gives us the flexibility to reshard the data with minimal disruption because the <code class="prettyprint">keyspace ID</code> of each row remains unchanged through the process.</p>
+
+<h2 id="vindex">Vindex</h2>
+
+<p>The Sharding Key is a concept that was introduced by NoSQL datastores. It is based on the fact that there is only one access path to the data, which is the Key. However, relational databases are more versatile about the data and their relationships. So, sharding a database by only designating a sharding key is often insufficient.</p>
+
+<p>If one were to draw an analogy, the indexes in a database would be the equivalent of the key in a NoSQL datastore, except that databases allow you to define multiple indexes per table, and there are many types of indexes. Extending this analogy to a sharded database results in different types of cross-shard indexes. In Vitess, these are called Vindexes.</p>
+
+<p>Simplistically stated, a Vindex provides a way to map a column value to a <code class="prettyprint">keyspace ID</code>. This mapping can be used to identify the location of a row. A variety of vindexes are available to choose from with different trade-offs, and you can choose one that best suits your needs.</p>
+
+<p>Vindexes offer many flexibilities:</p>
+
+<ul>
+<li>A table can have multiple Vindexes.</li>
+<li>Vindexes could be NonUnique, which allows a column value to yield multiple keyspace IDs.</li>
+<li>They could be a simple function or be based on a lookup table.</li>
+<li>They could be shared across multiple tables.</li>
+<li>Custom Vindexes can be plugged in, and Vitess will still know how to reshard using such Vindexes.</li>
+</ul>
+
+<h3 id="the-primary-vindex">The Primary Vindex</h3>
+
+<p>The Primary Vindex is analogous to a database primary key. Every sharded table must have one defined. A Primary Vindex must be unique: given an input value, it must produce a single keyspace ID. This unique mapping will be used at the time of insert to decide the target shard for a row. Conceptually, this is also equivalent to the NoSQL Sharding Key, and we often refer to the Primary Vindex as the Sharding Key.</p>
+
+<p>Uniqueness for a Primary Vindex does not mean that the column has to be a primary key or unique in the MySQL schema. You can have multiple rows that map to the same keyspace ID. The Vindex uniqueness constraint is only used to make sure that all rows for a keyspace ID live in the same shard.</p>
+
+<p>However, there is a subtle difference: NoSQL datastores let you choose the Sharding Key, but the Sharding Scheme is generally hardcoded in the engine. In Vitess, the choice of Vindex lets you control how a column value maps to a keyspace ID. In other words, a Primary Vindex in Vitess not only defines the Sharding Key, it also decides the Sharding Scheme.</p>
+
+<p>Vindexes come in many varieties. Some of them can be used as Primary Vindex, and others have different purposes. The following sections will describe their properties.</p>
+
+<h3 id="secondary-vindexes">Secondary Vindexes</h3>
+
+<p>Secondary Vindexes are additional vindexes you can define against other columns of a table offering you optimizations for WHERE clauses that do not use the Primary Vindex. Secondary Vindexes return a single or a limited set of <code class="prettyprint">keyspace IDs</code> which will allow VTGate to only target shards where the relevant data is present. In the absence of a Secondary Vindex, VTGate would have to send the query to all shards.</p>
+
+<p>Secondary Vindexes are also commonly known as cross-shard indexes. It is important to note that Secondary Vindexes are only for making routing decisions. The underlying database shards will most likely need traditional indexes on those same columns.</p>
+
+<h3 id="unique-and-nonunique-vindex">Unique and NonUnique Vindex</h3>
+
+<p>A Unique Vindex is one that yields at most one keyspace ID for a given input. Knowing that a Vindex is Unique is useful because VTGate can push down some complex queries into VTTablet if it knows that the scope of that query cannot exceed a shard. Uniqueness is also a prerequisite for a Vindex to be used as Primary Vindex.</p>
+
+<p>A NonUnique Vindex is analogous to a database non-unique index. It is a secondary index for searching by an alternate WHERE clause. An input value could yield multiple keyspace IDs, and rows could be matched from multiple shards. For example, if a table has a <code class="prettyprint">name</code> column that allows duplicates, you can define a cross-shard NonUnique Vindex for it, and this will let you efficiently search for users that match a certain <code class="prettyprint">name</code>.</p>
+
+<h3 id="functional-and-lookup-vindex">Functional and Lookup Vindex</h3>
+
+<p>A Functional Vindex is one where the column value to keyspace ID mapping is pre-established, typically through an algorithmic function. In contrast, a Lookup Vindex is one that gives you the ability to create an association between a value and a keyspace ID, and recall it later when needed.</p>
+
+<p>Typically, the Primary Vindex is Functional. In some cases, it is the identity function where the input value yields itself as the kesypace id. However, one could also choose other algorithms like hashing or mod functions.</p>
+
+<p>A Lookup Vindex is usually backed by a lookup table. This is analogous to the traditional database index, except that it is cross-shard. At the time of insert, the computed keyspace ID of the row is stored in the lookup table against the column value.</p>
+
+<h3 id="shared-vindexes">Shared Vindexes</h3>
+
+<p>Relational databases encourage normalization, which lets you split data into different tables to avoid duplication in the case of one-to-many relationships. In such cases, a key is shared between the two tables to indicate that the rows are related, aka <code class="prettyprint">Foreign Key</code>.</p>
+
+<p>In a sharded environment, it is often beneficial to keep those rows in the same shard. If a Lookup Vindex was created on the foreign key column of each of those tables, you would find that the backing tables would actually be identical. In such cases, Vitess lets you share a single Lookup Vindex for multiple tables. Of these, one of them is designated as the owner, which is responsible for creating and deleting these associations. The other tables just reuse these associations.</p>
+
+<p>Caveat: If you delete a row from the owner table, Vitess will not perform cascading deletes. This is mainly for efficiency reasons; The application is likely capable of doing this more efficiently.</p>
+
+<p>Functional Vindexes can be also be shared. However, there is no concept of ownership because the column to keyspace ID mapping is pre-established.</p>
+
+<h3 id="orthogonality">Orthogonality</h3>
+
+<p>The previously described properties are mostly orthogonal. Combining them gives rise to the following valid categories:</p>
+
+<ul>
+<li><strong>Functional Unique</strong>: This is the most popular category because it is the one best suited to be a Primary Vindex.</li>
+<li><strong>Functional NonUnique</strong>: There are currently no use cases that need this category.</li>
+<li><strong>Lookup Unique Owned</strong>: This gets used for optimizing high QPS queries that do not use the Primary Vindex columns in their WHERE clause. There is a price to pay: You incur an extra write to the lookup table for insert and delete operations, and an extra lookup for read operations. However, it is worth it if you do not want these high QPS queries to be sent to all shards.</li>
+<li><strong>Lookup Unique Unowned</strong>: This category is used as an optimization as described in the Shared Vindexes section.</li>
+<li><strong>Lookup NonUnique Owned</strong>: This gets used for high QPS queries on columns that are non-unique.</li>
+<li><strong>Lookup NonUnique Unowned</strong>: You would rarely have to use this category because it is unlikely that you will be using a column as foreign key that is not unique within a shard. But it is theoretically possible.</li>
+</ul>
+
+<p>Of the above categories, <code class="prettyprint">Functional Unique</code> and <code class="prettyprint">Lookup Unique Unowned</code> Vindexes can be Primary. This is because those are the only ones that are unique and have the column to keyspace ID mapping pre-established. This is required because the Primary Vindex is responsible for assigning the keyspace ID for a row when it is created.</p>
+
+<p>However, it is generally not recommended to use a Lookup vindex as Primary because it is too slow for resharding. If absolutely unavoidable, you can use a Lookup Vindex as Primary. In such cases, it is recommended that you add a <code class="prettyprint">keyspace ID</code> column to such tables. While resharding, Vitess can use that column to efficiently compute the target shard. You can even configure Vitess to auto-populate that column on inserts. This is done using the reverse map feature explained below.</p>
+
+<h3 id="how-vindexes-are-used">How vindexes are used</h3>
+
+<h4 id="cost">Cost</h4>
+
+<p>Vindexes have costs. For routing a query, the Vindex with the lowest cost is chosen. The current costs are:</p>
+
+<table><thead>
+<tr>
+<th>Vindex Type</th>
+<th>Cost</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>Indentity</td>
+<td>0</td>
+</tr>
+<tr>
+<td>Functional</td>
+<td>1</td>
+</tr>
+<tr>
+<td>Lookup Unique</td>
+<td>10</td>
+</tr>
+<tr>
+<td>Lookup NonUnique</td>
+<td>20</td>
+</tr>
+</tbody></table>
+
+<h4 id="select">Select</h4>
+
+<p>In the case of a simple select, Vitess scans the WHERE clause to match references to Vindex columns and chooses the best one to use. If there is no match and the query is simple without complex constructs like aggreates, etc, it is sent to all shards.</p>
+
+<p>Vitess can handle more complex queries. For now, you can refer to the <a href="https://github.com/youtube/vitess/blob/master/doc/V3HighLevelDesign.md">design doc</a> on how it handles them.</p>
+
+<h4 id="insert">Insert</h4>
+
+<ul>
+<li>The Primary Vindex is used to generate a keyspace ID.</li>
+<li>The keyspace ID is validated against the rest of the Vindexes on the table. There must exist a mapping from the column value to the keyspace ID.</li>
+<li>If a column value was not provided for a Vindex and the Vindex is capable of reverse mapping a keyspace ID to an input value, that function is used to auto-fill the column. If there is no reverse map, it is an error.</li>
+</ul>
+
+<h4 id="update">Update</h4>
+
+<p>The WHERE clause is used to route the update. Changing the value of a Vindex column is unsupported because this may result in a row being migrated from one shard to another.</p>
+
+<h4 id="delete">Delete</h4>
+
+<p>If the table owns lookup vindexes, then the rows to be deleted are first read and the associated Vindex entries are deleted. Following this, the query is routed according to the WHERE clause.</p>
+
+<h3 id="predefined-vindexes">Predefined Vindexes</h3>
+
+<p>Vitess provides the following predefined Vindexes:</p>
+
+<table><thead>
+<tr>
+<th>Name</th>
+<th>Type</th>
+<th>Description</th>
+<th>Primary</th>
+<th>Reversible</th>
+<th>Cost</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>binary</td>
+<td>Functional Unique</td>
+<td>Identity</td>
+<td>Yes</td>
+<td>Yes</td>
+<td>0</td>
+</tr>
+<tr>
+<td>binary_md5</td>
+<td>Functional Unique</td>
+<td>md5 hash</td>
+<td>Yes</td>
+<td>No</td>
+<td>1</td>
+</tr>
+<tr>
+<td>hash</td>
+<td>Functional Unique</td>
+<td>3DES null-key hash</td>
+<td>Yes</td>
+<td>Yes</td>
+<td>1</td>
+</tr>
+<tr>
+<td>lookup</td>
+<td>Lookup NonUnique</td>
+<td>Lookup table non-unique values</td>
+<td>No</td>
+<td>Yes</td>
+<td>20</td>
+</tr>
+<tr>
+<td>lookup_unique</td>
+<td>Lookup Unique</td>
+<td>Lookup table unique values</td>
+<td>If unowned</td>
+<td>Yes</td>
+<td>10</td>
+</tr>
+<tr>
+<td>numeric</td>
+<td>Functional Unique</td>
+<td>Identity</td>
+<td>Yes</td>
+<td>Yes</td>
+<td>0</td>
+</tr>
+<tr>
+<td>numeric_static_map</td>
+<td>Functional Unique</td>
+<td>A JSON file that maps input values to keyspace IDs</td>
+<td>Yes</td>
+<td>No</td>
+<td>1</td>
+</tr>
+<tr>
+<td>unicode_loose_md5</td>
+<td>Functional Unique</td>
+<td>Case-insensitive (UCA level 1) md5 hash</td>
+<td>Yes</td>
+<td>No</td>
+<td>1</td>
+</tr>
+</tbody></table>
+
+<p>Custom vindexes can also be plugged in as needed.</p>
+
+<h2 id="sequences">Sequences</h2>
+
+<p>Auto-increment columns do not work very well for sharded tables. <a href="/user-guide/vitess-sequences/">Vitess sequences</a> solve this problem. Sequence tables must be specified in the VSchema, and then tied to table columns. At the time of insert, if no value is specified for such a column, VTGate will generate a number for it using the sequence table.</p>
+
+<h2 id="vschema">VSchema</h2>
+
+<p>As mentioned in the beginning of the document, a VSchema is needed to tie together all the databases that Vitess manages. For a very trivial setup where there is only one unsharded keyspace, there is no need to specify a VSchema because Vitess will know that there is no other place to route a query.</p>
+
+<p>If you have multiple unsharded keyspaces, you can still avoid defining a VSchema in one of two ways:</p>
+
+<ol>
+<li>Connect to a keyspace and all queries are sent to it.</li>
+<li>Connect to Vitess without specifying a keyspace, but use qualifed names for tables, like <code class="prettyprint">keyspace.table</code> in your queries.</li>
+</ol>
+
+<p>However, once the setup exceeds the above complexity, VSchemas become a necessity. Vitess has a <a href="https://github.com/youtube/vitess/tree/master/examples/demo">working demo</a> of VSchemas. This section documents the various features highlighted with snippets pulled from the demo.</p>
+
+<h3 id="unsharded-table">Unsharded Table</h3>
+
+<p>The following snippets show the necessary configs for creating a table in an unsharded keyspace:</p>
+
+<p>Schema:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="o">#</span> <span class="n">lookup</span> <span class="n">keyspace</span>
+<span class="k">create</span> <span class="k">table</span> <span class="n">name_user_idx</span><span class="p">(</span><span class="n">name</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">128</span><span class="p">),</span> <span class="n">user_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">user_id</span><span class="p">));</span>
+</code></pre></div>
+<p>VSchema:</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="err">//</span> <span class="err">lookup</span> <span class="err">keyspace</span>
+<span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;name_user_idx&quot;</span><span class="p">:</span> <span class="p">{}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</code></pre></div>
+<p>For a normal unsharded table, the VSchema only needs to know the table name.  No additional metadata is needed.</p>
+
+<h3 id="sharded-table-with-simple-primary-vindex">Sharded Table With Simple Primary Vindex</h3>
+
+<p>To create a sharded table with a simple Primary Vindex, the VSchema requires more information:</p>
+
+<p>Schema:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="o">#</span> <span class="k">user</span> <span class="n">keyspace</span>
+<span class="k">create</span> <span class="k">table</span> <span class="k">user</span><span class="p">(</span><span class="n">user_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="n">name</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">128</span><span class="p">),</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">user_id</span><span class="p">));</span>
+</code></pre></div>
+<p>VSchema:</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="err">//</span> <span class="err">user</span> <span class="err">keyspace</span>
+<span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
+  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;hash&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+    <span class="p">},</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
+        <span class="p">{</span>
+          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span><span class="p">,</span>
+          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+        <span class="p">}</span>
+      <span class="p">]</span>
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</code></pre></div>
+<p>Because Vindexes can be shared, the JSON requires them to be specified in a separate <code class="prettyprint">vindexes</code> section, and then referenced by name from the <code class="prettyprint">tables</code> section. The VSchema above simply states that <code class="prettyprint">user_id</code> uses <code class="prettyprint">hash</code> as Primary Vindex. The first Vindex of every table must be the Primary Vindex.</p>
+
+<h3 id="specifying-a-sequence">Specifying A Sequence</h3>
+
+<p>Since user is a sharded table, it will be beneficial to tie it to a Sequence. However, the sequence must be defined in the lookup (unsharded) keyspace. It is then referred from the user (sharded) keyspace. In this example, we are designating the user_id (Primary Vindex) column as the auto-increment.</p>
+
+<p>Schema:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="o">#</span> <span class="n">lookup</span> <span class="n">keyspace</span>
+<span class="k">create</span> <span class="k">table</span> <span class="n">user_seq</span><span class="p">(</span><span class="n">id</span> <span class="nb">int</span><span class="p">,</span> <span class="n">next_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">cache</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">id</span><span class="p">))</span> <span class="k">comment</span> <span class="s1">&#39;vitess_sequence&#39;</span><span class="p">;</span>
+<span class="k">insert</span> <span class="k">into</span> <span class="n">user_seq</span><span class="p">(</span><span class="n">id</span><span class="p">,</span> <span class="n">next_id</span><span class="p">,</span> <span class="k">cache</span><span class="p">)</span> <span class="k">values</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">3</span><span class="p">);</span>
+</code></pre></div>
+<p>For the sequence table, <code class="prettyprint">id</code> is always 0. <code class="prettyprint">next_id</code> starts off as 1, and the cache is usually a medium-sized number like 1000. In our example, we are using a small number to showcase how it works.</p>
+
+<p>VSchema:</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="err">//</span> <span class="err">lookup</span> <span class="err">keyspace</span>
+<span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;user_seq&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;sequence&quot;</span>
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+
+<span class="err">//</span> <span class="err">user</span> <span class="err">keyspace</span>
+<span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
+  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;hash&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+    <span class="p">},</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
+        <span class="p">{</span>
+          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span><span class="p">,</span>
+          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+        <span class="p">}</span>
+      <span class="p">],</span>
+      <span class="nt">&quot;auto_increment&quot;</span><span class="p">:</span> <span class="p">{</span>
+        <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span><span class="p">,</span>
+        <span class="nt">&quot;sequence&quot;</span><span class="p">:</span> <span class="s2">&quot;user_seq&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</code></pre></div>
+<h3 id="specifying-a-secondary-vindex">Specifying A Secondary Vindex</h3>
+
+<p>The following snippet shows how to configure a Secondary Vindex that is backed by a lookup table. In this case, the lookup table is configured to be in the unsharded lookup keyspace:</p>
+
+<p>Schema:</p>
+<div class="highlight"><pre><code class="language-sql" data-lang="sql"><span class="o">#</span> <span class="n">lookup</span> <span class="n">keyspace</span>
+<span class="k">create</span> <span class="k">table</span> <span class="n">name_user_idx</span><span class="p">(</span><span class="n">name</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">128</span><span class="p">),</span> <span class="n">user_id</span> <span class="nb">bigint</span><span class="p">,</span> <span class="k">primary</span> <span class="k">key</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">user_id</span><span class="p">));</span>
+</code></pre></div>
+<p>VSchema:</p>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span class="err">//</span> <span class="err">lookup</span> <span class="err">keyspace</span>
+<span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;name_user_idx&quot;</span><span class="p">:</span> <span class="p">{}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+
+<span class="err">//</span> <span class="err">user</span> <span class="err">keyspace</span>
+<span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
+  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;name_user_idx&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;lookup_hash&quot;</span><span class="p">,</span>
+      <span class="nt">&quot;params&quot;</span><span class="p">:</span> <span class="p">{</span>
+        <span class="nt">&quot;table&quot;</span><span class="p">:</span> <span class="s2">&quot;name_user_idx&quot;</span><span class="p">,</span>
+        <span class="nt">&quot;from&quot;</span><span class="p">:</span> <span class="s2">&quot;name&quot;</span><span class="p">,</span>
+        <span class="nt">&quot;to&quot;</span><span class="p">:</span> <span class="s2">&quot;user_id&quot;</span>
+      <span class="p">},</span>
+      <span class="nt">&quot;owner&quot;</span><span class="p">:</span> <span class="s2">&quot;user&quot;</span>
+    <span class="p">},</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="nt">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
+      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
+        <span class="p">{</span>
+          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;name&quot;</span><span class="p">,</span>
+          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;name_user_idx&quot;</span>
+        <span class="p">}</span>
+      <span class="p">]</span>
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</code></pre></div>
+<p>To recap, a checklist for creating the shared Secondary Vindex is:</p>
+
+<ul>
+<li>Create physical <code class="prettyprint">name_user_idx</code> table in lookup database.</li>
+<li>Define a routing for it in the lookup VSchema.</li>
+<li>Define a Vindex as type <code class="prettyprint">lookup_hash</code> that points to it. Ensure that the <code class="prettyprint">params</code> match the table name and columns.</li>
+<li>Define the owner for the Vindex as the <code class="prettyprint">user</code> table.</li>
+<li>Specify that <code class="prettyprint">name</code> uses the Vindex.</li>
+</ul>
+
+<p>Currently, these steps have to be currently performed manually. However, extended DDLs backed by improved automation will simplify these tasks in the future.</p>
+
+<h3 id="advanced-usage">Advanced usage</h3>
+
+<p>The examples/demo also shows more tricks you can perform:</p>
+
+<ul>
+<li>The <code class="prettyprint">music</code> table uses a secondary lookup vindex <code class="prettyprint">music_user_idx</code>. However, this lookup vindex is itself a sharded table.</li>
+<li><code class="prettyprint">music_extra</code> shares <code class="prettyprint">music_user_idx</code> with <code class="prettyprint">music</code>, and uses it as Primary Vindex.</li>
+<li><code class="prettyprint">music_extra</code> defines an additional Functional Vindex called <code class="prettyprint">keyspace_id</code> which the demo auto-populates using the reverse mapping capability.</li>
+<li>There is also a <code class="prettyprint">name_info</code> table that showcases a case-insensitive Vindex <code class="prettyprint">unicode_loose_md5</code>.</li>
+</ul>
+
+<h2 id="roadmap">Roadmap</h2>
+
+<p>VSchema is still evolving. Features are mostly added on demand. The following features are currently on our roadmap:</p>
+
+<ul>
+<li>DDL support</li>
+<li>Lookup Vindex backfill</li>
+<li>Pinned tables: This feature will allow unsharded tables to be pinned to a keypsace id. This avoids the need for a separate unsharded keyspace to contain them.</li>
+</ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+    <div class="page-spacer"></div>
+    <footer role="contentinfo" id="site-footer">
+  <nav role="navigation" class="menu bottom-menu">
+    
+    <a href="https://groups.google.com/forum/#!forum/vitess" target="_blank">Contact: vitess@googlegroups.com</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    <a href="https://groups.google.com/forum/#!forum/vitess-announce" target="_blank">Announcements</a>&nbsp;&nbsp;<b>·</b>&nbsp;&nbsp;
+    &#169; 2017 <a href="/">Vitess</a> powered by <a href="https://developers.google.com/open-source/">Google Inc</a>
+  </nav>
+</footer>
+
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>   -->
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+<!--
+    <script src="/libs/bootstrap/js/bootstrap.min.js"></script>
+-->
+    <!-- Include the common site javascript -->
+    <script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
+
+
+  </body>
+</html>
diff --git a/docs/userguide/backup-and-restore.html b/docs/userguide/backup-and-restore.html
new file mode 100644
index 00000000000..90e8c61e5d4
--- /dev/null
+++ b/docs/userguide/backup-and-restore.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://vitess.io/user-guide/backup-and-restore/">
+<meta http-equiv="refresh" content="0; url=http://vitess.io/user-guide/backup-and-restore/">
+<h1>Redirecting…</h1>
+<a href="http://vitess.io/user-guide/backup-and-restore/">Click here if you are not redirected.</a>
+<script>location="http://vitess.io/user-guide/backup-and-restore/"</script>
+</html>
diff --git a/examples/kubernetes/README.md b/examples/kubernetes/README.md
index 375a0d38191..559f9538072 100644
--- a/examples/kubernetes/README.md
+++ b/examples/kubernetes/README.md
@@ -4,5 +4,5 @@ This directory contains an example configuration for running Vitess on
 [Kubernetes](http://kubernetes.io/).
 
 See the [Vitess on Kubernetes](http://vitess.io/getting-started/)
-and [Sharding in Kubernetes](http://vitess.io/user-guide/sharding-kubernetes.html)
+and [Sharding in Kubernetes](http://vitess.io/user-guide/sharding-kubernetes/)
 guides for instructions on using these files.
diff --git a/examples/kubernetes/vttablet-pod-template.yaml b/examples/kubernetes/vttablet-pod-template.yaml
index 4bfbf0e8980..a00f28b3907 100644
--- a/examples/kubernetes/vttablet-pod-template.yaml
+++ b/examples/kubernetes/vttablet-pod-template.yaml
@@ -80,6 +80,9 @@ spec:
           -orc_api_url http://orchestrator/api
           -orc_discover_interval 5m
           -restore_from_backup {{backup_flags}}" vitess
+      env:
+        - name: EXTRA_MY_CNF
+          value: /vt/config/mycnf/master_mysql56.cnf
     - name: mysql
       image: {{vitess_image}}
       volumeMounts:
diff --git a/examples/local/README.md b/examples/local/README.md
index 6cbb476ceb3..5ea31be0f6d 100644
--- a/examples/local/README.md
+++ b/examples/local/README.md
@@ -5,6 +5,6 @@ local machine, which may be useful for experimentation. These scripts can
 also serve as a starting point for configuring Vitess into your preferred
 deployment strategy or toolset.
 
-See the [Run Vitess Locally](http://vitess.io/getting-started/local-instance.html)
+See the [Run Vitess Locally](http://vitess.io/getting-started/local-instance/)
 guide for instructions on using these scripts.
 
diff --git a/examples/local/sharded-vttablet-up.sh b/examples/local/sharded-vttablet-up.sh
index 13ef0e17990..c7072ced079 100755
--- a/examples/local/sharded-vttablet-up.sh
+++ b/examples/local/sharded-vttablet-up.sh
@@ -21,7 +21,7 @@ set -e
 script_root=`dirname "${BASH_SOURCE}"`
 
 # Shard -80 contains all entries whose keyspace ID has a first byte < 0x80.
-# See: http://vitess.io/overview/concepts.html#keyspace-id
+# See: http://vitess.io/overview/concepts/#keyspace-id
 SHARD=-80 UID_BASE=200 $script_root/vttablet-up.sh "$@"
 
 # Shard 80- contains all entries whose keyspace ID has a first byte >= 0x80.
diff --git a/go/cmd/vtctlclient/main.go b/go/cmd/vtctlclient/main.go
index 90563ec2ae9..6a1e03aaa3c 100644
--- a/go/cmd/vtctlclient/main.go
+++ b/go/cmd/vtctlclient/main.go
@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"errors"
 	"flag"
 	"os"
 	"time"
@@ -45,6 +46,12 @@ func main() {
 
 	logger := logutil.NewConsoleLogger()
 
+	// We can't do much without a -server flag
+	if *server == "" {
+		log.Error(errors.New("Please specify -server <vtctld_host:vtctld_port> to specify the vtctld server to connect to"))
+		os.Exit(1)
+	}
+
 	err := vtctlclient.RunCommandAndWait(
 		context.Background(), *server, flag.Args(),
 		*dialTimeout, *actionTimeout,
diff --git a/go/cmd/vtexplain/vtexplain.go b/go/cmd/vtexplain/vtexplain.go
index b0194ccdc58..3cac092947f 100644
--- a/go/cmd/vtexplain/vtexplain.go
+++ b/go/cmd/vtexplain/vtexplain.go
@@ -17,7 +17,6 @@ limitations under the License.
 package main
 
 import (
-	"encoding/json"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -38,7 +37,7 @@ var (
 	vschemaFlag     = flag.String("vschema", "", "Identifies the VTGate routing schema")
 	vschemaFileFlag = flag.String("vschema-file", "", "Identifies the VTGate routing schema file")
 	numShards       = flag.Int("shards", 2, "Number of shards per keyspace")
-	replicationMode = flag.String("replication-mode", "", "The replication mode to simulate -- must be set to either ROW or STATEMENT")
+	replicationMode = flag.String("replication-mode", "ROW", "The replication mode to simulate -- must be set to either ROW or STATEMENT")
 	normalize       = flag.Bool("normalize", false, "Whether to enable vtgate normalization")
 	outputMode      = flag.String("output-mode", "text", "Output in human-friendly text or json")
 
@@ -182,32 +181,10 @@ func parseAndRun() error {
 	}
 
 	if *outputMode == "text" {
-		printPlans(plans)
+		fmt.Print(vtexplain.ExplainsAsText(plans))
 	} else {
-		planJSON, err := json.MarshalIndent(plans, "", "    ")
-		if err != nil {
-			return err
-		}
-
-		fmt.Printf(string(planJSON))
+		fmt.Print(vtexplain.ExplainsAsJSON(plans))
 	}
 
 	return nil
 }
-
-func printPlans(plans []*vtexplain.Plan) {
-	for _, plan := range plans {
-		fmt.Printf("----------------------------------------------------------------------\n")
-		fmt.Printf("%s\n\n", plan.SQL)
-		for tablet, queries := range plan.TabletQueries {
-			fmt.Printf("[%s]:\n", tablet)
-			for _, tq := range queries {
-				for _, sql := range tq.MysqlQueries {
-					fmt.Printf("%s\n", sql)
-				}
-			}
-			fmt.Printf("\n")
-		}
-	}
-	fmt.Printf("----------------------------------------------------------------------\n")
-}
diff --git a/go/jsonutil/json.go b/go/jsonutil/json.go
new file mode 100644
index 00000000000..2df81a4547b
--- /dev/null
+++ b/go/jsonutil/json.go
@@ -0,0 +1,50 @@
+/*
+Copyright 2017 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package jsonutil contains json-related utility functions
+package jsonutil
+
+import (
+	"bytes"
+	"encoding/json"
+)
+
+// MarshalNoEscape is the same functionality as json.Marshal but
+// with HTML escaping disabled
+func MarshalNoEscape(v interface{}) ([]byte, error) {
+	buf := bytes.Buffer{}
+	enc := json.NewEncoder(&buf)
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(v)
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+// MarshalIndentNoEscape is the same functionality as json.MarshalIndent but with HTML escaping
+// disabled
+func MarshalIndentNoEscape(v interface{}, prefix, indent string) ([]byte, error) {
+	buf := bytes.Buffer{}
+	enc := json.NewEncoder(&buf)
+	enc.SetEscapeHTML(false)
+	enc.SetIndent(prefix, indent)
+	err := enc.Encode(v)
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
diff --git a/go/mysql/constants.go b/go/mysql/constants.go
index 4ce06953732..ede3f720acc 100644
--- a/go/mysql/constants.go
+++ b/go/mysql/constants.go
@@ -177,7 +177,8 @@ const (
 )
 
 // Error codes for client-side errors.
-// Originally found in include/mysql/errmsg.h
+// Originally found in include/mysql/errmsg.h and
+// https://dev.mysql.com/doc/refman/5.7/en/error-messages-client.html
 const (
 	// CRUnknownError is CR_UNKNOWN_ERROR
 	CRUnknownError = 2000
@@ -226,114 +227,202 @@ const (
 	CRMalformedPacket = 2027
 )
 
-// Error codes for server-side errors.
-// Originally found in include/mysql/mysqld_error.h
+// Error codes return in SQLErrors generated by vitess. These error codes
+// are negative to avoid conflicting with mysql error codes below.
 const (
-	// ERAccessDeniedError is ER_ACCESS_DENIED_ERROR
-	ERAccessDeniedError = 1045
-
-	// ERUnknownComError is ER_UNKNOWN_COM_ERROR
-	ERUnknownComError = 1047
-
-	// ERBadNullError is ER_BAD_NULL_ERROR
-	ERBadNullError = 1048
-
-	// ERServerShutdown is ER_SERVER_SHUTDOWN
-	ERServerShutdown = 1053
-
-	// ERDupEntry is ER_DUP_ENTRY
-	ERDupEntry = 1062
+	// ERVitessMaxRowsExceeded is when a user tries to select more rows than the max rows as enforced by vitess.
+	ERVitessMaxRowsExceeded = -100
+)
 
-	// ERUnknownError is ER_UNKNOWN_ERROR
+// Error codes for server-side errors.
+// Originally found in include/mysql/mysqld_error.h and
+// https://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html
+// The below are in sorted order by value, grouped by vterror code they should be bucketed into.
+// See above reference for more information on each code.
+const (
+	// unknown
 	ERUnknownError = 1105
 
-	// ERBadFieldError is ER_BAD_FIELD_ERROR
-	ERBadFieldError = 1054
-
-	// ERRowIsReferenced is ER_ROW_IS_REFERENCED
-	ERRowIsReferenced = 1217
-
-	// ERRowIsReferenced2 is ER_ROW_IS_REFERENCED_2
-	ERRowIsReferenced2 = 1451
-
-	// ERNoReferencedRow is ER_NO_REFERENCED_ROW
-	ERNoReferencedRow = 1216
-
-	// ErNoReferencedRow2 is ER_NO_REFERENCED_ROW_2
-	ErNoReferencedRow2 = 1452
-
-	// EROperandColumns is ER_OPERAND_COLUMNS
-	EROperandColumns = 1241
-
-	// ERSubqueryNo1Row is ER_SUBQUERY_NO_1_ROW
-	ERSubqueryNo1Row = 1242
-
-	// ERCyclicReference is ER_CYCLIC_REFERENCE
-	ERCyclicReference = 1245
-
-	// ERIllegalReference is ER_ILLEGAL_REFERENCE
-	ERIllegalReference = 1247
-
-	// ERDerivedMustHaveAlias is ER_DERIVED_MUST_HAVE_ALIAS
-	ERDerivedMustHaveAlias = 1248
-
-	// ERTableNameNotAllowedHere is ER_TABLENAME_NOT_ALLOWED_HERE
-	ERTableNameNotAllowedHere = 1250
-
-	// ERTooManyTables is ER_TOO_MANY_TABLES
-	ERTooManyTables = 1116
-
-	// ERTooManyFields is ER_TOO_MANY_FIELDS
-	ERTooManyFields = 1117
-
-	// ERInvalidGroupFuncUse is ER_INVALID_GROUP_FUNC_USE
-	ERInvalidGroupFuncUse = 1111
-
-	// ERNoSuchTable is ER_NO_SUCH_TABLE
-	ERNoSuchTable = 1146
-
-	// ERUnknownTable is ER_UNKNOWN_TABLE
-	ERUnknownTable = 1109
-
-	// ERWrongTableName is ER_WRONG_TABLE_NAME
-	ERWrongTableName = 1103
-
-	// ERWrongDbName is ER_WRONG_DB_NAME
-	ERWrongDbName = 1102
-
-	// ERTableNotLockedForWrite is ER_TABLE_NOT_LOCKED_FOR_WRITE
-	ERTableNotLockedForWrite = 1099
-
-	// ERTooBigSet is ER_TOO_BIG_SET
-	ERTooBigSet = 1097
-
-	// ERUpdateTableUsed is ER_UPDATE_TABLE_USED
-	ERUpdateTableUsed = 1093
-
-	// ERSyntaxError is ER_SYNTAX_ERROR
-	ERSyntaxError = 1149
-
-	// ERCantDoThisDuringAnTransaction is
-	// ER_CANT_DO_THIS_DURING_AN_TRANSACTION
-	ERCantDoThisDuringAnTransaction = 1179
-
-	// ERLockWaitTimeout is ER_LOCK_WAIT_TIMEOUT
+	// unimplemented
+	ERNotSupportedYet = 1235
+
+	// resource exhausted
+	ERDiskFull               = 1021
+	EROutOfMemory            = 1037
+	EROutOfSortMemory        = 1038
+	ERConCount               = 1040
+	EROutOfResources         = 1041
+	ERRecordFileFull         = 1114
+	ERHostIsBlocked          = 1129
+	ERCantCreateThread       = 1135
+	ERTooManyDelayedThreads  = 1151
+	ERNetPacketTooLarge      = 1153
+	ERTooManyUserConnections = 1203
+	ERLockTableFull          = 1206
+	ERUserLimitReached       = 1226
+
+	// deadline exceeded
 	ERLockWaitTimeout = 1205
 
-	// ERLockDeadlock is ER_LOCK_DEADLOCK
-	ERLockDeadlock = 1213
-
-	// EROptionPreventsStatement is ER_OPTION_PREVENTS_STATEMENT
-	EROptionPreventsStatement = 1290
-
-	// ERDataTooLong is ER_DATA_TOO_LONG
-	ERDataTooLong = 1406
-
-	// ERDataOutOfRange is ER_DATA_OUT_OF_RANGE
-	ERDataOutOfRange = 1690
+	// unavailable
+	ERServerShutdown = 1053
 
-	// ERTruncatedWrongValueForField is ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
-	ERTruncatedWrongValueForField = 1366
+	// not found
+	ERFormNotFound          = 1029
+	ERKeyNotFound           = 1032
+	ERBadFieldError         = 1054
+	ERNoSuchThread          = 1094
+	ERUnknownTable          = 1109
+	ERCantFindUDF           = 1122
+	ERNonExistingGrant      = 1141
+	ERNoSuchTable           = 1146
+	ERNonExistingTableGrant = 1147
+	ERKeyDoesNotExist       = 1176
+
+	// permissions
+	ERDBAccessDenied            = 1044
+	ERAccessDeniedError         = 1045
+	ERKillDenied                = 1095
+	ERNoPermissionToCreateUsers = 1211
+	ERSpecifiedAccessDenied     = 1227
+
+	// failed precondition
+	ERNoDb                          = 1046
+	ERNoSuchIndex                   = 1082
+	ERCantDropFieldOrKey            = 1091
+	ERTableNotLockedForWrite        = 1099
+	ERTableNotLocked                = 1100
+	ERTooBigSelect                  = 1104
+	ERNotAllowedCommand             = 1148
+	ERTooLongString                 = 1162
+	ERDelayedInsertTableLocked      = 1165
+	ERDupUnique                     = 1169
+	ERRequiresPrimaryKey            = 1173
+	ERCantDoThisDuringAnTransaction = 1179
+	ERReadOnlyTransaction           = 1207
+	ERCannotAddForeign              = 1215
+	ERNoReferencedRow               = 1216
+	ERRowIsReferenced               = 1217
+	ERCantUpdateWithReadLock        = 1223
+	ERNoDefault                     = 1230
+	EROperandColumns                = 1241
+	ERSubqueryNo1Row                = 1242
+	ERNonUpdateableTable            = 1288
+	ERFeatureDisabled               = 1289
+	EROptionPreventsStatement       = 1290
+	ERDuplicatedValueInType         = 1291
+	ERRowIsReferenced2              = 1451
+	ErNoReferencedRow2              = 1452
+
+	// already exists
+	ERTableExists = 1050
+	ERDupEntry    = 1062
+	ERFileExists  = 1086
+	ERUDFExists   = 1125
+
+	// aborted
+	ERGotSignal          = 1078
+	ERForcingClose       = 1080
+	ERAbortingConnection = 1152
+	ERLockDeadlock       = 1213
+
+	// invalid arg
+	ERUnknownComError              = 1047
+	ERBadNullError                 = 1048
+	ERBadDb                        = 1049
+	ERBadTable                     = 1051
+	ERNonUniq                      = 1052
+	ERWrongFieldWithGroup          = 1055
+	ERWrongGroupField              = 1056
+	ERWrongSumSelect               = 1057
+	ERWrongValueCount              = 1058
+	ERTooLongIdent                 = 1059
+	ERDupFieldName                 = 1060
+	ERDupKeyName                   = 1061
+	ERWrongFieldSpec               = 1063
+	ERParseError                   = 1064
+	EREmptyQuery                   = 1065
+	ERNonUniqTable                 = 1066
+	ERInvalidDefault               = 1067
+	ERMultiplePriKey               = 1068
+	ERTooManyKeys                  = 1069
+	ERTooManyKeyParts              = 1070
+	ERTooLongKey                   = 1071
+	ERKeyColumnDoesNotExist        = 1072
+	ERBlobUsedAsKey                = 1073
+	ERTooBigFieldLength            = 1074
+	ERWrongAutoKey                 = 1075
+	ERWrongFieldTerminators        = 1083
+	ERBlobsAndNoTerminated         = 1084
+	ERTextFileNotReadable          = 1085
+	ERWrongSubKey                  = 1089
+	ERCantRemoveAllFields          = 1090
+	ERUpdateTableUsed              = 1093
+	ERNoTablesUsed                 = 1096
+	ERTooBigSet                    = 1097
+	ERBlobCantHaveDefault          = 1101
+	ERWrongDbName                  = 1102
+	ERWrongTableName               = 1103
+	ERUnknownProcedure             = 1106
+	ERWrongParamCountToProcedure   = 1107
+	ERWrongParametersToProcedure   = 1108
+	ERFieldSpecifiedTwice          = 1110
+	ERInvalidGroupFuncUse          = 1111
+	ERTableMustHaveColumns         = 1113
+	ERUnknownCharacterSet          = 1115
+	ERTooManyTables                = 1116
+	ERTooManyFields                = 1117
+	ERTooBigRowSize                = 1118
+	ERWrongOuterJoin               = 1120
+	ERNullColumnInIndex            = 1121
+	ERFunctionNotDefined           = 1128
+	ERWrongValueCountOnRow         = 1136
+	ERInvalidUseOfNull             = 1138
+	ERRegexpError                  = 1139
+	ERMixOfGroupFuncAndFields      = 1140
+	ERIllegalGrantForTable         = 1144
+	ERSyntaxError                  = 1149
+	ERWrongColumnName              = 1166
+	ERWrongKeyColumn               = 1167
+	ERBlobKeyWithoutLength         = 1170
+	ERPrimaryCantHaveNull          = 1171
+	ERTooManyRows                  = 1172
+	ERUnknownSystemVariable        = 1193
+	ERSetConstantsOnly             = 1204
+	ERWrongArguments               = 1210
+	ERWrongUsage                   = 1221
+	ERWrongNumberOfColumnsInSelect = 1222
+	ERDupArgument                  = 1225
+	ERLocalVariable                = 1228
+	ERGlobalVariable               = 1229
+	ERWrongValueForVar             = 1231
+	ERWrongTypeForVar              = 1232
+	ERVarCantBeRead                = 1233
+	ERCantUseOptionHere            = 1234
+	ERIncorrectGlobalLocalVar      = 1238
+	ERWrongFKDef                   = 1239
+	ERKeyRefDoNotMatchTableRef     = 1240
+	ERCyclicReference              = 1245
+	ERCollationCharsetMismatch     = 1253
+	ERCantAggregate2Collations     = 1267
+	ERCantAggregate3Collations     = 1270
+	ERCantAggregateNCollations     = 1271
+	ERVariableIsNotStruct          = 1272
+	ERUnknownCollation             = 1273
+	ERWrongNameForIndex            = 1280
+	ERWrongNameForCatalog          = 1281
+	ERBadFTColumn                  = 1283
+	ERTruncatedWrongValue          = 1292
+	ERTooMuchAutoTimestampCols     = 1293
+	ERInvalidOnUpdate              = 1294
+	ERUnknownTimeZone              = 1298
+	ERInvalidCharacterString       = 1300
+	ERIllegalReference             = 1247
+	ERDerivedMustHaveAlias         = 1248
+	ERTableNameNotAllowedHere      = 1250
+	ERDataTooLong                  = 1406
+	ERDataOutOfRange               = 1690
+	ERTruncatedWrongValueForField  = 1366
 )
 
 // Sql states for errors.
diff --git a/go/mysql/handshake_test.go b/go/mysql/handshake_test.go
index 6d0cd70be09..36fb1016429 100644
--- a/go/mysql/handshake_test.go
+++ b/go/mysql/handshake_test.go
@@ -39,7 +39,7 @@ func TestClearTextClientAuth(t *testing.T) {
 	authServer := NewAuthServerStatic()
 	authServer.Method = MysqlClearPassword
 	authServer.Entries["user1"] = []*AuthServerStaticEntry{
-		&AuthServerStaticEntry{Password: "password1"},
+		{Password: "password1"},
 	}
 
 	// Create the listener.
@@ -97,7 +97,7 @@ func TestSSLConnection(t *testing.T) {
 
 	authServer := NewAuthServerStatic()
 	authServer.Entries["user1"] = []*AuthServerStaticEntry{
-		&AuthServerStaticEntry{Password: "password1"},
+		{Password: "password1"},
 	}
 
 	// Create the listener, so we can get its host.
diff --git a/go/mysql/query.go b/go/mysql/query.go
index 57e14741127..5ea0c54d5dc 100644
--- a/go/mysql/query.go
+++ b/go/mysql/query.go
@@ -379,7 +379,7 @@ func (c *Conn) ExecuteFetch(query string, maxrows int, wantfields bool) (result
 				return nil, err
 			}
 			return nil, &SQLError{
-				Num:     0,
+				Num:     ERVitessMaxRowsExceeded,
 				Message: fmt.Sprintf("Row count exceeded %d", maxrows),
 			}
 		}
diff --git a/go/mysql/server_test.go b/go/mysql/server_test.go
index 1f1d4a70a47..edec4518e94 100644
--- a/go/mysql/server_test.go
+++ b/go/mysql/server_test.go
@@ -149,7 +149,7 @@ func TestConnectionWithoutSourceHost(t *testing.T) {
 	th := &testHandler{}
 
 	authServer := NewAuthServerStatic()
-	authServer.Entries["user1"] = []*AuthServerStaticEntry{&AuthServerStaticEntry{
+	authServer.Entries["user1"] = []*AuthServerStaticEntry{{
 		Password: "password1",
 		UserData: "userData1",
 	}}
@@ -158,9 +158,7 @@ func TestConnectionWithoutSourceHost(t *testing.T) {
 		t.Fatalf("NewListener failed: %v", err)
 	}
 	defer l.Close()
-	go func() {
-		l.Accept()
-	}()
+	go l.Accept()
 
 	host := l.Addr().(*net.TCPAddr).IP.String()
 	port := l.Addr().(*net.TCPAddr).Port
@@ -186,7 +184,7 @@ func TestConnectionWithSourceHost(t *testing.T) {
 	authServer := NewAuthServerStatic()
 
 	authServer.Entries["user1"] = []*AuthServerStaticEntry{
-		&AuthServerStaticEntry{
+		{
 			Password:   "password1",
 			UserData:   "userData1",
 			SourceHost: "localhost",
@@ -198,9 +196,7 @@ func TestConnectionWithSourceHost(t *testing.T) {
 		t.Fatalf("NewListener failed: %v", err)
 	}
 	defer l.Close()
-	go func() {
-		l.Accept()
-	}()
+	go l.Accept()
 
 	host := l.Addr().(*net.TCPAddr).IP.String()
 	port := l.Addr().(*net.TCPAddr).Port
@@ -226,27 +222,29 @@ func TestConnectionUnixSocket(t *testing.T) {
 	authServer := NewAuthServerStatic()
 
 	authServer.Entries["user1"] = []*AuthServerStaticEntry{
-		&AuthServerStaticEntry{
+		{
 			Password:   "password1",
 			UserData:   "userData1",
 			SourceHost: "localhost",
 		},
 	}
 
-	unixSocket := "/tmp/mysql_vitess_test.sock"
+	unixSocket, err := ioutil.TempFile("", "mysql_vitess_test.sock")
+	if err != nil {
+		t.Fatalf("Failed to create temp file")
+	}
+	os.Remove(unixSocket.Name())
 
-	l, err := NewListener("unix", unixSocket, authServer, th)
+	l, err := NewListener("unix", unixSocket.Name(), authServer, th)
 	if err != nil {
 		t.Fatalf("NewListener failed: %v", err)
 	}
 	defer l.Close()
-	go func() {
-		l.Accept()
-	}()
+	go l.Accept()
 
 	// Setup the right parameters.
 	params := &ConnParams{
-		UnixSocket: unixSocket,
+		UnixSocket: unixSocket.Name(),
 		Uname:      "user1",
 		Pass:       "password1",
 	}
@@ -262,7 +260,7 @@ func TestClientFoundRows(t *testing.T) {
 	th := &testHandler{}
 
 	authServer := NewAuthServerStatic()
-	authServer.Entries["user1"] = []*AuthServerStaticEntry{&AuthServerStaticEntry{
+	authServer.Entries["user1"] = []*AuthServerStaticEntry{{
 		Password: "password1",
 		UserData: "userData1",
 	}}
@@ -271,9 +269,7 @@ func TestClientFoundRows(t *testing.T) {
 		t.Fatalf("NewListener failed: %v", err)
 	}
 	defer l.Close()
-	go func() {
-		l.Accept()
-	}()
+	go l.Accept()
 
 	host := l.Addr().(*net.TCPAddr).IP.String()
 	port := l.Addr().(*net.TCPAddr).Port
@@ -317,7 +313,7 @@ func TestServer(t *testing.T) {
 	th := &testHandler{}
 
 	authServer := NewAuthServerStatic()
-	authServer.Entries["user1"] = []*AuthServerStaticEntry{&AuthServerStaticEntry{
+	authServer.Entries["user1"] = []*AuthServerStaticEntry{{
 		Password: "password1",
 		UserData: "userData1",
 	}}
@@ -326,9 +322,7 @@ func TestServer(t *testing.T) {
 		t.Fatalf("NewListener failed: %v", err)
 	}
 	defer l.Close()
-	go func() {
-		l.Accept()
-	}()
+	go l.Accept()
 
 	host := l.Addr().(*net.TCPAddr).IP.String()
 	port := l.Addr().(*net.TCPAddr).Port
@@ -507,7 +501,7 @@ func TestClearTextServer(t *testing.T) {
 	th := &testHandler{}
 
 	authServer := NewAuthServerStatic()
-	authServer.Entries["user1"] = []*AuthServerStaticEntry{&AuthServerStaticEntry{
+	authServer.Entries["user1"] = []*AuthServerStaticEntry{{
 		Password: "password1",
 		UserData: "userData1",
 	}}
@@ -517,9 +511,7 @@ func TestClearTextServer(t *testing.T) {
 		t.Fatalf("NewListener failed: %v", err)
 	}
 	defer l.Close()
-	go func() {
-		l.Accept()
-	}()
+	go l.Accept()
 
 	host := l.Addr().(*net.TCPAddr).IP.String()
 	port := l.Addr().(*net.TCPAddr).Port
@@ -595,7 +587,7 @@ func TestDialogServer(t *testing.T) {
 	th := &testHandler{}
 
 	authServer := NewAuthServerStatic()
-	authServer.Entries["user1"] = []*AuthServerStaticEntry{&AuthServerStaticEntry{
+	authServer.Entries["user1"] = []*AuthServerStaticEntry{{
 		Password: "password1",
 		UserData: "userData1",
 	}}
@@ -606,9 +598,7 @@ func TestDialogServer(t *testing.T) {
 	}
 	l.AllowClearTextWithoutTLS = true
 	defer l.Close()
-	go func() {
-		l.Accept()
-	}()
+	go l.Accept()
 
 	host := l.Addr().(*net.TCPAddr).IP.String()
 	port := l.Addr().(*net.TCPAddr).Port
@@ -642,7 +632,7 @@ func TestTLSServer(t *testing.T) {
 	th := &testHandler{}
 
 	authServer := NewAuthServerStatic()
-	authServer.Entries["user1"] = []*AuthServerStaticEntry{&AuthServerStaticEntry{
+	authServer.Entries["user1"] = []*AuthServerStaticEntry{{
 		Password: "password1",
 	}}
 
@@ -683,9 +673,7 @@ func TestTLSServer(t *testing.T) {
 		t.Fatalf("TLSServerConfig failed: %v", err)
 	}
 	l.TLSConfig = serverConfig
-	go func() {
-		l.Accept()
-	}()
+	go l.Accept()
 
 	// Setup the right parameters.
 	params := &ConnParams{
diff --git a/go/sqltypes/arithmetic.go b/go/sqltypes/arithmetic.go
index 3d0d1fcf75e..e682b3631a7 100644
--- a/go/sqltypes/arithmetic.go
+++ b/go/sqltypes/arithmetic.go
@@ -22,6 +22,8 @@ import (
 	"strconv"
 
 	querypb "github.com/youtube/vitess/go/vt/proto/query"
+	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
+	"github.com/youtube/vitess/go/vt/vterrors"
 )
 
 // numeric represents a numeric value extracted from
@@ -97,12 +99,24 @@ func NullsafeCompare(v1, v2 Value) (int, error) {
 		}
 		return compareNumeric(lv1, lv2), nil
 	}
-	if v1.IsBinary() && v2.IsBinary() {
+	if isByteComparable(v1) && isByteComparable(v2) {
 		return bytes.Compare(v1.ToBytes(), v2.ToBytes()), nil
 	}
 	return 0, fmt.Errorf("types are not comparable: %v vs %v", v1.Type(), v2.Type())
 }
 
+// isByteComparable returns true if the type is binary or date/time.
+func isByteComparable(v Value) bool {
+	if v.IsBinary() {
+		return true
+	}
+	switch v.Type() {
+	case Timestamp, Date, Time, Datetime:
+		return true
+	}
+	return false
+}
+
 // Min returns the minimum of v1 and v2. If one of the
 // values is NULL, it returns the other value. If both
 // are NULL, it returns NULL.
@@ -158,7 +172,7 @@ func Cast(v Value, typ querypb.Type) (Value, error) {
 
 	// Explicitly disallow Expression.
 	if v.Type() == Expression {
-		return NULL, fmt.Errorf("%v cannot be cast to %v", v, typ)
+		return NULL, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v cannot be cast to %v", v, typ)
 	}
 
 	// If the above fast-paths were not possible,
@@ -175,7 +189,7 @@ func ToUint64(v Value) (uint64, error) {
 	switch num.typ {
 	case Int64:
 		if num.ival < 0 {
-			return 0, fmt.Errorf("negative number cannot be converted to unsigned: %d", num.ival)
+			return 0, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "negative number cannot be converted to unsigned: %d", num.ival)
 		}
 		return uint64(num.ival), nil
 	case Uint64:
@@ -196,7 +210,7 @@ func ToInt64(v Value) (int64, error) {
 	case Uint64:
 		ival := int64(num.uval)
 		if ival < 0 {
-			return 0, fmt.Errorf("unsigned number overflows int64 value: %d", num.uval)
+			return 0, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unsigned number overflows int64 value: %d", num.uval)
 		}
 		return ival, nil
 	}
@@ -237,79 +251,71 @@ func ToNative(v Value) (interface{}, error) {
 	case v.IsQuoted() || v.Type() == Decimal:
 		out = v.val
 	case v.Type() == Expression:
-		err = fmt.Errorf("%v cannot be converted to a go type", v)
+		err = vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v cannot be converted to a go type", v)
 	}
 	return out, err
 }
 
 // newNumeric parses a value and produces an Int64, Uint64 or Float64.
-func newNumeric(v Value) (result numeric, err error) {
+func newNumeric(v Value) (numeric, error) {
 	str := v.ToString()
 	switch {
 	case v.IsSigned():
-		result.ival, err = strconv.ParseInt(str, 10, 64)
-		result.typ = Int64
-		return
+		ival, err := strconv.ParseInt(str, 10, 64)
+		if err != nil {
+			return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
+		}
+		return numeric{ival: ival, typ: Int64}, nil
 	case v.IsUnsigned():
-		result.uval, err = strconv.ParseUint(str, 10, 64)
-		result.typ = Uint64
-		return
+		uval, err := strconv.ParseUint(str, 10, 64)
+		if err != nil {
+			return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
+		}
+		return numeric{uval: uval, typ: Uint64}, nil
 	case v.IsFloat():
-		result.fval, err = strconv.ParseFloat(str, 64)
-		result.typ = Float64
-		return
+		fval, err := strconv.ParseFloat(str, 64)
+		if err != nil {
+			return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
+		}
+		return numeric{fval: fval, typ: Float64}, nil
 	}
 
 	// For other types, do best effort.
-	result.ival, err = strconv.ParseInt(str, 10, 64)
-	if err == nil {
-		result.typ = Int64
-		return
-	}
-	result.fval, err = strconv.ParseFloat(str, 64)
-	if err == nil {
-		result.typ = Float64
-		return
-	}
-	err = fmt.Errorf("could not parse value: %s", str)
-	return
+	if ival, err := strconv.ParseInt(str, 10, 64); err == nil {
+		return numeric{ival: ival, typ: Int64}, nil
+	}
+	if fval, err := strconv.ParseFloat(str, 64); err == nil {
+		return numeric{fval: fval, typ: Float64}, nil
+	}
+	return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "could not parse value: %s", str)
 }
 
 // newIntegralNumeric parses a value and produces an Int64 or Uint64.
-func newIntegralNumeric(v Value) (result numeric, err error) {
+func newIntegralNumeric(v Value) (numeric, error) {
 	str := v.ToString()
 	switch {
 	case v.IsSigned():
-		result.ival, err = strconv.ParseInt(str, 10, 64)
+		ival, err := strconv.ParseInt(str, 10, 64)
 		if err != nil {
-			return
+			return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
 		}
-		result.typ = Int64
-		return
+		return numeric{ival: ival, typ: Int64}, nil
 	case v.IsUnsigned():
-		result.uval, err = strconv.ParseUint(str, 10, 64)
+		uval, err := strconv.ParseUint(str, 10, 64)
 		if err != nil {
-			return
+			return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
 		}
-		result.typ = Uint64
-		return
+		return numeric{uval: uval, typ: Uint64}, nil
 	}
 
 	// For other types, do best effort.
-	result.ival, err = strconv.ParseInt(str, 10, 64)
-	if err == nil {
-		result.typ = Int64
-		return
-	}
-	// ParseInt can return a non-zero value on failure.
-	result.ival = 0
-	result.uval, err = strconv.ParseUint(str, 10, 64)
-	if err == nil {
-		result.typ = Uint64
-		return
-	}
-	err = fmt.Errorf("could not parse value: %s", str)
-	return
+	if ival, err := strconv.ParseInt(str, 10, 64); err == nil {
+		return numeric{ival: ival, typ: Int64}, nil
+	}
+	if uval, err := strconv.ParseUint(str, 10, 64); err == nil {
+		return numeric{uval: uval, typ: Uint64}, nil
+	}
+	return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "could not parse value: %s", str)
 }
 
 func addNumeric(v1, v2 numeric) (numeric, error) {
@@ -362,7 +368,7 @@ overflow:
 
 func uintPlusInt(v1 uint64, v2 int64) (numeric, error) {
 	if v2 < 0 {
-		return numeric{}, fmt.Errorf("cannot add a negative number to an unsigned integer: %d, %d", v1, v2)
+		return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "cannot add a negative number to an unsigned integer: %d, %d", v1, v2)
 	}
 	return uintPlusUint(v1, uint64(v2)), nil
 }
@@ -392,14 +398,14 @@ func castFromNumeric(v numeric, resultType querypb.Type) (Value, error) {
 		case Int64:
 			return MakeTrusted(resultType, strconv.AppendInt(nil, v.ival, 10)), nil
 		case Uint64, Float64:
-			return NULL, fmt.Errorf("unexpected type conversion: %v to %v", v.typ, resultType)
+			return NULL, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion: %v to %v", v.typ, resultType)
 		}
 	case IsUnsigned(resultType):
 		switch v.typ {
 		case Uint64:
 			return MakeTrusted(resultType, strconv.AppendUint(nil, v.uval, 10)), nil
 		case Int64, Float64:
-			return NULL, fmt.Errorf("unexpected type conversion: %v to %v", v.typ, resultType)
+			return NULL, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion: %v to %v", v.typ, resultType)
 		}
 	case IsFloat(resultType) || resultType == Decimal:
 		switch v.typ {
@@ -415,7 +421,7 @@ func castFromNumeric(v numeric, resultType querypb.Type) (Value, error) {
 			return MakeTrusted(resultType, strconv.AppendFloat(nil, v.fval, format, -1, 64)), nil
 		}
 	}
-	return NULL, fmt.Errorf("unexpected type conversion to non-numeric: %v", resultType)
+	return NULL, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion to non-numeric: %v", resultType)
 }
 
 func compareNumeric(v1, v2 numeric) int {
diff --git a/go/sqltypes/arithmetic_test.go b/go/sqltypes/arithmetic_test.go
index e2394833cd9..f3f67727d8c 100644
--- a/go/sqltypes/arithmetic_test.go
+++ b/go/sqltypes/arithmetic_test.go
@@ -21,17 +21,18 @@ import (
 	"fmt"
 	"reflect"
 	"strconv"
-	"strings"
 	"testing"
 
 	querypb "github.com/youtube/vitess/go/vt/proto/query"
+	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
+	"github.com/youtube/vitess/go/vt/vterrors"
 )
 
 func TestAdd(t *testing.T) {
 	tcases := []struct {
 		v1, v2 Value
 		out    Value
-		err    string
+		err    error
 	}{{
 		// All nulls.
 		v1:  NULL,
@@ -56,32 +57,32 @@ func TestAdd(t *testing.T) {
 		// Make sure underlying error is returned for LHS.
 		v1:  TestValue(Int64, "1.2"),
 		v2:  NewInt64(2),
-		err: "strconv.ParseInt: parsing \"1.2\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseInt: parsing \"1.2\": invalid syntax"),
 	}, {
 		// Make sure underlying error is returned for RHS.
 		v1:  NewInt64(2),
 		v2:  TestValue(Int64, "1.2"),
-		err: "strconv.ParseInt: parsing \"1.2\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseInt: parsing \"1.2\": invalid syntax"),
 	}, {
 		// Make sure underlying error is returned while adding.
 		v1:  NewInt64(-1),
 		v2:  NewUint64(2),
-		err: "cannot add a negative number to an unsigned integer: 2, -1",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "cannot add a negative number to an unsigned integer: 2, -1"),
 	}, {
 		// Make sure underlying error is returned while converting.
 		v1:  NewFloat64(1),
 		v2:  NewFloat64(2),
-		err: "unexpected type conversion: FLOAT64 to INT64",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion: FLOAT64 to INT64"),
 	}}
 	for _, tcase := range tcases {
 		got, err := NullsafeAdd(tcase.v1, tcase.v2, Int64)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("Add(%v, %v) error: %v, want %v", printValue(tcase.v1), printValue(tcase.v2), vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("Add(%v, %v) error: %v, want %v", printValue(tcase.v1), printValue(tcase.v2), err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if !reflect.DeepEqual(got, tcase.out) {
 			t.Errorf("Add(%v, %v): %v, want %v", printValue(tcase.v1), printValue(tcase.v2), printValue(got), printValue(tcase.out))
 		}
@@ -92,7 +93,7 @@ func TestNullsafeCompare(t *testing.T) {
 	tcases := []struct {
 		v1, v2 Value
 		out    int
-		err    string
+		err    error
 	}{{
 		// All nulls.
 		v1:  NULL,
@@ -112,17 +113,17 @@ func TestNullsafeCompare(t *testing.T) {
 		// LHS Text
 		v1:  TestValue(VarChar, "abcd"),
 		v2:  TestValue(VarChar, "abcd"),
-		err: "types are not comparable: VARCHAR vs VARCHAR",
+		err: vterrors.New(vtrpcpb.Code_UNKNOWN, "types are not comparable: VARCHAR vs VARCHAR"),
 	}, {
 		// Make sure underlying error is returned for LHS.
 		v1:  TestValue(Int64, "1.2"),
 		v2:  NewInt64(2),
-		err: "strconv.ParseInt: parsing \"1.2\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseInt: parsing \"1.2\": invalid syntax"),
 	}, {
 		// Make sure underlying error is returned for RHS.
 		v1:  NewInt64(2),
 		v2:  TestValue(Int64, "1.2"),
-		err: "strconv.ParseInt: parsing \"1.2\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseInt: parsing \"1.2\": invalid syntax"),
 	}, {
 		// Numeric equal.
 		v1:  NewInt64(1),
@@ -143,18 +144,33 @@ func TestNullsafeCompare(t *testing.T) {
 		v1:  TestValue(VarBinary, "abcd"),
 		v2:  TestValue(Binary, "bcde"),
 		out: -1,
+	}, {
+		// Date/Time types
+		v1:  TestValue(Datetime, "1000-01-01 00:00:00"),
+		v2:  TestValue(Binary, "1000-01-01 00:00:00"),
+		out: 0,
+	}, {
+		// Date/Time types
+		v1:  TestValue(Datetime, "2000-01-01 00:00:00"),
+		v2:  TestValue(Binary, "1000-01-01 00:00:00"),
+		out: 1,
+	}, {
+		// Date/Time types
+		v1:  TestValue(Datetime, "1000-01-01 00:00:00"),
+		v2:  TestValue(Binary, "2000-01-01 00:00:00"),
+		out: -1,
 	}}
 	for _, tcase := range tcases {
 		got, err := NullsafeCompare(tcase.v1, tcase.v2)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("NullsafeCompare(%v, %v) error: %v, want %v", printValue(tcase.v1), printValue(tcase.v2), vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("NullsafeLess(%v, %v) error: %v, want %v", printValue(tcase.v1), printValue(tcase.v2), err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if got != tcase.out {
-			t.Errorf("NullsafeLess(%v, %v): %v, want %v", printValue(tcase.v1), printValue(tcase.v2), got, tcase.out)
+			t.Errorf("NullsafeCompare(%v, %v): %v, want %v", printValue(tcase.v1), printValue(tcase.v2), got, tcase.out)
 		}
 	}
 }
@@ -164,7 +180,7 @@ func TestCast(t *testing.T) {
 		typ querypb.Type
 		v   Value
 		out Value
-		err string
+		err error
 	}{{
 		typ: VarChar,
 		v:   NULL,
@@ -184,7 +200,7 @@ func TestCast(t *testing.T) {
 	}, {
 		typ: Int24,
 		v:   TestValue(VarChar, "bad int"),
-		err: "invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_UNKNOWN, `strconv.ParseInt: parsing "bad int": invalid syntax`),
 	}, {
 		typ: Uint64,
 		v:   TestValue(Uint32, "32"),
@@ -196,7 +212,7 @@ func TestCast(t *testing.T) {
 	}, {
 		typ: Uint24,
 		v:   TestValue(Int64, "-1"),
-		err: "invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_UNKNOWN, `strconv.ParseUint: parsing "-1": invalid syntax`),
 	}, {
 		typ: Float64,
 		v:   TestValue(Int64, "64"),
@@ -216,7 +232,7 @@ func TestCast(t *testing.T) {
 	}, {
 		typ: Float64,
 		v:   TestValue(VarChar, "bad float"),
-		err: "invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_UNKNOWN, `strconv.ParseFloat: parsing "bad float": invalid syntax`),
 	}, {
 		typ: VarChar,
 		v:   TestValue(Int64, "64"),
@@ -240,19 +256,17 @@ func TestCast(t *testing.T) {
 	}, {
 		typ: VarChar,
 		v:   TestValue(Expression, "bad string"),
-		err: "EXPRESSION(bad string) cannot be cast to VARCHAR",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "EXPRESSION(bad string) cannot be cast to VARCHAR"),
 	}}
 	for _, tcase := range tcases {
 		got, err := Cast(tcase.v, tcase.typ)
-		if tcase.err != "" {
-			if err == nil || !strings.Contains(err.Error(), tcase.err) {
-				t.Errorf("Cast(%v) error: %v, must contain %s", tcase.v, err, tcase.err)
-			}
-			continue
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("Cast(%v) error: %v, want %v", tcase.v, vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if err != nil {
-			t.Errorf("Cast(%v) error: %v", tcase.v, err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if !reflect.DeepEqual(got, tcase.out) {
 			t.Errorf("Cast(%v): %v, want %v", tcase.v, got, tcase.out)
 		}
@@ -263,13 +277,13 @@ func TestToUint64(t *testing.T) {
 	tcases := []struct {
 		v   Value
 		out uint64
-		err string
+		err error
 	}{{
 		v:   TestValue(VarChar, "abcd"),
-		err: "could not parse value: abcd",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "could not parse value: abcd"),
 	}, {
 		v:   NewInt64(-1),
-		err: "negative number cannot be converted to unsigned: -1",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "negative number cannot be converted to unsigned: -1"),
 	}, {
 		v:   NewInt64(1),
 		out: 1,
@@ -279,13 +293,13 @@ func TestToUint64(t *testing.T) {
 	}}
 	for _, tcase := range tcases {
 		got, err := ToUint64(tcase.v)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("ToUint64(%v) error: %v, want %v", tcase.v, vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("ToUint64(%v) error: %v, want %v", tcase.v, err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if got != tcase.out {
 			t.Errorf("ToUint64(%v): %v, want %v", tcase.v, got, tcase.out)
 		}
@@ -296,13 +310,13 @@ func TestToInt64(t *testing.T) {
 	tcases := []struct {
 		v   Value
 		out int64
-		err string
+		err error
 	}{{
 		v:   TestValue(VarChar, "abcd"),
-		err: "could not parse value: abcd",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "could not parse value: abcd"),
 	}, {
 		v:   NewUint64(18446744073709551615),
-		err: "unsigned number overflows int64 value: 18446744073709551615",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unsigned number overflows int64 value: 18446744073709551615"),
 	}, {
 		v:   NewInt64(1),
 		out: 1,
@@ -312,13 +326,13 @@ func TestToInt64(t *testing.T) {
 	}}
 	for _, tcase := range tcases {
 		got, err := ToInt64(tcase.v)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("ToInt64(%v) error: %v, want %v", tcase.v, vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("ToInt64(%v) error: %v, want %s", tcase.v, err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if got != tcase.out {
 			t.Errorf("ToInt64(%v): %v, want %v", tcase.v, got, tcase.out)
 		}
@@ -329,10 +343,10 @@ func TestToFloat64(t *testing.T) {
 	tcases := []struct {
 		v   Value
 		out float64
-		err string
+		err error
 	}{{
 		v:   TestValue(VarChar, "abcd"),
-		err: "could not parse value: abcd",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "could not parse value: abcd"),
 	}, {
 		v:   NewInt64(1),
 		out: 1,
@@ -345,13 +359,13 @@ func TestToFloat64(t *testing.T) {
 	}}
 	for _, tcase := range tcases {
 		got, err := ToFloat64(tcase.v)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("ToFloat64(%v) error: %v, want %v", tcase.v, vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("ToFloat64(%v) error: %v, want %s", tcase.v, err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if got != tcase.out {
 			t.Errorf("ToFloat64(%v): %v, want %v", tcase.v, got, tcase.out)
 		}
@@ -459,9 +473,9 @@ func TestToNative(t *testing.T) {
 
 	// Test Expression failure.
 	_, err := ToNative(TestValue(Expression, "aa"))
-	want := "EXPRESSION(aa) cannot be converted to a go type"
-	if err == nil || err.Error() != want {
-		t.Errorf("ToNative(EXPRESSION): %v, want %s", err, want)
+	want := vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "EXPRESSION(aa) cannot be converted to a go type")
+	if !vterrors.Equals(err, want) {
+		t.Errorf("ToNative(EXPRESSION): %v, want %v", vterrors.Print(err), vterrors.Print(want))
 	}
 }
 
@@ -469,7 +483,7 @@ func TestNewNumeric(t *testing.T) {
 	tcases := []struct {
 		v   Value
 		out numeric
-		err string
+		err error
 	}{{
 		v:   NewInt64(1),
 		out: numeric{typ: Int64, ival: 1},
@@ -490,29 +504,29 @@ func TestNewNumeric(t *testing.T) {
 	}, {
 		// Only valid Int64 allowed if type is Int64.
 		v:   TestValue(Int64, "1.2"),
-		err: "strconv.ParseInt: parsing \"1.2\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseInt: parsing \"1.2\": invalid syntax"),
 	}, {
 		// Only valid Uint64 allowed if type is Uint64.
 		v:   TestValue(Uint64, "1.2"),
-		err: "strconv.ParseUint: parsing \"1.2\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseUint: parsing \"1.2\": invalid syntax"),
 	}, {
 		// Only valid Float64 allowed if type is Float64.
 		v:   TestValue(Float64, "abcd"),
-		err: "strconv.ParseFloat: parsing \"abcd\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseFloat: parsing \"abcd\": invalid syntax"),
 	}, {
 		v:   TestValue(VarChar, "abcd"),
-		err: "could not parse value: abcd",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "could not parse value: abcd"),
 	}}
 	for _, tcase := range tcases {
 		got, err := newNumeric(tcase.v)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("newNumeric(%s) error: %v, want %v", printValue(tcase.v), vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("newNumeric(%s) error: %v, want %v", printValue(tcase.v), err, tcase.err)
+		if tcase.err == nil {
+			continue
 		}
-		if tcase.err == "" && got != tcase.out {
+
+		if got != tcase.out {
 			t.Errorf("newNumeric(%s): %v, want %v", printValue(tcase.v), got, tcase.out)
 		}
 	}
@@ -522,7 +536,7 @@ func TestNewIntegralNumeric(t *testing.T) {
 	tcases := []struct {
 		v   Value
 		out numeric
-		err string
+		err error
 	}{{
 		v:   NewInt64(1),
 		out: numeric{typ: Int64, ival: 1},
@@ -543,24 +557,24 @@ func TestNewIntegralNumeric(t *testing.T) {
 	}, {
 		// Only valid Int64 allowed if type is Int64.
 		v:   TestValue(Int64, "1.2"),
-		err: "strconv.ParseInt: parsing \"1.2\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseInt: parsing \"1.2\": invalid syntax"),
 	}, {
 		// Only valid Uint64 allowed if type is Uint64.
 		v:   TestValue(Uint64, "1.2"),
-		err: "strconv.ParseUint: parsing \"1.2\": invalid syntax",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "strconv.ParseUint: parsing \"1.2\": invalid syntax"),
 	}, {
 		v:   TestValue(VarChar, "abcd"),
-		err: "could not parse value: abcd",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "could not parse value: abcd"),
 	}}
 	for _, tcase := range tcases {
 		got, err := newIntegralNumeric(tcase.v)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if err != nil && !vterrors.Equals(err, tcase.err) {
+			t.Errorf("newIntegralNumeric(%s) error: %v, want %v", printValue(tcase.v), vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("newIntegralNumeric(%s) error: %v, want %v", printValue(tcase.v), err, tcase.err)
+		if tcase.err == nil {
+			continue
 		}
+
 		if got != tcase.out {
 			t.Errorf("newIntegralNumeric(%s): %v, want %v", printValue(tcase.v), got, tcase.out)
 		}
@@ -571,7 +585,7 @@ func TestAddNumeric(t *testing.T) {
 	tcases := []struct {
 		v1, v2 numeric
 		out    numeric
-		err    string
+		err    error
 	}{{
 		v1:  numeric{typ: Int64, ival: 1},
 		v2:  numeric{typ: Int64, ival: 2},
@@ -609,7 +623,7 @@ func TestAddNumeric(t *testing.T) {
 	}, {
 		v1:  numeric{typ: Int64, ival: -1},
 		v2:  numeric{typ: Uint64, uval: 2},
-		err: "cannot add a negative number to an unsigned integer: 2, -1",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "cannot add a negative number to an unsigned integer: 2, -1"),
 	}, {
 		// Uint64 overflow.
 		v1:  numeric{typ: Uint64, uval: 18446744073709551615},
@@ -618,13 +632,13 @@ func TestAddNumeric(t *testing.T) {
 	}}
 	for _, tcase := range tcases {
 		got, err := addNumeric(tcase.v1, tcase.v2)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("addNumeric(%v, %v) error: %v, want %v", tcase.v1, tcase.v2, vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("addNumeric(%v, %v) error: %v, want %v", tcase.v1, tcase.v2, err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if got != tcase.out {
 			t.Errorf("addNumeric(%v, %v): %v, want %v", tcase.v1, tcase.v2, got, tcase.out)
 		}
@@ -683,7 +697,7 @@ func TestCastFromNumeric(t *testing.T) {
 		typ querypb.Type
 		v   numeric
 		out Value
-		err string
+		err error
 	}{{
 		typ: Int64,
 		v:   numeric{typ: Int64, ival: 1},
@@ -691,15 +705,15 @@ func TestCastFromNumeric(t *testing.T) {
 	}, {
 		typ: Int64,
 		v:   numeric{typ: Uint64, uval: 1},
-		err: "unexpected type conversion: UINT64 to INT64",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion: UINT64 to INT64"),
 	}, {
 		typ: Int64,
 		v:   numeric{typ: Float64, fval: 1.2e-16},
-		err: "unexpected type conversion: FLOAT64 to INT64",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion: FLOAT64 to INT64"),
 	}, {
 		typ: Uint64,
 		v:   numeric{typ: Int64, ival: 1},
-		err: "unexpected type conversion: INT64 to UINT64",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion: INT64 to UINT64"),
 	}, {
 		typ: Uint64,
 		v:   numeric{typ: Uint64, uval: 1},
@@ -707,7 +721,7 @@ func TestCastFromNumeric(t *testing.T) {
 	}, {
 		typ: Uint64,
 		v:   numeric{typ: Float64, fval: 1.2e-16},
-		err: "unexpected type conversion: FLOAT64 to UINT64",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion: FLOAT64 to UINT64"),
 	}, {
 		typ: Float64,
 		v:   numeric{typ: Int64, ival: 1},
@@ -736,19 +750,19 @@ func TestCastFromNumeric(t *testing.T) {
 	}, {
 		typ: VarBinary,
 		v:   numeric{typ: Int64, ival: 1},
-		err: "unexpected type conversion to non-numeric: VARBINARY",
+		err: vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected type conversion to non-numeric: VARBINARY"),
 	}}
 	for _, tcase := range tcases {
 		got, err := castFromNumeric(tcase.v, tcase.typ)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("castFromNumeric(%v, %v) error: %v, want %v", tcase.v, tcase.typ, vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("castFromNumeric(%v, %v) error: %v, want %v", tcase.v, tcase.typ, err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if !reflect.DeepEqual(got, tcase.out) {
-			t.Errorf("castFromNumeric(%v, %v): %s, want %s", tcase.v, tcase.typ, printValue(got), printValue(tcase.out))
+			t.Errorf("castFromNumeric(%v, %v): %v, want %v", tcase.v, tcase.typ, printValue(got), printValue(tcase.out))
 		}
 	}
 }
@@ -888,7 +902,7 @@ func TestMin(t *testing.T) {
 	tcases := []struct {
 		v1, v2 Value
 		min    Value
-		err    string
+		err    error
 	}{{
 		v1:  NULL,
 		v2:  NULL,
@@ -916,17 +930,17 @@ func TestMin(t *testing.T) {
 	}, {
 		v1:  TestValue(VarChar, "aa"),
 		v2:  TestValue(VarChar, "aa"),
-		err: "types are not comparable: VARCHAR vs VARCHAR",
+		err: vterrors.New(vtrpcpb.Code_UNKNOWN, "types are not comparable: VARCHAR vs VARCHAR"),
 	}}
 	for _, tcase := range tcases {
 		v, err := Min(tcase.v1, tcase.v2)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("Min error: %v, want %v", vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("Min error: %v, want %s", err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if !reflect.DeepEqual(v, tcase.min) {
 			t.Errorf("Min(%v, %v): %v, want %v", tcase.v1, tcase.v2, v, tcase.min)
 		}
@@ -937,7 +951,7 @@ func TestMax(t *testing.T) {
 	tcases := []struct {
 		v1, v2 Value
 		max    Value
-		err    string
+		err    error
 	}{{
 		v1:  NULL,
 		v2:  NULL,
@@ -965,17 +979,17 @@ func TestMax(t *testing.T) {
 	}, {
 		v1:  TestValue(VarChar, "aa"),
 		v2:  TestValue(VarChar, "aa"),
-		err: "types are not comparable: VARCHAR vs VARCHAR",
+		err: vterrors.New(vtrpcpb.Code_UNKNOWN, "types are not comparable: VARCHAR vs VARCHAR"),
 	}}
 	for _, tcase := range tcases {
 		v, err := Max(tcase.v1, tcase.v2)
-		errstr := ""
-		if err != nil {
-			errstr = err.Error()
+		if !vterrors.Equals(err, tcase.err) {
+			t.Errorf("Max error: %v, want %v", vterrors.Print(err), vterrors.Print(tcase.err))
 		}
-		if errstr != tcase.err {
-			t.Errorf("Max error: %v, want %s", err, tcase.err)
+		if tcase.err != nil {
+			continue
 		}
+
 		if !reflect.DeepEqual(v, tcase.max) {
 			t.Errorf("Max(%v, %v): %v, want %v", tcase.v1, tcase.v2, v, tcase.max)
 		}
diff --git a/go/sqltypes/plan_value.go b/go/sqltypes/plan_value.go
index f7dfde7d368..4745241ef0e 100644
--- a/go/sqltypes/plan_value.go
+++ b/go/sqltypes/plan_value.go
@@ -18,10 +18,10 @@ package sqltypes
 
 import (
 	"encoding/json"
-	"errors"
-	"fmt"
 
 	querypb "github.com/youtube/vitess/go/vt/proto/query"
+	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
+	"github.com/youtube/vitess/go/vt/vterrors"
 )
 
 // PlanValue represents a value or a list of values for
@@ -87,7 +87,7 @@ func (pv PlanValue) ResolveValue(bindVars map[string]*querypb.BindVariable) (Val
 	case pv.ListKey != "" || pv.Values != nil:
 		// This code is unreachable because the parser does not allow
 		// multi-value constructs where a single value is expected.
-		return NULL, errors.New("a list was supplied where a single value was expected")
+		return NULL, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "a list was supplied where a single value was expected")
 	}
 	return NULL, nil
 }
@@ -95,10 +95,10 @@ func (pv PlanValue) ResolveValue(bindVars map[string]*querypb.BindVariable) (Val
 func (pv PlanValue) lookupValue(bindVars map[string]*querypb.BindVariable) (*querypb.BindVariable, error) {
 	bv, ok := bindVars[pv.Key]
 	if !ok {
-		return nil, fmt.Errorf("missing bind var %s", pv.Key)
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "missing bind var %s", pv.Key)
 	}
 	if bv.Type == querypb.Type_TUPLE {
-		return nil, fmt.Errorf("TUPLE was supplied for single value bind var %s", pv.ListKey)
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "TUPLE was supplied for single value bind var %s", pv.ListKey)
 	}
 	return bv, nil
 }
@@ -129,16 +129,16 @@ func (pv PlanValue) ResolveList(bindVars map[string]*querypb.BindVariable) ([]Va
 	}
 	// This code is unreachable because the parser does not allow
 	// single value constructs where multiple values are expected.
-	return nil, errors.New("a single value was supplied where a list was expected")
+	return nil, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "a single value was supplied where a list was expected")
 }
 
 func (pv PlanValue) lookupList(bindVars map[string]*querypb.BindVariable) (*querypb.BindVariable, error) {
 	bv, ok := bindVars[pv.ListKey]
 	if !ok {
-		return nil, fmt.Errorf("missing bind var %s", pv.ListKey)
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "missing bind var %s", pv.ListKey)
 	}
 	if bv.Type != querypb.Type_TUPLE {
-		return nil, fmt.Errorf("single value was supplied for TUPLE bind var %s", pv.ListKey)
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "single value was supplied for TUPLE bind var %s", pv.ListKey)
 	}
 	return bv, nil
 }
@@ -171,7 +171,7 @@ func rowCount(pvs []PlanValue, bindVars map[string]*querypb.BindVariable) (int,
 		case l:
 			return nil
 		default:
-			return errors.New("mismatch in number of column values")
+			return vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "mismatch in number of column values")
 		}
 	}
 
diff --git a/go/sqltypes/type.go b/go/sqltypes/type.go
index 67a65b226b6..6f9d8e7b28f 100644
--- a/go/sqltypes/type.go
+++ b/go/sqltypes/type.go
@@ -104,6 +104,10 @@ func isNumber(t querypb.Type) bool {
 // neither binary or text.
 // querypb.Type_TUPLE is not included in this list
 // because it's not a valid Value type.
+// TODO(sougou): provide a categorization function
+// that returns enums, which will allow for cleaner
+// switch statements for those who want to cover types
+// by their category.
 const (
 	Null       = querypb.Type_NULL_TYPE
 	Int8       = querypb.Type_INT8
diff --git a/go/sync2/consolidator.go b/go/sync2/consolidator.go
index 4485524f43f..d0248581057 100644
--- a/go/sync2/consolidator.go
+++ b/go/sync2/consolidator.go
@@ -102,6 +102,19 @@ func NewConsolidatorCache(capacity int64) *ConsolidatorCache {
 
 // ServeHTTP lists the most recent, cached queries and their count.
 func (cc *ConsolidatorCache) ServeHTTP(response http.ResponseWriter, request *http.Request) {
+	if true {
+		response.Write([]byte(`
+	<!DOCTYPE html>
+	<html>
+	<body>
+	<h1>Redacted</h1>
+	<p>/debug/consolidations has been redacted for your protection</p>
+	</body>
+	</html>
+		`))
+		return
+	}
+
 	if err := acl.CheckAccessHTTP(request, acl.DEBUGGING); err != nil {
 		acl.SendError(response, err)
 		return
diff --git a/go/vt/discovery/fake_healthcheck.go b/go/vt/discovery/fake_healthcheck.go
index 240d2b9b36f..a40c032fb4d 100644
--- a/go/vt/discovery/fake_healthcheck.go
+++ b/go/vt/discovery/fake_healthcheck.go
@@ -106,6 +106,12 @@ func (fhc *FakeHealthCheck) RemoveTablet(tablet *topodatapb.Tablet) {
 	delete(fhc.items, key)
 }
 
+// ReplaceTablet removes the old tablet and adds the new.
+func (fhc *FakeHealthCheck) ReplaceTablet(old, new *topodatapb.Tablet, name string) {
+	fhc.RemoveTablet(old)
+	fhc.AddTablet(new, name)
+}
+
 // GetConnection returns the TabletConn of the given tablet.
 func (fhc *FakeHealthCheck) GetConnection(key string) queryservice.QueryService {
 	fhc.mu.RLock()
diff --git a/go/vt/discovery/healthcheck.go b/go/vt/discovery/healthcheck.go
index 7c586d8b866..1ff743b381f 100644
--- a/go/vt/discovery/healthcheck.go
+++ b/go/vt/discovery/healthcheck.go
@@ -44,6 +44,10 @@ import (
 	"sync"
 	"time"
 
+	"bytes"
+	"encoding/json"
+	"net/http"
+
 	log "github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	"github.com/youtube/vitess/go/netutil"
@@ -51,6 +55,7 @@ import (
 	querypb "github.com/youtube/vitess/go/vt/proto/query"
 	topodatapb "github.com/youtube/vitess/go/vt/proto/topodata"
 	"github.com/youtube/vitess/go/vt/topo/topoproto"
+	"github.com/youtube/vitess/go/vt/topotools"
 	"github.com/youtube/vitess/go/vt/vttablet/queryservice"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletconn"
 	"golang.org/x/net/context"
@@ -59,6 +64,7 @@ import (
 var (
 	hcErrorCounters          = stats.NewMultiCounters("HealthcheckErrors", []string{"Keyspace", "ShardName", "TabletType"})
 	hcMasterPromotedCounters = stats.NewMultiCounters("HealthcheckMasterPromoted", []string{"Keyspace", "ShardName"})
+	healthcheckOnce          sync.Once
 )
 
 // See the documentation for NewHealthCheck below for an explanation of these parameters.
@@ -321,6 +327,11 @@ func NewHealthCheck(connTimeout, retryDelay, healthCheckTimeout time.Duration) H
 			}
 		}
 	}()
+
+	healthcheckOnce.Do(func() {
+		http.Handle("/debug/gateway", hc)
+	})
+
 	return hc
 }
 
@@ -329,6 +340,21 @@ func (hc *HealthCheckImpl) RegisterStats() {
 	stats.NewMultiCountersFunc("HealthcheckConnections", []string{"Keyspace", "ShardName", "TabletType"}, hc.servingConnStats)
 }
 
+// ServeHTTP is part of the http.Handler interface. It renders the current state of the discovery gateway tablet cache into json.
+func (hc *HealthCheckImpl) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	status := hc.cacheStatusMap()
+	b, err := json.MarshalIndent(status, "", " ")
+	if err != nil {
+		w.Write([]byte(err.Error()))
+		return
+	}
+
+	buf := bytes.NewBuffer(nil)
+	json.HTMLEscape(buf, b)
+	w.Write(buf.Bytes())
+}
+
 // servingConnStats returns the number of serving tablets per keyspace/shard/tablet type.
 func (hc *HealthCheckImpl) servingConnStats() map[string]int64 {
 	res := make(map[string]int64)
@@ -477,7 +503,8 @@ func (hcc *healthCheckConn) processResponse(hc *HealthCheckImpl, shr *querypb.St
 	// initial message), we want to log it, and maybe advertise it too.
 	if hcc.tabletStats.Target.TabletType != topodatapb.TabletType_UNKNOWN && hcc.tabletStats.Target.TabletType != shr.Target.TabletType {
 		// Log and maybe notify
-		log.Infof("HealthCheckUpdate(Type Change): %v, tablet: %v/%+v, target %+v => %+v, reparent time: %v", oldTs.Name, oldTs.Tablet.Alias.Cell, oldTs.Tablet, oldTs.Target, shr.Target, shr.TabletExternallyReparentedTimestamp)
+		log.Infof("HealthCheckUpdate(Type Change): %v, tablet: %s, target %+v => %+v, reparent time: %v",
+			oldTs.Name, topotools.TabletIdent(oldTs.Tablet), topotools.TargetIdent(oldTs.Target), topotools.TargetIdent(shr.Target), shr.TabletExternallyReparentedTimestamp)
 		if hc.listener != nil && hc.sendDownEvents {
 			oldTs.Up = false
 			hc.listener.StatsUpdate(&oldTs)
@@ -490,6 +517,12 @@ func (hcc *healthCheckConn) processResponse(hc *HealthCheckImpl, shr *querypb.St
 		}
 	}
 
+	// In this case where a new tablet is initialized or a tablet type changes, we want to
+	// initialize the counter so the rate can be calculated correctly.
+	if hcc.tabletStats.Target.TabletType != shr.Target.TabletType {
+		hcErrorCounters.Add([]string{shr.Target.Keyspace, shr.Target.Shard, topoproto.TabletTypeLString(shr.Target.TabletType)}, 0)
+	}
+
 	// Update our record, and notify downstream for tabletType and
 	// realtimeStats change.
 	ts := hcc.update(shr, serving, healthErr)
@@ -633,6 +666,14 @@ func (hc *HealthCheckImpl) RemoveTablet(tablet *topodatapb.Tablet) {
 	go hc.deleteConn(tablet)
 }
 
+// ReplaceTablet removes the old tablet and adds the new tablet.
+func (hc *HealthCheckImpl) ReplaceTablet(old, new *topodatapb.Tablet, name string) {
+	go func() {
+		hc.deleteConn(old)
+		hc.AddTablet(new, name)
+	}()
+}
+
 // WaitForInitialStatsUpdates waits until all tablets added via AddTablet() call
 // were propagated to downstream via corresponding StatsUpdate() calls.
 func (hc *HealthCheckImpl) WaitForInitialStatsUpdates() {
@@ -740,11 +781,22 @@ func (tcsl TabletsCacheStatusList) Swap(i, j int) {
 
 // CacheStatus returns a displayable version of the cache.
 func (hc *HealthCheckImpl) CacheStatus() TabletsCacheStatusList {
+	tcsMap := hc.cacheStatusMap()
+	tcsl := make(TabletsCacheStatusList, 0, len(tcsMap))
+	for _, tcs := range tcsMap {
+		tcsl = append(tcsl, tcs)
+	}
+	sort.Sort(tcsl)
+	return tcsl
+}
+
+func (hc *HealthCheckImpl) cacheStatusMap() map[string]*TabletsCacheStatus {
 	tcsMap := make(map[string]*TabletsCacheStatus)
 	hc.mu.RLock()
+	defer hc.mu.RUnlock()
 	for _, hcc := range hc.addrToConns {
 		hcc.mu.RLock()
-		key := fmt.Sprintf("%v.%v.%v.%v", hcc.tabletStats.Tablet.Alias.Cell, hcc.tabletStats.Target.Keyspace, hcc.tabletStats.Target.Shard, string(hcc.tabletStats.Target.TabletType))
+		key := fmt.Sprintf("%v.%v.%v.%v", hcc.tabletStats.Tablet.Alias.Cell, hcc.tabletStats.Target.Keyspace, hcc.tabletStats.Target.Shard, hcc.tabletStats.Target.TabletType.String())
 		var tcs *TabletsCacheStatus
 		var ok bool
 		if tcs, ok = tcsMap[key]; !ok {
@@ -758,13 +810,7 @@ func (hc *HealthCheckImpl) CacheStatus() TabletsCacheStatusList {
 		hcc.mu.RUnlock()
 		tcs.TabletsStats = append(tcs.TabletsStats, &stats)
 	}
-	hc.mu.RUnlock()
-	tcsl := make(TabletsCacheStatusList, 0, len(tcsMap))
-	for _, tcs := range tcsMap {
-		tcsl = append(tcsl, tcs)
-	}
-	sort.Sort(tcsl)
-	return tcsl
+	return tcsMap
 }
 
 // Close stops the healthcheck.
diff --git a/go/vt/discovery/healthcheck_test.go b/go/vt/discovery/healthcheck_test.go
index 0c330b89d96..e8a54bff8be 100644
--- a/go/vt/discovery/healthcheck_test.go
+++ b/go/vt/discovery/healthcheck_test.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/youtube/vitess/go/vt/status"
 	"github.com/youtube/vitess/go/vt/topo"
+	"github.com/youtube/vitess/go/vt/topo/topoproto"
 	"github.com/youtube/vitess/go/vt/vttablet/queryservice"
 	"github.com/youtube/vitess/go/vt/vttablet/queryservice/fakes"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletconn"
@@ -95,6 +96,12 @@ func TestHealthCheck(t *testing.T) {
 	if !reflect.DeepEqual(res, want) {
 		t.Errorf(`<-l.output: %+v; want %+v`, res, want)
 	}
+
+	// Verify that the error count is initialized to 0 after the first tablet response.
+	if err := checkErrorCounter("k", "s", topodatapb.TabletType_MASTER, 0); err != nil {
+		t.Errorf("%v", err)
+	}
+
 	tcsl := hc.CacheStatus()
 	tcslWant := TabletsCacheStatusList{{
 		Cell:   "cell",
@@ -149,6 +156,10 @@ func TestHealthCheck(t *testing.T) {
 		t.Errorf(`<-l.output: %+v; want %+v`, res, want)
 	}
 
+	if err := checkErrorCounter("k", "s", topodatapb.TabletType_REPLICA, 0); err != nil {
+		t.Errorf("%v", err)
+	}
+
 	// Serving & RealtimeStats changed
 	shr = &querypb.StreamHealthResponse{
 		Target:  &querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_REPLICA},
@@ -500,6 +511,10 @@ func TestHealthCheckTimeout(t *testing.T) {
 		t.Errorf(`<-l.output: %+v; want %+v`, res, want)
 	}
 
+	if err := checkErrorCounter("k", "s", topodatapb.TabletType_MASTER, 0); err != nil {
+		t.Errorf("%v", err)
+	}
+
 	// wait for timeout period
 	time.Sleep(2 * timeout)
 	t.Logf(`Sleep(2 * timeout)`)
@@ -508,6 +523,10 @@ func TestHealthCheckTimeout(t *testing.T) {
 		t.Errorf(`<-l.output: %+v; want not serving`, res)
 	}
 
+	if err := checkErrorCounter("k", "s", topodatapb.TabletType_MASTER, 1); err != nil {
+		t.Errorf("%v", err)
+	}
+
 	if !fc.isCanceled() {
 		t.Errorf("StreamHealth should be canceled after timeout, but is not")
 	}
@@ -624,3 +643,17 @@ func (fc *fakeConn) isCanceled() bool {
 	defer fc.mu.Unlock()
 	return fc.canceled
 }
+
+func checkErrorCounter(keyspace, shard string, tabletType topodatapb.TabletType, want int64) error {
+	statsKey := []string{keyspace, shard, topoproto.TabletTypeLString(tabletType)}
+	name := strings.Join(statsKey, ".")
+	got, ok := hcErrorCounters.Counts()[name]
+	if !ok {
+		return fmt.Errorf("hcErrorCounters not correctly initialized")
+	}
+	if got != want {
+		return fmt.Errorf("wrong value for hcErrorCounters got = %v, want = %v", got, want)
+	}
+
+	return nil
+}
diff --git a/go/vt/discovery/tablet_stats_cache.go b/go/vt/discovery/tablet_stats_cache.go
index 01ee5aec0b5..518f20fd07e 100644
--- a/go/vt/discovery/tablet_stats_cache.go
+++ b/go/vt/discovery/tablet_stats_cache.go
@@ -196,12 +196,12 @@ func (tc *TabletStatsCache) StatsUpdate(ts *TabletStats) {
 			// We already have one up server, see if we
 			// need to replace it.
 			if ts.TabletExternallyReparentedTimestamp < e.healthy[0].TabletExternallyReparentedTimestamp {
-				log.Warningf("not marking healthy master as Up because its externally reparented timestamp is smaller than the highest known timestamp from previous MASTERs: %d < %d ",
-					ts.TabletExternallyReparentedTimestamp,
-					e.healthy[0].TabletExternallyReparentedTimestamp,
-					topoproto.KeyspaceShardString(ts.Target.Keyspace, ts.Target.Shard),
+				log.Warningf("not marking healthy master %s as Up for %s because its externally reparented timestamp is smaller than the highest known timestamp from previous MASTERs %s: %d < %d ",
 					topoproto.TabletAliasString(ts.Tablet.Alias),
-					topoproto.TabletAliasString(e.healthy[0].Tablet.Alias))
+					topoproto.KeyspaceShardString(ts.Target.Keyspace, ts.Target.Shard),
+					topoproto.TabletAliasString(e.healthy[0].Tablet.Alias),
+					ts.TabletExternallyReparentedTimestamp,
+					e.healthy[0].TabletExternallyReparentedTimestamp)
 				return
 			}
 
diff --git a/go/vt/discovery/topology_watcher.go b/go/vt/discovery/topology_watcher.go
index 48bbf419671..07fd3df0cc8 100644
--- a/go/vt/discovery/topology_watcher.go
+++ b/go/vt/discovery/topology_watcher.go
@@ -42,6 +42,9 @@ type TabletRecorder interface {
 
 	// RemoveTablet removes the tablet.
 	RemoveTablet(tablet *topodatapb.Tablet)
+
+	// ReplaceTablet does an AddTablet and RemoveTablet in one call, effectively replacing the old tablet with the new.
+	ReplaceTablet(old, new *topodatapb.Tablet, name string)
 }
 
 // NewCellTabletsWatcher returns a TopologyWatcher that monitors all
@@ -183,8 +186,10 @@ func (tw *TopologyWatcher) loadTablets() {
 	wg.Wait()
 	tw.mu.Lock()
 	for key, tep := range newTablets {
-		if _, ok := tw.tablets[key]; !ok {
+		if val, ok := tw.tablets[key]; !ok {
 			tw.tr.AddTablet(tep.tablet, tep.alias)
+		} else if val.alias != tep.alias {
+			tw.tr.ReplaceTablet(val.tablet, tep.tablet, tep.alias)
 		}
 	}
 	for key, tep := range tw.tablets {
@@ -293,6 +298,13 @@ func (fbs *FilterByShard) RemoveTablet(tablet *topodatapb.Tablet) {
 	}
 }
 
+// ReplaceTablet is part of the TabletRecorder interface.
+func (fbs *FilterByShard) ReplaceTablet(old, new *topodatapb.Tablet, name string) {
+	if fbs.isIncluded(old) && fbs.isIncluded(new) {
+		fbs.tr.ReplaceTablet(old, new, name)
+	}
+}
+
 // isIncluded returns true iff the tablet's keyspace and shard should be
 // forwarded to the underlying TabletRecorder.
 func (fbs *FilterByShard) isIncluded(tablet *topodatapb.Tablet) bool {
diff --git a/go/vt/discovery/topology_watcher_test.go b/go/vt/discovery/topology_watcher_test.go
index 5b521e14268..a9d1ec02481 100644
--- a/go/vt/discovery/topology_watcher_test.go
+++ b/go/vt/discovery/topology_watcher_test.go
@@ -50,6 +50,13 @@ func checkWatcher(t *testing.T, cellTablets bool) {
 		t.Logf(`tw = ShardReplicationWatcher(topo.Server{ft}, fhc, "aa", "keyspace", "shard", 10ms, 5)`)
 	}
 
+	// Wait for the initial topology load to finish. Otherwise we
+	// have a background loadTablets() that's running, and it can
+	// interact with our tests in weird ways.
+	if err := tw.WaitForInitialTopology(); err != nil {
+		t.Fatalf("initial WaitForInitialTopology failed")
+	}
+
 	// add a tablet to the topology
 	ft.AddTablet("aa", 0, "host1", map[string]int32{"vt": 123})
 	tw.loadTablets()
@@ -85,6 +92,25 @@ func checkWatcher(t *testing.T, cellTablets bool) {
 		t.Errorf("fhc.GetAllTablets() = %+v; want %+v", allTablets, want)
 	}
 
+	// Remove and re-add with a new uid. This should trigger a ReplaceTablet in loadTablets,
+	// because the uid does not match.
+	ft.RemoveTablet("aa", 0)
+	ft.AddTablet("aa", 1, "host1", map[string]int32{"vt": 456})
+	tw.loadTablets()
+	t.Logf(`ft.ReplaceTablet("aa", 0, "host1", {"vt": 456}); tw.loadTablets()`)
+	want = &topodatapb.Tablet{
+		Alias: &topodatapb.TabletAlias{
+			Uid: 1,
+		},
+		Hostname: "host1",
+		PortMap:  map[string]int32{"vt": 456},
+	}
+	allTablets = fhc.GetAllTablets()
+	key = TabletToMapKey(want)
+	if _, ok := allTablets[key]; !ok || len(allTablets) != 1 {
+		t.Errorf("fhc.GetAllTablets() = %+v; want %+v", allTablets, want)
+	}
+
 	tw.Stop()
 }
 
@@ -179,7 +205,16 @@ func (ft *fakeTopo) GetShardReplication(ctx context.Context, cell, keyspace, sha
 func (ft *fakeTopo) GetTablet(ctx context.Context, alias *topodatapb.TabletAlias) (*topodatapb.Tablet, int64, error) {
 	ft.mu.RLock()
 	defer ft.mu.RUnlock()
-	return ft.tablets[topoproto.TabletAliasString(alias)], 0, nil
+	// Note we want to be correct here. The way we call this, we never
+	// change the tablet list in between a call to list them,
+	// and a call to get the record, so we could just blindly return it.
+	// (It wasn't the case before we added the WaitForInitialTopology()
+	// call in the test though!).
+	tablet, ok := ft.tablets[topoproto.TabletAliasString(alias)]
+	if !ok {
+		return nil, 0, topo.ErrNoNode
+	}
+	return tablet, 0, nil
 }
 
 func TestFilterByShard(t *testing.T) {
diff --git a/go/vt/mysqlctl/slave_connection.go b/go/vt/mysqlctl/slave_connection.go
index 97acdd4599c..512b0b221d4 100644
--- a/go/vt/mysqlctl/slave_connection.go
+++ b/go/vt/mysqlctl/slave_connection.go
@@ -345,9 +345,16 @@ func (sc *SlaveConnection) Close() {
 		log.Infof("closing slave socket to unblock reads")
 		sc.Conn.Close()
 
-		log.Infof("waiting for slave dump thread to end")
-		sc.cancel()
-		sc.wg.Wait()
+		// sc.cancel is set at the beginning of the StartBinlogDump*
+		// methods. If we error out before then, it's nil.
+		// Note we also may error out before adding 1 to sc.wg,
+		// but then the Wait() still works.
+		if sc.cancel != nil {
+			log.Infof("waiting for slave dump thread to end")
+			sc.cancel()
+			sc.wg.Wait()
+			sc.cancel = nil
+		}
 
 		log.Infof("closing slave MySQL client, recycling slaveID %v", sc.slaveID)
 		sc.Conn = nil
diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go
index 54066968061..688ad945da5 100644
--- a/go/vt/proto/query/query.pb.go
+++ b/go/vt/proto/query/query.pb.go
@@ -763,6 +763,9 @@ type ExecuteOptions struct {
 	// vitess also sets a rowcount limit on queries, the smallest value wins.
 	SqlSelectLimit       int64                               `protobuf:"varint,8,opt,name=sql_select_limit,json=sqlSelectLimit" json:"sql_select_limit,omitempty"`
 	TransactionIsolation ExecuteOptions_TransactionIsolation `protobuf:"varint,9,opt,name=transaction_isolation,json=transactionIsolation,enum=query.ExecuteOptions_TransactionIsolation" json:"transaction_isolation,omitempty"`
+	// skip_query_plan_cache specifies if the query plan shoud be cached by vitess.
+	// By default all query plans are cached.
+	SkipQueryPlanCache bool `protobuf:"varint,10,opt,name=skip_query_plan_cache,json=skipQueryPlanCache" json:"skip_query_plan_cache,omitempty"`
 }
 
 func (m *ExecuteOptions) Reset()                    { *m = ExecuteOptions{} }
@@ -819,6 +822,13 @@ func (m *ExecuteOptions) GetTransactionIsolation() ExecuteOptions_TransactionIso
 	return ExecuteOptions_DEFAULT
 }
 
+func (m *ExecuteOptions) GetSkipQueryPlanCache() bool {
+	if m != nil {
+		return m.SkipQueryPlanCache
+	}
+	return false
+}
+
 // Field describes a single column returned by a query
 type Field struct {
 	// name of the field as returned by mysql C API
@@ -2757,196 +2767,198 @@ func init() {
 func init() { proto.RegisterFile("query.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 3047 bytes of a gzipped FileDescriptorProto
+	// 3078 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x73, 0x1b, 0xc7,
 	0xd1, 0xd7, 0xe2, 0x41, 0x02, 0x0d, 0x02, 0x1c, 0x0e, 0x48, 0x0b, 0xa6, 0xfc, 0xe0, 0xb7, 0xb6,
 	0x6c, 0x7e, 0xb4, 0x3f, 0x7e, 0x32, 0xa5, 0x4f, 0x9f, 0xca, 0xce, 0x43, 0x4b, 0x70, 0x29, 0xc3,
 	0x02, 0x16, 0xd0, 0x60, 0x21, 0x59, 0x2e, 0x57, 0x6d, 0x2d, 0x81, 0x11, 0xb9, 0xc5, 0x05, 0x16,
 	0xdc, 0x5d, 0x88, 0xe6, 0x4d, 0x89, 0xf3, 0x7e, 0x3a, 0x4f, 0xc7, 0x49, 0xc5, 0x49, 0x55, 0xee,
-	0x39, 0xe7, 0x98, 0xca, 0x1f, 0x90, 0x5b, 0x0e, 0x49, 0x0e, 0x39, 0xa5, 0x72, 0x4b, 0xe5, 0x94,
-	0x43, 0x0e, 0xa9, 0xd4, 0x3c, 0x76, 0xb1, 0x20, 0x61, 0x4b, 0x56, 0x72, 0xa1, 0xec, 0x13, 0x66,
-	0xba, 0x1b, 0xdd, 0xd3, 0xbf, 0xee, 0xe9, 0x99, 0x9d, 0x19, 0x28, 0x1c, 0x8c, 0xa8, 0x7f, 0xb4,
-	0x3e, 0xf4, 0xbd, 0xd0, 0xc3, 0x59, 0xde, 0x59, 0x2e, 0x85, 0xde, 0xd0, 0xeb, 0xd9, 0xa1, 0x2d,
-	0xc8, 0xcb, 0x85, 0xbb, 0xa1, 0x3f, 0xec, 0x8a, 0x8e, 0x7a, 0x00, 0x33, 0xa6, 0xed, 0xef, 0xd2,
-	0x10, 0x2f, 0x43, 0x6e, 0x9f, 0x1e, 0x05, 0x43, 0xbb, 0x4b, 0x2b, 0xca, 0x8a, 0xb2, 0x9a, 0x27,
-	0x71, 0x1f, 0x2f, 0x42, 0x36, 0xd8, 0xb3, 0xfd, 0x5e, 0x25, 0xc5, 0x19, 0xa2, 0x83, 0xff, 0x0f,
-	0x0a, 0xa1, 0xbd, 0xe3, 0xd2, 0xd0, 0x0a, 0x8f, 0x86, 0xb4, 0x92, 0x5e, 0x51, 0x56, 0x4b, 0x1b,
-	0x8b, 0xeb, 0xb1, 0x39, 0x93, 0x33, 0xcd, 0xa3, 0x21, 0x25, 0x10, 0xc6, 0x6d, 0x75, 0x0b, 0x4a,
-	0x37, 0xcd, 0x6b, 0x76, 0x48, 0xab, 0xb6, 0xeb, 0x52, 0xbf, 0xb6, 0xc5, 0x4c, 0x8f, 0x02, 0xea,
-	0x0f, 0xec, 0x7e, 0x6c, 0x3a, 0xea, 0xe3, 0xc7, 0x60, 0x66, 0xd7, 0xf7, 0x46, 0xc3, 0xa0, 0x92,
-	0x5a, 0x49, 0xaf, 0xe6, 0x89, 0xec, 0xa9, 0x6f, 0x02, 0xe8, 0x77, 0xe9, 0x20, 0x34, 0xbd, 0x7d,
-	0x3a, 0xc0, 0x4f, 0x40, 0x3e, 0x74, 0xfa, 0x34, 0x08, 0xed, 0xfe, 0x90, 0xab, 0x48, 0x93, 0x31,
-	0xe1, 0x03, 0x86, 0xbf, 0x0c, 0xb9, 0xa1, 0x17, 0x38, 0xa1, 0xe3, 0x0d, 0xf8, 0xd8, 0xf3, 0x24,
-	0xee, 0xab, 0x9f, 0x81, 0xec, 0x4d, 0xdb, 0x1d, 0x51, 0xfc, 0x34, 0x64, 0xb8, 0x73, 0x0a, 0x77,
-	0xae, 0xb0, 0x2e, 0xf0, 0xe5, 0x3e, 0x71, 0x06, 0xd3, 0x7d, 0x97, 0x49, 0x72, 0xdd, 0x73, 0x44,
-	0x74, 0xd4, 0x7d, 0x98, 0xdb, 0x74, 0x06, 0xbd, 0x9b, 0xb6, 0xef, 0x30, 0xc7, 0x1f, 0x52, 0x0d,
-	0x7e, 0x16, 0x66, 0x78, 0x23, 0xa8, 0xa4, 0x57, 0xd2, 0xab, 0x85, 0x8d, 0x39, 0xf9, 0x47, 0x3e,
-	0x36, 0x22, 0x79, 0xea, 0x6f, 0x14, 0x80, 0x4d, 0x6f, 0x34, 0xe8, 0xdd, 0x60, 0x4c, 0x8c, 0x20,
-	0x1d, 0x1c, 0xb8, 0x12, 0x48, 0xd6, 0xc4, 0xd7, 0xa1, 0xb4, 0xe3, 0x0c, 0x7a, 0xd6, 0x5d, 0x39,
-	0x1c, 0x81, 0x65, 0x61, 0xe3, 0x59, 0xa9, 0x6e, 0xfc, 0xe7, 0xf5, 0xe4, 0xa8, 0x03, 0x7d, 0x10,
-	0xfa, 0x47, 0xa4, 0xb8, 0x93, 0xa4, 0x2d, 0x77, 0x00, 0x9f, 0x14, 0x62, 0x46, 0xf7, 0xe9, 0x51,
-	0x64, 0x74, 0x9f, 0x1e, 0xe1, 0xff, 0x4e, 0x7a, 0x54, 0xd8, 0x28, 0x47, 0xb6, 0x12, 0xff, 0x95,
-	0x6e, 0xbe, 0x9c, 0xba, 0xa2, 0xa8, 0xbf, 0xca, 0x42, 0x49, 0x7f, 0x8b, 0x76, 0x47, 0x21, 0x6d,
-	0x0e, 0x59, 0x0c, 0x02, 0xbc, 0x0e, 0x65, 0x67, 0xd0, 0x75, 0x47, 0x3d, 0x6a, 0x51, 0x16, 0x6a,
-	0x2b, 0x64, 0xb1, 0xe6, 0xfa, 0x72, 0x64, 0x41, 0xb2, 0x12, 0x49, 0xa0, 0x41, 0xb9, 0xeb, 0xf5,
-	0x87, 0xb6, 0x3f, 0x29, 0x9f, 0xe6, 0xf6, 0x17, 0xa4, 0xfd, 0xb1, 0x3c, 0x59, 0x90, 0xd2, 0x09,
-	0x15, 0x0d, 0x98, 0x97, 0x7a, 0x7b, 0xd6, 0x1d, 0x87, 0xba, 0xbd, 0xa0, 0x92, 0xe1, 0x21, 0x8b,
-	0xa0, 0x9a, 0x1c, 0xe2, 0x7a, 0x4d, 0x0a, 0x6f, 0x73, 0x59, 0x52, 0x72, 0x26, 0xfa, 0x78, 0x0d,
-	0x16, 0xba, 0xae, 0xc3, 0x86, 0x72, 0x87, 0x41, 0x6c, 0xf9, 0xde, 0x61, 0x50, 0xc9, 0xf2, 0xf1,
-	0xcf, 0x0b, 0xc6, 0x36, 0xa3, 0x13, 0xef, 0x30, 0xc0, 0x2f, 0x43, 0xee, 0xd0, 0xf3, 0xf7, 0x5d,
-	0xcf, 0xee, 0x55, 0x66, 0xb8, 0xcd, 0xa7, 0xa6, 0xdb, 0xbc, 0x25, 0xa5, 0x48, 0x2c, 0x8f, 0x57,
-	0x01, 0x05, 0x07, 0xae, 0x15, 0x50, 0x97, 0x76, 0x43, 0xcb, 0x75, 0xfa, 0x4e, 0x58, 0xc9, 0xf1,
-	0x59, 0x50, 0x0a, 0x0e, 0xdc, 0x36, 0x27, 0xd7, 0x19, 0x15, 0x5b, 0xb0, 0x14, 0xfa, 0xf6, 0x20,
-	0xb0, 0xbb, 0x4c, 0x99, 0xe5, 0x04, 0x9e, 0x6b, 0xf3, 0x19, 0x90, 0xe7, 0x26, 0xd7, 0xa6, 0x9b,
-	0x34, 0xc7, 0x7f, 0xa9, 0x45, 0xff, 0x20, 0x8b, 0xe1, 0x14, 0xaa, 0xfa, 0x0a, 0x94, 0x26, 0x41,
-	0xc1, 0x0b, 0x50, 0x34, 0x6f, 0xb7, 0x74, 0x4b, 0x33, 0xb6, 0x2c, 0x43, 0x6b, 0xe8, 0xe8, 0x0c,
-	0x2e, 0x42, 0x9e, 0x93, 0x9a, 0x46, 0xfd, 0x36, 0x52, 0xf0, 0x2c, 0xa4, 0xb5, 0x7a, 0x1d, 0xa5,
-	0xd4, 0x2b, 0x90, 0x8b, 0xbc, 0xc3, 0xf3, 0x50, 0xe8, 0x18, 0xed, 0x96, 0x5e, 0xad, 0x6d, 0xd7,
-	0xf4, 0x2d, 0x74, 0x06, 0xe7, 0x20, 0xd3, 0xac, 0x9b, 0x2d, 0xa4, 0x88, 0x96, 0xd6, 0x42, 0x29,
-	0xf6, 0xcf, 0xad, 0x4d, 0x0d, 0xa5, 0xd5, 0x10, 0x16, 0xa7, 0x0d, 0x12, 0x17, 0x60, 0x76, 0x4b,
-	0xdf, 0xd6, 0x3a, 0x75, 0x13, 0x9d, 0xc1, 0x65, 0x98, 0x27, 0x7a, 0x4b, 0xd7, 0x4c, 0x6d, 0xb3,
-	0xae, 0x5b, 0x44, 0xd7, 0xb6, 0x90, 0x82, 0x31, 0x94, 0x58, 0xcb, 0xaa, 0x36, 0x1b, 0x8d, 0x9a,
-	0x69, 0xea, 0x5b, 0x28, 0x85, 0x17, 0x01, 0x71, 0x5a, 0xc7, 0x18, 0x53, 0xd3, 0x18, 0xc1, 0x5c,
-	0x5b, 0x27, 0x35, 0xad, 0x5e, 0x7b, 0x83, 0x29, 0x40, 0x99, 0xd7, 0x32, 0x39, 0x05, 0xa5, 0xd4,
-	0x77, 0x53, 0x90, 0xe5, 0xbe, 0x62, 0x0c, 0x99, 0x44, 0x11, 0xe3, 0xed, 0x78, 0xea, 0xa7, 0x3e,
-	0x64, 0xea, 0xf3, 0xea, 0x28, 0x8b, 0x90, 0xe8, 0xe0, 0x73, 0x90, 0xf7, 0xfc, 0x5d, 0x4b, 0x70,
-	0x32, 0xa2, 0x3c, 0x79, 0xfe, 0x2e, 0xaf, 0xa9, 0xac, 0x74, 0xb1, 0x0a, 0xbb, 0x63, 0x07, 0x94,
-	0xa7, 0x53, 0x9e, 0xc4, 0x7d, 0xfc, 0x38, 0x30, 0x39, 0x8b, 0x8f, 0x63, 0x86, 0xf3, 0x66, 0x3d,
-	0x7f, 0xd7, 0x60, 0x43, 0x79, 0x06, 0x8a, 0x5d, 0xcf, 0x1d, 0xf5, 0x07, 0x96, 0x4b, 0x07, 0xbb,
-	0xe1, 0x5e, 0x65, 0x76, 0x45, 0x59, 0x2d, 0x92, 0x39, 0x41, 0xac, 0x73, 0x1a, 0xae, 0xc0, 0x6c,
-	0x77, 0xcf, 0xf6, 0x03, 0x2a, 0x52, 0xa8, 0x48, 0xa2, 0x2e, 0xb7, 0x4a, 0xbb, 0x4e, 0xdf, 0x76,
-	0x03, 0x9e, 0x2e, 0x45, 0x12, 0xf7, 0x99, 0x13, 0x77, 0x5c, 0x7b, 0x37, 0xa8, 0x00, 0x67, 0x88,
-	0x8e, 0xfa, 0xff, 0x90, 0x26, 0xde, 0x21, 0x53, 0x29, 0x0c, 0x06, 0x15, 0x65, 0x25, 0xbd, 0x8a,
-	0x49, 0xd4, 0x65, 0xd5, 0x5d, 0x16, 0x38, 0x51, 0xf7, 0xa2, 0x92, 0xf6, 0x26, 0xcc, 0x11, 0x1a,
-	0x8c, 0xdc, 0x50, 0x7f, 0x2b, 0xf4, 0xed, 0x00, 0x6f, 0x40, 0x21, 0x39, 0xa5, 0x95, 0x0f, 0x9a,
-	0xd2, 0x40, 0xc7, 0x73, 0xb9, 0x02, 0xb3, 0x77, 0x7c, 0x1a, 0xec, 0x51, 0x5f, 0x96, 0x8c, 0xa8,
-	0xcb, 0x0a, 0x66, 0x81, 0x97, 0x3b, 0x61, 0x83, 0x95, 0x59, 0x39, 0xd9, 0x95, 0x89, 0x32, 0xcb,
-	0x83, 0x4a, 0x24, 0x8f, 0xa1, 0xc7, 0xe6, 0xaf, 0x65, 0xdf, 0xb9, 0x43, 0xbb, 0x21, 0x15, 0xab,
-	0x49, 0x86, 0xcc, 0x31, 0xa2, 0x26, 0x69, 0x2c, 0x6c, 0xce, 0x20, 0xa0, 0x7e, 0x68, 0x39, 0x3d,
-	0x1e, 0xd0, 0x0c, 0xc9, 0x09, 0x42, 0xad, 0x87, 0x9f, 0x82, 0x0c, 0xaf, 0x00, 0x19, 0x6e, 0x05,
-	0xa4, 0x15, 0xe2, 0x1d, 0x12, 0x4e, 0xc7, 0x2f, 0xc0, 0x0c, 0xe5, 0xfe, 0xf2, 0xa0, 0x8e, 0x6b,
-	0x66, 0x12, 0x0a, 0x22, 0x45, 0xd4, 0x9f, 0xa7, 0xa1, 0xd0, 0x0e, 0x7d, 0x6a, 0xf7, 0xb9, 0xff,
-	0xf8, 0x53, 0x00, 0x41, 0x68, 0x87, 0xb4, 0x4f, 0x07, 0x61, 0xe4, 0xc8, 0x13, 0x52, 0x41, 0x42,
-	0x6e, 0xbd, 0x1d, 0x09, 0x91, 0x84, 0xfc, 0x71, 0x80, 0x53, 0x0f, 0x00, 0xf0, 0xf2, 0xfb, 0x29,
-	0xc8, 0xc7, 0xda, 0xb0, 0x06, 0xb9, 0xae, 0x1d, 0xd2, 0x5d, 0xcf, 0x3f, 0x92, 0xcb, 0xdc, 0xf9,
-	0x0f, 0xb3, 0xbe, 0x5e, 0x95, 0xc2, 0x24, 0xfe, 0x1b, 0x7e, 0x12, 0xc4, 0x3e, 0x41, 0x24, 0xaf,
-	0x58, 0xac, 0xf3, 0x9c, 0xc2, 0xd3, 0xf7, 0x65, 0xc0, 0x43, 0xdf, 0xe9, 0xdb, 0xfe, 0x91, 0xb5,
-	0x4f, 0x8f, 0xa2, 0xfa, 0x9c, 0x9e, 0x12, 0x32, 0x24, 0xe5, 0xae, 0xd3, 0x23, 0x59, 0x84, 0xae,
-	0x4c, 0xfe, 0x57, 0x26, 0xdd, 0xc9, 0x40, 0x24, 0xfe, 0xc9, 0x17, 0xd9, 0x20, 0x5a, 0x4e, 0xb3,
-	0x3c, 0x3f, 0x59, 0x53, 0x7d, 0x1e, 0x72, 0xd1, 0xe0, 0x71, 0x1e, 0xb2, 0xba, 0xef, 0x7b, 0x3e,
-	0x3a, 0xc3, 0x6b, 0x51, 0xa3, 0x2e, 0xca, 0xd9, 0xd6, 0x16, 0x2b, 0x67, 0xbf, 0x4e, 0xc5, 0x6b,
-	0x1a, 0xa1, 0x07, 0x23, 0x1a, 0x84, 0xf8, 0xb3, 0x50, 0xa6, 0x3c, 0x57, 0x9c, 0xbb, 0xd4, 0xea,
-	0xf2, 0x0d, 0x10, 0xcb, 0x14, 0x91, 0xd0, 0xf3, 0xeb, 0x62, 0x6b, 0x16, 0x6d, 0x8c, 0xc8, 0x42,
-	0x2c, 0x2b, 0x49, 0x3d, 0xac, 0x43, 0xd9, 0xe9, 0xf7, 0x69, 0xcf, 0xb1, 0xc3, 0xa4, 0x02, 0x11,
-	0xb0, 0xa5, 0x68, 0x7f, 0x30, 0xb1, 0xbf, 0x22, 0x0b, 0xf1, 0x3f, 0x62, 0x35, 0xe7, 0x61, 0x26,
-	0xe4, 0xfb, 0x3e, 0xb9, 0x3c, 0x16, 0xa3, 0xba, 0xc4, 0x89, 0x44, 0x32, 0xf1, 0xf3, 0x20, 0x36,
-	0x91, 0xbc, 0x02, 0x8d, 0x13, 0x62, 0xbc, 0x61, 0x20, 0x82, 0x8f, 0xcf, 0x43, 0x69, 0x62, 0x5d,
-	0xe9, 0x71, 0xc0, 0xd2, 0xa4, 0x98, 0x5c, 0x24, 0x7a, 0xf8, 0x7f, 0x61, 0xd6, 0x13, 0x6b, 0x0a,
-	0xaf, 0x4d, 0xe3, 0x11, 0x4f, 0x2e, 0x38, 0x24, 0x92, 0x52, 0x3f, 0x0d, 0xf3, 0x31, 0x82, 0xc1,
-	0xd0, 0x1b, 0x04, 0x14, 0xaf, 0xc1, 0x8c, 0xcf, 0x27, 0x84, 0x44, 0x0d, 0x4b, 0x15, 0x89, 0x19,
-	0x4d, 0xa4, 0x84, 0xda, 0x83, 0x79, 0x41, 0xb9, 0xe5, 0x84, 0x7b, 0x3c, 0x50, 0xf8, 0x3c, 0x64,
-	0x29, 0x6b, 0x1c, 0xc3, 0x9c, 0xb4, 0xaa, 0x9c, 0x4f, 0x04, 0x37, 0x61, 0x25, 0x75, 0x5f, 0x2b,
-	0x7f, 0x4b, 0x41, 0x59, 0x8e, 0x72, 0xd3, 0x0e, 0xbb, 0x7b, 0xa7, 0x34, 0xd8, 0x2f, 0xc0, 0x2c,
-	0xa3, 0x3b, 0xf1, 0xc4, 0x98, 0x12, 0xee, 0x48, 0x82, 0x05, 0xdc, 0x0e, 0xac, 0x44, 0x74, 0xe5,
-	0xbe, 0xa6, 0x68, 0x07, 0x89, 0x85, 0x78, 0x4a, 0x5e, 0xcc, 0xdc, 0x27, 0x2f, 0x66, 0x1f, 0x28,
-	0x2f, 0xb6, 0x60, 0x71, 0x12, 0x71, 0x99, 0x1c, 0x2f, 0xc2, 0xac, 0x08, 0x4a, 0x54, 0x02, 0xa7,
-	0xc5, 0x2d, 0x12, 0x51, 0x7f, 0x96, 0x82, 0x45, 0x59, 0x9d, 0x3e, 0x1e, 0xd3, 0x34, 0x81, 0x73,
-	0xf6, 0x81, 0x70, 0xae, 0xc2, 0xd2, 0x31, 0x80, 0x1e, 0x62, 0x16, 0xfe, 0x55, 0x81, 0xb9, 0x4d,
-	0xba, 0xeb, 0x0c, 0x4e, 0x29, 0xbc, 0x09, 0xd4, 0x32, 0x0f, 0x84, 0xda, 0x65, 0x28, 0x4a, 0x7f,
-	0x25, 0x5a, 0x27, 0xa7, 0x81, 0x32, 0x65, 0x1a, 0xa8, 0x7f, 0x56, 0xa0, 0x58, 0xf5, 0xfa, 0x7d,
-	0x27, 0x3c, 0xa5, 0x48, 0x9d, 0xf4, 0x33, 0x33, 0xcd, 0x4f, 0x04, 0xa5, 0xc8, 0x4d, 0x01, 0x90,
-	0xfa, 0x17, 0x05, 0xe6, 0x89, 0xe7, 0xba, 0x3b, 0x76, 0x77, 0xff, 0xd1, 0xf6, 0x1d, 0x03, 0x1a,
-	0x3b, 0x2a, 0xbd, 0xff, 0x87, 0x02, 0xa5, 0x96, 0x4f, 0xd9, 0xc7, 0xe8, 0x23, 0xed, 0x3c, 0xfb,
-	0x40, 0xea, 0x85, 0x72, 0x73, 0x90, 0x27, 0xbc, 0xad, 0x2e, 0xc0, 0x7c, 0xec, 0xbb, 0xc4, 0xe3,
-	0x0f, 0x0a, 0x2c, 0x89, 0x04, 0x91, 0x9c, 0xde, 0x29, 0x85, 0x25, 0xf2, 0x37, 0x93, 0xf0, 0xb7,
-	0x02, 0x8f, 0x1d, 0xf7, 0x4d, 0xba, 0xfd, 0x76, 0x0a, 0xce, 0x46, 0xb9, 0x71, 0xca, 0x1d, 0xff,
-	0x37, 0xf2, 0x61, 0x19, 0x2a, 0x27, 0x41, 0x90, 0x08, 0xbd, 0x93, 0x82, 0x4a, 0xd5, 0xa7, 0x76,
-	0x48, 0x13, 0x9b, 0x8c, 0x47, 0x27, 0x37, 0xf0, 0x4b, 0x30, 0x37, 0xb4, 0xfd, 0xd0, 0xe9, 0x3a,
-	0x43, 0x9b, 0x7d, 0xc6, 0x65, 0xf9, 0x1e, 0xe6, 0x98, 0x82, 0x09, 0x11, 0xf5, 0x1c, 0x3c, 0x3e,
-	0x05, 0x11, 0x89, 0xd7, 0x3f, 0x15, 0xc0, 0xed, 0xd0, 0xf6, 0xc3, 0x8f, 0xc1, 0xaa, 0x32, 0x35,
-	0x99, 0x96, 0xa0, 0x3c, 0xe1, 0x7f, 0x12, 0x17, 0x1a, 0x7e, 0x2c, 0x56, 0x9c, 0x0f, 0xc4, 0x25,
-	0xe9, 0xbf, 0xc4, 0xe5, 0x4f, 0x0a, 0x2c, 0x57, 0x3d, 0x71, 0x7e, 0xf7, 0x48, 0xce, 0x30, 0xf5,
-	0x49, 0x38, 0x37, 0xd5, 0x41, 0x09, 0xc0, 0x1f, 0x15, 0x78, 0x8c, 0x50, 0xbb, 0xf7, 0x68, 0x3a,
-	0x7f, 0x03, 0xce, 0x9e, 0x70, 0x4e, 0xee, 0x50, 0x2f, 0x43, 0xae, 0x4f, 0x43, 0xbb, 0x67, 0x87,
-	0xb6, 0x74, 0x69, 0x39, 0xd2, 0x3b, 0x96, 0x6e, 0x48, 0x09, 0x12, 0xcb, 0xaa, 0xef, 0xa7, 0xa0,
-	0xcc, 0xf7, 0xba, 0x9f, 0x7c, 0x41, 0x4d, 0xff, 0x16, 0x78, 0x47, 0x81, 0xc5, 0x49, 0x80, 0xe2,
-	0x6f, 0x82, 0xff, 0xf4, 0x41, 0xc4, 0x94, 0x82, 0x90, 0x9e, 0xb6, 0x05, 0xfd, 0x6d, 0x0a, 0x2a,
-	0xc9, 0x21, 0x7d, 0x72, 0x68, 0x31, 0x79, 0x68, 0xf1, 0x91, 0x4f, 0xa9, 0xde, 0x55, 0xe0, 0xf1,
-	0x29, 0x80, 0x7e, 0xb4, 0x40, 0x27, 0x8e, 0x2e, 0x52, 0xf7, 0x3d, 0xba, 0x78, 0xd0, 0x50, 0xff,
-	0x5e, 0x81, 0xc5, 0x06, 0x0d, 0x02, 0x7b, 0x97, 0x8a, 0xef, 0xf8, 0xd3, 0x5b, 0xcd, 0xf8, 0xa1,
-	0x70, 0x66, 0x7c, 0xb3, 0xa2, 0x56, 0x61, 0xe9, 0x98, 0x6b, 0x0f, 0x71, 0x36, 0xf1, 0x77, 0x05,
-	0x16, 0xa4, 0x16, 0xed, 0xd4, 0x6e, 0x04, 0xa6, 0xa0, 0x83, 0x9f, 0x82, 0xb4, 0xd3, 0x8b, 0x76,
-	0x90, 0x93, 0x17, 0xc7, 0x8c, 0xa1, 0x5e, 0x05, 0x9c, 0xf4, 0xfb, 0x21, 0xa0, 0xfb, 0x5d, 0x1a,
-	0x16, 0xda, 0x43, 0xd7, 0x09, 0x25, 0xf3, 0xd1, 0x2e, 0xfc, 0xff, 0x05, 0x73, 0x01, 0x73, 0xd6,
-	0x12, 0xb7, 0x65, 0x1c, 0xd8, 0x3c, 0x29, 0x70, 0x5a, 0x95, 0x93, 0xf0, 0xd3, 0x50, 0x88, 0x44,
-	0x46, 0x83, 0x50, 0x9e, 0x74, 0x82, 0x94, 0x18, 0x0d, 0x42, 0x7c, 0x09, 0xce, 0x0e, 0x46, 0x7d,
-	0x7e, 0x0d, 0x6c, 0x0d, 0xa9, 0x6f, 0x71, 0xcd, 0x16, 0xdb, 0xce, 0xcb, 0xeb, 0xda, 0xf2, 0x60,
-	0xd4, 0x27, 0xde, 0x61, 0xd0, 0xa2, 0x3e, 0x37, 0xde, 0xb2, 0xfd, 0x10, 0x5f, 0x85, 0xbc, 0xed,
-	0xee, 0x7a, 0xbe, 0x13, 0xee, 0xf5, 0xe5, 0x3d, 0xad, 0x1a, 0x5d, 0xad, 0x1c, 0x87, 0x7f, 0x5d,
-	0x8b, 0x24, 0xc9, 0xf8, 0x4f, 0xea, 0x8b, 0x90, 0x8f, 0xe9, 0x18, 0xc1, 0x9c, 0x7e, 0xa3, 0xa3,
-	0xd5, 0xad, 0x76, 0xab, 0x5e, 0x33, 0xdb, 0xe2, 0x3a, 0x76, 0xbb, 0x53, 0xaf, 0x5b, 0xed, 0xaa,
-	0x66, 0x20, 0x45, 0x25, 0x00, 0x5c, 0x25, 0x57, 0x3e, 0x06, 0x48, 0xb9, 0x0f, 0x40, 0xe7, 0x20,
-	0xef, 0x7b, 0x87, 0xd2, 0xf7, 0x14, 0x77, 0x27, 0xe7, 0x7b, 0x87, 0xdc, 0x73, 0x55, 0x03, 0x9c,
-	0x1c, 0xab, 0xcc, 0xb6, 0x44, 0xf1, 0x56, 0x26, 0x8a, 0xf7, 0xd8, 0x7e, 0x5c, 0xbc, 0xc5, 0x56,
-	0x9e, 0xcd, 0xf3, 0x57, 0xa9, 0xed, 0x86, 0xd1, 0x7a, 0xa5, 0xfe, 0x22, 0x05, 0x45, 0xc2, 0x28,
-	0x4e, 0x9f, 0xb6, 0x43, 0x3b, 0x0c, 0x58, 0xa4, 0xf6, 0xb8, 0x88, 0x35, 0x2e, 0xbb, 0x79, 0x52,
-	0x10, 0x34, 0x71, 0x09, 0xb0, 0x01, 0x4b, 0x01, 0xed, 0x7a, 0x83, 0x5e, 0x60, 0xed, 0xd0, 0x3d,
-	0x67, 0xd0, 0xb3, 0xfa, 0x76, 0x10, 0xca, 0x9b, 0xc2, 0x22, 0x29, 0x4b, 0xe6, 0x26, 0xe7, 0x35,
-	0x38, 0x0b, 0x5f, 0x80, 0xc5, 0x1d, 0x67, 0xe0, 0x7a, 0xbb, 0xd6, 0xd0, 0xb5, 0x8f, 0xa8, 0x1f,
-	0x48, 0x57, 0x59, 0x7a, 0x65, 0x09, 0x16, 0xbc, 0x96, 0x60, 0x89, 0x70, 0xbf, 0x01, 0x6b, 0x53,
-	0xad, 0x58, 0x77, 0x1c, 0x37, 0xa4, 0x3e, 0xed, 0x59, 0x3e, 0x1d, 0xba, 0x4e, 0x57, 0xdc, 0xc0,
-	0x8b, 0xbd, 0xfb, 0x73, 0x53, 0x4c, 0x6f, 0x4b, 0x71, 0x32, 0x96, 0x66, 0x68, 0x77, 0x87, 0x23,
-	0x6b, 0xc4, 0x26, 0x30, 0x5f, 0xc5, 0x14, 0x92, 0xeb, 0x0e, 0x47, 0x1d, 0xd6, 0xc7, 0x08, 0xd2,
-	0x07, 0x43, 0xb1, 0x78, 0x29, 0x84, 0x35, 0x19, 0x4a, 0x8b, 0x93, 0xe8, 0xc5, 0x8b, 0x53, 0x34,
-	0x4d, 0x94, 0x0f, 0x9b, 0x26, 0x15, 0x98, 0x0d, 0xa8, 0x7f, 0xd7, 0x19, 0xec, 0x46, 0x97, 0xa9,
-	0xb2, 0x8b, 0xdb, 0xf0, 0x9c, 0x7c, 0x05, 0x44, 0xdf, 0x0a, 0xa9, 0x3f, 0xb0, 0x5d, 0xf7, 0xc8,
-	0x12, 0xdf, 0xed, 0x83, 0x90, 0xf6, 0xac, 0xf1, 0xbb, 0x1c, 0xb1, 0x40, 0x3d, 0x23, 0xa4, 0xf5,
-	0x58, 0x98, 0xc4, 0xb2, 0x66, 0xfc, 0x62, 0xe7, 0x15, 0x28, 0xf9, 0x32, 0xa6, 0x56, 0xc0, 0x82,
-	0x2a, 0xa7, 0xe7, 0x62, 0x7c, 0x23, 0x9a, 0x08, 0x38, 0x29, 0xfa, 0x13, 0xf1, 0xbf, 0x02, 0x73,
-	0x72, 0x44, 0xb6, 0xeb, 0xd8, 0xe3, 0x7d, 0xda, 0xb1, 0x87, 0x49, 0x1a, 0x63, 0x12, 0xf9, 0x84,
-	0x89, 0x77, 0xd8, 0x67, 0x61, 0xb9, 0x33, 0xec, 0xd9, 0xe1, 0xe9, 0x5e, 0x2c, 0x93, 0x2f, 0x9b,
-	0x32, 0x93, 0x2f, 0x9b, 0x26, 0x5f, 0x4a, 0x65, 0x8f, 0xbd, 0x94, 0x52, 0xaf, 0xc2, 0xe2, 0xa4,
-	0xff, 0x32, 0x4b, 0x56, 0x21, 0xcb, 0x2f, 0x7e, 0x8f, 0xad, 0x0a, 0x89, 0x9b, 0x5d, 0x22, 0x04,
-	0xd4, 0x5f, 0x2a, 0x50, 0x9e, 0xf2, 0xc5, 0x10, 0x7f, 0x8e, 0x28, 0x89, 0xd3, 0x8e, 0xff, 0x81,
-	0x2c, 0xbf, 0x82, 0x96, 0x6f, 0x23, 0xce, 0x9e, 0xfc, 0xe0, 0xe0, 0xd7, 0xc5, 0x44, 0x48, 0xb1,
-	0x79, 0xcd, 0x13, 0xa2, 0xcb, 0x8f, 0x3b, 0xa2, 0x0d, 0x4f, 0x81, 0xd1, 0xc4, 0x09, 0xc8, 0xc9,
-	0xf3, 0x93, 0xcc, 0x7d, 0xcf, 0x4f, 0xd6, 0xbe, 0x9b, 0x86, 0x7c, 0xe3, 0xa8, 0x7d, 0xe0, 0x6e,
-	0xbb, 0xf6, 0x2e, 0xbf, 0xcf, 0x6d, 0xb4, 0xcc, 0xdb, 0xe8, 0x0c, 0x5e, 0x80, 0xa2, 0xd1, 0x34,
-	0x2d, 0x83, 0x55, 0xc6, 0xed, 0xba, 0x76, 0x0d, 0x29, 0xac, 0x74, 0xb6, 0x48, 0xcd, 0xba, 0xae,
-	0xdf, 0x16, 0x94, 0x14, 0x2e, 0xc3, 0x7c, 0xc7, 0xa8, 0xdd, 0xe8, 0xe8, 0x63, 0x62, 0x06, 0x2f,
-	0xc1, 0x42, 0xa3, 0x53, 0x37, 0x6b, 0xad, 0x7a, 0x82, 0x9c, 0x63, 0x65, 0x76, 0xb3, 0xde, 0xdc,
-	0x14, 0x5d, 0xc4, 0xf4, 0x77, 0x8c, 0x76, 0xed, 0x9a, 0xa1, 0x6f, 0x09, 0xd2, 0x0a, 0x23, 0xbd,
-	0xa1, 0x93, 0xe6, 0x76, 0x2d, 0x32, 0x79, 0x15, 0x23, 0x28, 0x6c, 0xd6, 0x0c, 0x8d, 0x48, 0x2d,
-	0xf7, 0x14, 0x5c, 0x82, 0xbc, 0x6e, 0x74, 0x1a, 0xb2, 0x9f, 0xc2, 0x15, 0x28, 0x6b, 0x1d, 0xb3,
-	0x69, 0xd5, 0x8c, 0x2a, 0xd1, 0x1b, 0xba, 0x61, 0x4a, 0x4e, 0x06, 0x97, 0xa1, 0x64, 0xd6, 0x1a,
-	0x7a, 0xdb, 0xd4, 0x1a, 0x2d, 0x49, 0x64, 0xa3, 0xc8, 0xb5, 0xf5, 0x48, 0x06, 0xe1, 0x65, 0x58,
-	0x32, 0x9a, 0x96, 0x7c, 0x23, 0x63, 0xdd, 0xd4, 0xea, 0x1d, 0x5d, 0xf2, 0x56, 0xf0, 0x59, 0xc0,
-	0x4d, 0xc3, 0xea, 0xb4, 0xb6, 0x34, 0x53, 0xb7, 0x8c, 0xe6, 0x2d, 0xc9, 0xb8, 0x8a, 0x4b, 0x90,
-	0x1b, 0x8f, 0xe0, 0x1e, 0x43, 0xa1, 0xd8, 0xd2, 0x88, 0x39, 0x76, 0xf6, 0xde, 0x3d, 0x06, 0x16,
-	0x5c, 0x23, 0xcd, 0x4e, 0x6b, 0x2c, 0xb6, 0x00, 0x05, 0x09, 0x96, 0x24, 0x65, 0x18, 0x69, 0xb3,
-	0x66, 0x54, 0xe3, 0xf1, 0xdd, 0xcb, 0x2d, 0xa7, 0x90, 0xb2, 0xb6, 0x0f, 0x19, 0x1e, 0x8e, 0x1c,
-	0x64, 0x8c, 0xa6, 0xa1, 0xa3, 0x33, 0x78, 0x1e, 0xa0, 0xd6, 0xae, 0x19, 0xa6, 0x7e, 0x8d, 0x68,
-	0x75, 0xe6, 0x36, 0x27, 0x44, 0x00, 0x32, 0x6f, 0xe7, 0x60, 0xb6, 0xd6, 0xde, 0xae, 0x37, 0x35,
-	0x53, 0xba, 0x59, 0x6b, 0xdf, 0xe8, 0x34, 0x4d, 0xc6, 0x44, 0xb8, 0x00, 0x33, 0xb5, 0xb6, 0xa9,
-	0xbf, 0x6e, 0x32, 0xbf, 0x38, 0x4f, 0xa0, 0x8a, 0xee, 0x5d, 0x5d, 0x7b, 0x2f, 0x0d, 0x19, 0xf3,
-	0x68, 0x48, 0x59, 0x80, 0x78, 0xb4, 0xcd, 0xdb, 0x2d, 0x66, 0x32, 0x0f, 0x99, 0x9a, 0x61, 0x5e,
-	0x41, 0x9f, 0x4b, 0x61, 0x80, 0x6c, 0x87, 0xb7, 0x3f, 0x3f, 0xc3, 0xda, 0x35, 0xc3, 0x7c, 0xe9,
-	0x32, 0x7a, 0x3b, 0xc5, 0xd4, 0x76, 0x44, 0xe7, 0x0b, 0x11, 0x63, 0xe3, 0x12, 0xfa, 0x62, 0xcc,
-	0xd8, 0xb8, 0x84, 0xbe, 0x14, 0x31, 0x2e, 0x6e, 0xa0, 0x2f, 0xc7, 0x8c, 0x8b, 0x1b, 0xe8, 0x2b,
-	0x11, 0xe3, 0xf2, 0x25, 0xf4, 0xd5, 0x98, 0x71, 0xf9, 0x12, 0xfa, 0xda, 0x0c, 0xf3, 0x85, 0x7b,
-	0x72, 0x71, 0x03, 0x7d, 0x3d, 0x17, 0xf7, 0x2e, 0x5f, 0x42, 0xdf, 0xc8, 0xb1, 0xf8, 0xc7, 0x51,
-	0x45, 0xdf, 0x44, 0x6c, 0x98, 0x2c, 0x40, 0xe8, 0x5b, 0xbc, 0xc9, 0x58, 0xe8, 0xdb, 0x88, 0xf9,
-	0xc8, 0xa8, 0xbc, 0xfb, 0x0e, 0xe7, 0xdc, 0xd6, 0x35, 0x82, 0xbe, 0x33, 0x23, 0x9e, 0x44, 0x55,
-	0x6b, 0x0d, 0xad, 0x8e, 0x30, 0xff, 0x07, 0x43, 0xe5, 0x7b, 0x17, 0x58, 0x93, 0xa5, 0x27, 0xfa,
-	0x7e, 0x8b, 0x19, 0xbc, 0xa9, 0x91, 0xea, 0xab, 0x1a, 0x41, 0x3f, 0xb8, 0xc0, 0x0c, 0xde, 0xd4,
-	0x88, 0xc4, 0xeb, 0x87, 0x2d, 0x26, 0xc8, 0x59, 0xef, 0x5e, 0x60, 0x83, 0x96, 0xf4, 0x1f, 0xb5,
-	0x70, 0x0e, 0xd2, 0x9b, 0x35, 0x13, 0xbd, 0xc7, 0xad, 0xb1, 0x14, 0x45, 0x3f, 0x46, 0x8c, 0xd8,
-	0xd6, 0x4d, 0xf4, 0x13, 0x46, 0xcc, 0x9a, 0x9d, 0x56, 0x5d, 0x47, 0x4f, 0xb0, 0xc1, 0x5d, 0xd3,
-	0x9b, 0x0d, 0xdd, 0x24, 0xb7, 0xd1, 0x4f, 0xb9, 0xf8, 0x6b, 0xed, 0xa6, 0x81, 0xde, 0x47, 0xb8,
-	0x04, 0xa0, 0xbf, 0xde, 0x22, 0x7a, 0xbb, 0x5d, 0x6b, 0x1a, 0xe8, 0xe9, 0xb5, 0x6d, 0x40, 0xc7,
-	0xcb, 0x01, 0x73, 0xa0, 0x63, 0x5c, 0x37, 0x9a, 0xb7, 0x0c, 0x74, 0x86, 0x75, 0x5a, 0x44, 0x6f,
-	0x69, 0x44, 0x47, 0x0a, 0x06, 0x98, 0x11, 0x0f, 0xb6, 0x50, 0x0a, 0xcf, 0x41, 0x8e, 0x34, 0xeb,
-	0xf5, 0x4d, 0xad, 0x7a, 0x1d, 0xa5, 0x37, 0x17, 0x60, 0xde, 0xf1, 0xd6, 0xef, 0x3a, 0x21, 0x0d,
-	0x02, 0xf1, 0xf4, 0x75, 0x67, 0x86, 0xff, 0x5c, 0xfc, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb1,
-	0xdd, 0x2d, 0x9d, 0x34, 0x2b, 0x00, 0x00,
+	0xf9, 0x1b, 0x52, 0xf9, 0x03, 0x72, 0xcb, 0x21, 0xc9, 0x21, 0xa7, 0x54, 0x0e, 0xa9, 0x4a, 0xe5,
+	0x94, 0x43, 0x0e, 0xa9, 0xd4, 0x3c, 0x76, 0xb1, 0x20, 0x61, 0x4b, 0x56, 0x72, 0xa1, 0xec, 0x13,
+	0x66, 0xba, 0x1b, 0xdd, 0xd3, 0xbf, 0xee, 0xe9, 0x99, 0x9d, 0x19, 0x28, 0x1c, 0x8c, 0xa8, 0x7f,
+	0xb4, 0x3e, 0xf4, 0xbd, 0xd0, 0xc3, 0x59, 0xde, 0x59, 0x2e, 0x85, 0xde, 0xd0, 0xeb, 0xd9, 0xa1,
+	0x2d, 0xc8, 0xcb, 0x85, 0xbb, 0xa1, 0x3f, 0xec, 0x8a, 0x8e, 0x7a, 0x00, 0x33, 0xa6, 0xed, 0xef,
+	0xd2, 0x10, 0x2f, 0x43, 0x6e, 0x9f, 0x1e, 0x05, 0x43, 0xbb, 0x4b, 0x2b, 0xca, 0x8a, 0xb2, 0x9a,
+	0x27, 0x71, 0x1f, 0x2f, 0x42, 0x36, 0xd8, 0xb3, 0xfd, 0x5e, 0x25, 0xc5, 0x19, 0xa2, 0x83, 0xff,
+	0x0f, 0x0a, 0xa1, 0xbd, 0xe3, 0xd2, 0xd0, 0x0a, 0x8f, 0x86, 0xb4, 0x92, 0x5e, 0x51, 0x56, 0x4b,
+	0x1b, 0x8b, 0xeb, 0xb1, 0x39, 0x93, 0x33, 0xcd, 0xa3, 0x21, 0x25, 0x10, 0xc6, 0x6d, 0x75, 0x0b,
+	0x4a, 0x37, 0xcd, 0x6b, 0x76, 0x48, 0xab, 0xb6, 0xeb, 0x52, 0xbf, 0xb6, 0xc5, 0x4c, 0x8f, 0x02,
+	0xea, 0x0f, 0xec, 0x7e, 0x6c, 0x3a, 0xea, 0xe3, 0xc7, 0x60, 0x66, 0xd7, 0xf7, 0x46, 0xc3, 0xa0,
+	0x92, 0x5a, 0x49, 0xaf, 0xe6, 0x89, 0xec, 0xa9, 0x6f, 0x02, 0xe8, 0x77, 0xe9, 0x20, 0x34, 0xbd,
+	0x7d, 0x3a, 0xc0, 0x4f, 0x40, 0x3e, 0x74, 0xfa, 0x34, 0x08, 0xed, 0xfe, 0x90, 0xab, 0x48, 0x93,
+	0x31, 0xe1, 0x03, 0x86, 0xbf, 0x0c, 0xb9, 0xa1, 0x17, 0x38, 0xa1, 0xe3, 0x0d, 0xf8, 0xd8, 0xf3,
+	0x24, 0xee, 0xab, 0x9f, 0x81, 0xec, 0x4d, 0xdb, 0x1d, 0x51, 0xfc, 0x34, 0x64, 0xb8, 0x73, 0x0a,
+	0x77, 0xae, 0xb0, 0x2e, 0xf0, 0xe5, 0x3e, 0x71, 0x06, 0xd3, 0x7d, 0x97, 0x49, 0x72, 0xdd, 0x73,
+	0x44, 0x74, 0xd4, 0x7d, 0x98, 0xdb, 0x74, 0x06, 0xbd, 0x9b, 0xb6, 0xef, 0x30, 0xc7, 0x1f, 0x52,
+	0x0d, 0x7e, 0x16, 0x66, 0x78, 0x23, 0xa8, 0xa4, 0x57, 0xd2, 0xab, 0x85, 0x8d, 0x39, 0xf9, 0x47,
+	0x3e, 0x36, 0x22, 0x79, 0xea, 0xaf, 0x15, 0x80, 0x4d, 0x6f, 0x34, 0xe8, 0xdd, 0x60, 0x4c, 0x8c,
+	0x20, 0x1d, 0x1c, 0xb8, 0x12, 0x48, 0xd6, 0xc4, 0xd7, 0xa1, 0xb4, 0xe3, 0x0c, 0x7a, 0xd6, 0x5d,
+	0x39, 0x1c, 0x81, 0x65, 0x61, 0xe3, 0x59, 0xa9, 0x6e, 0xfc, 0xe7, 0xf5, 0xe4, 0xa8, 0x03, 0x7d,
+	0x10, 0xfa, 0x47, 0xa4, 0xb8, 0x93, 0xa4, 0x2d, 0x77, 0x00, 0x9f, 0x14, 0x62, 0x46, 0xf7, 0xe9,
+	0x51, 0x64, 0x74, 0x9f, 0x1e, 0xe1, 0xff, 0x4e, 0x7a, 0x54, 0xd8, 0x28, 0x47, 0xb6, 0x12, 0xff,
+	0x95, 0x6e, 0xbe, 0x9c, 0xba, 0xa2, 0xa8, 0x7f, 0xc9, 0x42, 0x49, 0x7f, 0x8b, 0x76, 0x47, 0x21,
+	0x6d, 0x0e, 0x59, 0x0c, 0x02, 0xbc, 0x0e, 0x65, 0x67, 0xd0, 0x75, 0x47, 0x3d, 0x6a, 0x51, 0x16,
+	0x6a, 0x2b, 0x64, 0xb1, 0xe6, 0xfa, 0x72, 0x64, 0x41, 0xb2, 0x12, 0x49, 0xa0, 0x41, 0xb9, 0xeb,
+	0xf5, 0x87, 0xb6, 0x3f, 0x29, 0x9f, 0xe6, 0xf6, 0x17, 0xa4, 0xfd, 0xb1, 0x3c, 0x59, 0x90, 0xd2,
+	0x09, 0x15, 0x0d, 0x98, 0x97, 0x7a, 0x7b, 0xd6, 0x1d, 0x87, 0xba, 0xbd, 0xa0, 0x92, 0xe1, 0x21,
+	0x8b, 0xa0, 0x9a, 0x1c, 0xe2, 0x7a, 0x4d, 0x0a, 0x6f, 0x73, 0x59, 0x52, 0x72, 0x26, 0xfa, 0x78,
+	0x0d, 0x16, 0xba, 0xae, 0xc3, 0x86, 0x72, 0x87, 0x41, 0x6c, 0xf9, 0xde, 0x61, 0x50, 0xc9, 0xf2,
+	0xf1, 0xcf, 0x0b, 0xc6, 0x36, 0xa3, 0x13, 0xef, 0x30, 0xc0, 0x2f, 0x43, 0xee, 0xd0, 0xf3, 0xf7,
+	0x5d, 0xcf, 0xee, 0x55, 0x66, 0xb8, 0xcd, 0xa7, 0xa6, 0xdb, 0xbc, 0x25, 0xa5, 0x48, 0x2c, 0x8f,
+	0x57, 0x01, 0x05, 0x07, 0xae, 0x15, 0x50, 0x97, 0x76, 0x43, 0xcb, 0x75, 0xfa, 0x4e, 0x58, 0xc9,
+	0xf1, 0x59, 0x50, 0x0a, 0x0e, 0xdc, 0x36, 0x27, 0xd7, 0x19, 0x15, 0x5b, 0xb0, 0x14, 0xfa, 0xf6,
+	0x20, 0xb0, 0xbb, 0x4c, 0x99, 0xe5, 0x04, 0x9e, 0x6b, 0xf3, 0x19, 0x90, 0xe7, 0x26, 0xd7, 0xa6,
+	0x9b, 0x34, 0xc7, 0x7f, 0xa9, 0x45, 0xff, 0x20, 0x8b, 0xe1, 0x14, 0x2a, 0x7e, 0x09, 0x96, 0x82,
+	0x7d, 0x67, 0x68, 0x71, 0x3d, 0xd6, 0xd0, 0xb5, 0x07, 0x56, 0xd7, 0xee, 0xee, 0xd1, 0x0a, 0x70,
+	0xb7, 0x31, 0x63, 0xf2, 0x54, 0x6b, 0xb9, 0xf6, 0xa0, 0xca, 0x38, 0xea, 0x2b, 0x50, 0x9a, 0xc4,
+	0x11, 0x2f, 0x40, 0xd1, 0xbc, 0xdd, 0xd2, 0x2d, 0xcd, 0xd8, 0xb2, 0x0c, 0xad, 0xa1, 0xa3, 0x33,
+	0xb8, 0x08, 0x79, 0x4e, 0x6a, 0x1a, 0xf5, 0xdb, 0x48, 0xc1, 0xb3, 0x90, 0xd6, 0xea, 0x75, 0x94,
+	0x52, 0xaf, 0x40, 0x2e, 0x02, 0x04, 0xcf, 0x43, 0xa1, 0x63, 0xb4, 0x5b, 0x7a, 0xb5, 0xb6, 0x5d,
+	0xd3, 0xb7, 0xd0, 0x19, 0x9c, 0x83, 0x4c, 0xb3, 0x6e, 0xb6, 0x90, 0x22, 0x5a, 0x5a, 0x0b, 0xa5,
+	0xd8, 0x3f, 0xb7, 0x36, 0x35, 0x94, 0x56, 0x43, 0x58, 0x9c, 0xe6, 0x17, 0x2e, 0xc0, 0xec, 0x96,
+	0xbe, 0xad, 0x75, 0xea, 0x26, 0x3a, 0x83, 0xcb, 0x30, 0x4f, 0xf4, 0x96, 0xae, 0x99, 0xda, 0x66,
+	0x5d, 0xb7, 0x88, 0xae, 0x6d, 0x21, 0x05, 0x63, 0x28, 0xb1, 0x96, 0x55, 0x6d, 0x36, 0x1a, 0x35,
+	0xd3, 0xd4, 0xb7, 0x50, 0x0a, 0x2f, 0x02, 0xe2, 0xb4, 0x8e, 0x31, 0xa6, 0xa6, 0x31, 0x82, 0xb9,
+	0xb6, 0x4e, 0x6a, 0x5a, 0xbd, 0xf6, 0x06, 0x53, 0x80, 0x32, 0xaf, 0x65, 0x72, 0x0a, 0x4a, 0xa9,
+	0xef, 0xa6, 0x20, 0xcb, 0x7d, 0xc5, 0x18, 0x32, 0x89, 0xba, 0xc7, 0xdb, 0x71, 0xb5, 0x48, 0x7d,
+	0x48, 0xb5, 0xe0, 0x05, 0x55, 0xd6, 0x2d, 0xd1, 0xc1, 0xe7, 0x20, 0xef, 0xf9, 0xbb, 0x96, 0xe0,
+	0x64, 0x44, 0x45, 0xf3, 0xfc, 0x5d, 0x5e, 0x86, 0x59, 0xb5, 0x63, 0x45, 0x79, 0xc7, 0x0e, 0x28,
+	0xcf, 0xc0, 0x3c, 0x89, 0xfb, 0xf8, 0x71, 0x60, 0x72, 0x16, 0x1f, 0xc7, 0x0c, 0xe7, 0xcd, 0x7a,
+	0xfe, 0xae, 0xc1, 0x86, 0xf2, 0x0c, 0x14, 0xbb, 0x9e, 0x3b, 0xea, 0x0f, 0x2c, 0x97, 0x0e, 0x76,
+	0xc3, 0xbd, 0xca, 0xec, 0x8a, 0xb2, 0x5a, 0x24, 0x73, 0x82, 0x58, 0xe7, 0x34, 0x5c, 0x81, 0xd9,
+	0xee, 0x9e, 0xed, 0x07, 0x54, 0x64, 0x5d, 0x91, 0x44, 0x5d, 0x6e, 0x95, 0x76, 0x9d, 0xbe, 0xed,
+	0x06, 0x3c, 0xc3, 0x8a, 0x24, 0xee, 0x33, 0x27, 0xee, 0xb8, 0xf6, 0x6e, 0xc0, 0x33, 0xa3, 0x48,
+	0x44, 0x47, 0xfd, 0x7f, 0x48, 0x13, 0xef, 0x90, 0xa9, 0x14, 0x06, 0x83, 0x8a, 0xb2, 0x92, 0x5e,
+	0xc5, 0x24, 0xea, 0xb2, 0x05, 0x41, 0xd6, 0x44, 0x51, 0x2a, 0xa3, 0x2a, 0xf8, 0x26, 0xcc, 0x11,
+	0x1a, 0x8c, 0xdc, 0x50, 0x7f, 0x2b, 0xf4, 0xed, 0x00, 0x6f, 0x40, 0x21, 0x59, 0x05, 0x94, 0x0f,
+	0xaa, 0x02, 0x40, 0xc7, 0xd3, 0xbf, 0x02, 0xb3, 0x77, 0x7c, 0x1a, 0xec, 0x51, 0x5f, 0x56, 0x99,
+	0xa8, 0xcb, 0x6a, 0x6c, 0x81, 0xa7, 0xad, 0xb0, 0xc1, 0x2a, 0xb3, 0xac, 0x0f, 0xca, 0x44, 0x65,
+	0xe6, 0x41, 0x25, 0x92, 0xc7, 0xd0, 0x63, 0x53, 0xde, 0xb2, 0xef, 0xdc, 0xa1, 0xdd, 0x90, 0x8a,
+	0x05, 0x28, 0x43, 0xe6, 0x18, 0x51, 0x93, 0x34, 0x16, 0x36, 0x67, 0x10, 0x50, 0x3f, 0xb4, 0x9c,
+	0x1e, 0x0f, 0x68, 0x86, 0xe4, 0x04, 0xa1, 0xd6, 0xc3, 0x4f, 0x41, 0x86, 0x17, 0x8d, 0x0c, 0xb7,
+	0x02, 0xd2, 0x0a, 0xf1, 0x0e, 0x09, 0xa7, 0xe3, 0x17, 0x60, 0x86, 0x72, 0x7f, 0x79, 0x50, 0xc7,
+	0x65, 0x36, 0x09, 0x05, 0x91, 0x22, 0xea, 0xcf, 0xd3, 0x50, 0x68, 0x87, 0x3e, 0xb5, 0xfb, 0xdc,
+	0x7f, 0xfc, 0x29, 0x80, 0x20, 0xb4, 0x43, 0xda, 0xa7, 0x83, 0x30, 0x72, 0xe4, 0x09, 0xa9, 0x20,
+	0x21, 0xb7, 0xde, 0x8e, 0x84, 0x48, 0x42, 0xfe, 0x38, 0xc0, 0xa9, 0x07, 0x00, 0x78, 0xf9, 0xfd,
+	0x14, 0xe4, 0x63, 0x6d, 0x58, 0x83, 0x5c, 0xd7, 0x0e, 0xe9, 0xae, 0xe7, 0x1f, 0xc9, 0x95, 0xf1,
+	0xfc, 0x87, 0x59, 0x5f, 0xaf, 0x4a, 0x61, 0x12, 0xff, 0x0d, 0x3f, 0x09, 0x62, 0x6b, 0x21, 0x92,
+	0x57, 0xac, 0xef, 0x79, 0x4e, 0xe1, 0xe9, 0xfb, 0x32, 0xe0, 0xa1, 0xef, 0xf4, 0x6d, 0xff, 0xc8,
+	0xda, 0xa7, 0x47, 0x51, 0x49, 0x4f, 0x4f, 0x09, 0x19, 0x92, 0x72, 0xd7, 0xe9, 0x91, 0x2c, 0x42,
+	0x57, 0x26, 0xff, 0x2b, 0x93, 0xee, 0x64, 0x20, 0x12, 0xff, 0xe4, 0xeb, 0x72, 0x10, 0xad, 0xc0,
+	0x59, 0x9e, 0x9f, 0xac, 0xa9, 0x3e, 0x0f, 0xb9, 0x68, 0xf0, 0x38, 0x0f, 0x59, 0xdd, 0xf7, 0x3d,
+	0x1f, 0x9d, 0xe1, 0xb5, 0xa8, 0x51, 0x17, 0xe5, 0x6c, 0x6b, 0x8b, 0x95, 0xb3, 0x5f, 0xa5, 0xe2,
+	0x65, 0x90, 0xd0, 0x83, 0x11, 0x0d, 0x42, 0xfc, 0x59, 0x28, 0x53, 0x9e, 0x2b, 0xce, 0x5d, 0x6a,
+	0x75, 0xf9, 0x9e, 0x89, 0x65, 0x8a, 0x48, 0xe8, 0xf9, 0x75, 0xb1, 0x9b, 0x8b, 0xf6, 0x52, 0x64,
+	0x21, 0x96, 0x95, 0xa4, 0x1e, 0xd6, 0xa1, 0xec, 0xf4, 0xfb, 0xb4, 0xe7, 0xd8, 0x61, 0x52, 0x81,
+	0x08, 0xd8, 0x52, 0xb4, 0xa5, 0x98, 0xd8, 0x92, 0x91, 0x85, 0xf8, 0x1f, 0xb1, 0x9a, 0xf3, 0x30,
+	0x13, 0xf2, 0xad, 0xa2, 0x5c, 0x51, 0x8b, 0x51, 0x5d, 0xe2, 0x44, 0x22, 0x99, 0xf8, 0x79, 0x10,
+	0xfb, 0x4e, 0x5e, 0x81, 0xc6, 0x09, 0x31, 0xde, 0x63, 0x10, 0xc1, 0xc7, 0xe7, 0xa1, 0x34, 0xb1,
+	0x14, 0xf5, 0x38, 0x60, 0x69, 0x52, 0x4c, 0xae, 0x2b, 0x3d, 0xfc, 0xbf, 0x30, 0xeb, 0x89, 0x65,
+	0x88, 0xd7, 0xa6, 0xf1, 0x88, 0x27, 0xd7, 0x28, 0x12, 0x49, 0xa9, 0x9f, 0x86, 0xf9, 0x18, 0xc1,
+	0x60, 0xe8, 0x0d, 0x02, 0x8a, 0xd7, 0x60, 0xc6, 0xe7, 0x13, 0x42, 0xa2, 0x86, 0xa5, 0x8a, 0xc4,
+	0x8c, 0x26, 0x52, 0x42, 0xed, 0xc1, 0xbc, 0xa0, 0xdc, 0x72, 0xc2, 0x3d, 0x1e, 0x28, 0x7c, 0x1e,
+	0xb2, 0x94, 0x35, 0x8e, 0x61, 0x4e, 0x5a, 0x55, 0xce, 0x27, 0x82, 0x9b, 0xb0, 0x92, 0xba, 0xaf,
+	0x95, 0xbf, 0xa5, 0xa0, 0x2c, 0x47, 0xb9, 0x69, 0x87, 0xdd, 0xbd, 0x53, 0x1a, 0xec, 0x17, 0x60,
+	0x96, 0xd1, 0x9d, 0x78, 0x62, 0x4c, 0x09, 0x77, 0x24, 0xc1, 0x02, 0x6e, 0x07, 0x56, 0x22, 0xba,
+	0x72, 0x2b, 0x54, 0xb4, 0x83, 0xc4, 0x42, 0x3c, 0x25, 0x2f, 0x66, 0xee, 0x93, 0x17, 0xb3, 0x0f,
+	0x94, 0x17, 0x5b, 0xb0, 0x38, 0x89, 0xb8, 0x4c, 0x8e, 0x17, 0x61, 0x56, 0x04, 0x25, 0x2a, 0x81,
+	0xd3, 0xe2, 0x16, 0x89, 0xa8, 0x3f, 0x4b, 0xc1, 0xa2, 0xac, 0x4e, 0x1f, 0x8f, 0x69, 0x9a, 0xc0,
+	0x39, 0xfb, 0x40, 0x38, 0x57, 0x61, 0xe9, 0x18, 0x40, 0x0f, 0x31, 0x0b, 0xff, 0xaa, 0xc0, 0xdc,
+	0x26, 0xdd, 0x75, 0x06, 0xa7, 0x14, 0xde, 0x04, 0x6a, 0x99, 0x07, 0x42, 0xed, 0x32, 0x14, 0xa5,
+	0xbf, 0x12, 0xad, 0x93, 0xd3, 0x40, 0x99, 0x32, 0x0d, 0xd4, 0x3f, 0x29, 0x50, 0xac, 0x7a, 0xfd,
+	0xbe, 0x13, 0x9e, 0x52, 0xa4, 0x4e, 0xfa, 0x99, 0x99, 0xe6, 0x27, 0x82, 0x52, 0xe4, 0xa6, 0x00,
+	0x48, 0xfd, 0xb3, 0x02, 0xf3, 0xc4, 0x73, 0xdd, 0x1d, 0xbb, 0xbb, 0xff, 0x68, 0xfb, 0x8e, 0x01,
+	0x8d, 0x1d, 0x95, 0xde, 0xff, 0x43, 0x81, 0x52, 0xcb, 0xa7, 0xec, 0xfb, 0xf5, 0x91, 0x76, 0x9e,
+	0x7d, 0x20, 0xf5, 0x42, 0xb9, 0x39, 0xc8, 0x13, 0xde, 0x56, 0x17, 0x60, 0x3e, 0xf6, 0x5d, 0xe2,
+	0xf1, 0x7b, 0x05, 0x96, 0x44, 0x82, 0x48, 0x4e, 0xef, 0x94, 0xc2, 0x12, 0xf9, 0x9b, 0x49, 0xf8,
+	0x5b, 0x81, 0xc7, 0x8e, 0xfb, 0x26, 0xdd, 0x7e, 0x3b, 0x05, 0x67, 0xa3, 0xdc, 0x38, 0xe5, 0x8e,
+	0xff, 0x1b, 0xf9, 0xb0, 0x0c, 0x95, 0x93, 0x20, 0x48, 0x84, 0xde, 0x49, 0x41, 0xa5, 0xea, 0x53,
+	0x3b, 0xa4, 0x89, 0x4d, 0xc6, 0xa3, 0x93, 0x1b, 0xf8, 0x25, 0x98, 0x1b, 0xda, 0x7e, 0xe8, 0x74,
+	0x9d, 0xa1, 0xcd, 0x3e, 0xe3, 0xb2, 0x7c, 0x0f, 0x73, 0x4c, 0xc1, 0x84, 0x88, 0x7a, 0x0e, 0x1e,
+	0x9f, 0x82, 0x88, 0xc4, 0xeb, 0x9f, 0x0a, 0xe0, 0x76, 0x68, 0xfb, 0xe1, 0xc7, 0x60, 0x55, 0x99,
+	0x9a, 0x4c, 0x4b, 0x50, 0x9e, 0xf0, 0x3f, 0x89, 0x0b, 0x0d, 0x3f, 0x16, 0x2b, 0xce, 0x07, 0xe2,
+	0x92, 0xf4, 0x5f, 0xe2, 0xf2, 0x47, 0x05, 0x96, 0xab, 0x9e, 0x38, 0xbf, 0x7b, 0x24, 0x67, 0x98,
+	0xfa, 0x24, 0x9c, 0x9b, 0xea, 0xa0, 0x04, 0xe0, 0x0f, 0x0a, 0x3c, 0x46, 0xa8, 0xdd, 0x7b, 0x34,
+	0x9d, 0xbf, 0x01, 0x67, 0x4f, 0x38, 0x27, 0x77, 0xa8, 0x97, 0x21, 0xd7, 0xa7, 0xa1, 0xdd, 0xb3,
+	0x43, 0x5b, 0xba, 0xb4, 0x1c, 0xe9, 0x1d, 0x4b, 0x37, 0xa4, 0x04, 0x89, 0x65, 0xd5, 0xf7, 0x53,
+	0x50, 0xe6, 0x7b, 0xdd, 0x4f, 0xbe, 0xa0, 0xa6, 0x7f, 0x0b, 0xbc, 0xa3, 0xc0, 0xe2, 0x24, 0x40,
+	0xf1, 0x37, 0xc1, 0x7f, 0xfa, 0x20, 0x62, 0x4a, 0x41, 0x48, 0x4f, 0xdb, 0x82, 0xfe, 0x26, 0x05,
+	0x95, 0xe4, 0x90, 0x3e, 0x39, 0xb4, 0x98, 0x3c, 0xb4, 0xf8, 0xc8, 0xa7, 0x54, 0xef, 0x2a, 0xf0,
+	0xf8, 0x14, 0x40, 0x3f, 0x5a, 0xa0, 0x13, 0x47, 0x17, 0xa9, 0xfb, 0x1e, 0x5d, 0x3c, 0x68, 0xa8,
+	0x7f, 0xa7, 0xc0, 0x62, 0x83, 0x06, 0x81, 0xbd, 0x4b, 0xc5, 0x77, 0xfc, 0xe9, 0xad, 0x66, 0xfc,
+	0x50, 0x38, 0x33, 0xbe, 0x59, 0x51, 0xab, 0xb0, 0x74, 0xcc, 0xb5, 0x87, 0x38, 0x9b, 0xf8, 0xbb,
+	0x02, 0x0b, 0x52, 0x8b, 0x76, 0x6a, 0x37, 0x02, 0x53, 0xd0, 0xc1, 0x4f, 0x41, 0xda, 0xe9, 0x45,
+	0x3b, 0xc8, 0xc9, 0xbb, 0x66, 0xc6, 0x50, 0xaf, 0x02, 0x4e, 0xfa, 0xfd, 0x10, 0xd0, 0xfd, 0x36,
+	0x0d, 0x0b, 0xed, 0xa1, 0xeb, 0x84, 0x92, 0xf9, 0x68, 0x17, 0xfe, 0xff, 0x82, 0xb9, 0x80, 0x39,
+	0x6b, 0x89, 0xdb, 0x32, 0x0e, 0x6c, 0x9e, 0x14, 0x38, 0xad, 0xca, 0x49, 0xf8, 0x69, 0x28, 0x44,
+	0x22, 0xa3, 0x41, 0x28, 0x4f, 0x3a, 0x41, 0x4a, 0x8c, 0x06, 0x21, 0xbe, 0x04, 0x67, 0x07, 0xa3,
+	0x3e, 0xbf, 0x39, 0xb6, 0x86, 0xd4, 0x8f, 0xee, 0x55, 0x6d, 0x3f, 0xba, 0xe1, 0x2d, 0x0f, 0x46,
+	0x7d, 0xe2, 0x1d, 0x06, 0x2d, 0xea, 0x8b, 0x7b, 0x55, 0xdb, 0x0f, 0xf1, 0x55, 0xc8, 0xdb, 0xee,
+	0xae, 0xe7, 0x3b, 0xe1, 0x5e, 0x5f, 0x5e, 0xed, 0xaa, 0xd1, 0xd5, 0xca, 0x71, 0xf8, 0xd7, 0xb5,
+	0x48, 0x92, 0x8c, 0xff, 0xa4, 0xbe, 0x08, 0xf9, 0x98, 0x8e, 0x11, 0xcc, 0xe9, 0x37, 0x3a, 0x5a,
+	0xdd, 0x6a, 0xb7, 0xea, 0x35, 0xb3, 0x2d, 0xae, 0x63, 0xb7, 0x3b, 0xf5, 0xba, 0xd5, 0xae, 0x6a,
+	0x06, 0x52, 0x54, 0x02, 0xc0, 0x55, 0x72, 0xe5, 0x63, 0x80, 0x94, 0xfb, 0x00, 0x74, 0x0e, 0xf2,
+	0xbe, 0x77, 0x28, 0x7d, 0x4f, 0x71, 0x77, 0x72, 0xbe, 0x77, 0xc8, 0x3d, 0x57, 0x35, 0xc0, 0xc9,
+	0xb1, 0xca, 0x6c, 0x4b, 0x14, 0x6f, 0x65, 0xa2, 0x78, 0x8f, 0xed, 0xc7, 0xc5, 0x5b, 0x6c, 0xe5,
+	0xd9, 0x3c, 0x7f, 0x95, 0xda, 0x6e, 0x18, 0xad, 0x57, 0xea, 0x2f, 0x52, 0x50, 0x24, 0x8c, 0xe2,
+	0xf4, 0x69, 0x3b, 0xb4, 0xc3, 0x80, 0x45, 0x6a, 0x8f, 0x8b, 0x58, 0xe3, 0xb2, 0x9b, 0x27, 0x05,
+	0x41, 0x13, 0x97, 0x00, 0x1b, 0xb0, 0x14, 0xd0, 0xae, 0x37, 0xe8, 0x05, 0xd6, 0x0e, 0xdd, 0x73,
+	0x06, 0x3d, 0xab, 0x6f, 0x07, 0xa1, 0xbc, 0x29, 0x2c, 0x92, 0xb2, 0x64, 0x6e, 0x72, 0x5e, 0x83,
+	0xb3, 0xf0, 0x05, 0x58, 0xdc, 0x71, 0x06, 0xae, 0xb7, 0x6b, 0x0d, 0x5d, 0xfb, 0x88, 0xfa, 0x81,
+	0x74, 0x95, 0xa5, 0x57, 0x96, 0x60, 0xc1, 0x6b, 0x09, 0x96, 0x08, 0xf7, 0x1b, 0xb0, 0x36, 0xd5,
+	0x8a, 0x75, 0xc7, 0x71, 0x43, 0xea, 0xd3, 0x9e, 0xe5, 0xd3, 0xa1, 0xeb, 0x74, 0xc5, 0xa5, 0xbd,
+	0xd8, 0xbb, 0x3f, 0x37, 0xc5, 0xf4, 0xb6, 0x14, 0x27, 0x63, 0x69, 0x86, 0x76, 0x77, 0x38, 0xb2,
+	0x46, 0x6c, 0x02, 0xf3, 0x55, 0x4c, 0x21, 0xb9, 0xee, 0x70, 0xd4, 0x61, 0x7d, 0x8c, 0x20, 0x7d,
+	0x30, 0x14, 0x8b, 0x97, 0x42, 0x58, 0x93, 0xa1, 0xb4, 0x38, 0x89, 0x5e, 0xbc, 0x38, 0x45, 0xd3,
+	0x44, 0xf9, 0xb0, 0x69, 0x52, 0x81, 0xd9, 0x80, 0xfa, 0x77, 0x9d, 0xc1, 0x6e, 0x74, 0x99, 0x2a,
+	0xbb, 0xb8, 0x0d, 0xcf, 0xc9, 0x87, 0x43, 0xf4, 0xad, 0x90, 0xfa, 0x03, 0xdb, 0x75, 0x8f, 0x2c,
+	0xf1, 0xdd, 0x3e, 0x08, 0x69, 0xcf, 0x1a, 0x3f, 0xe5, 0x11, 0x0b, 0xd4, 0x33, 0x42, 0x5a, 0x8f,
+	0x85, 0x49, 0x2c, 0x6b, 0xc6, 0x8f, 0x7c, 0x5e, 0x81, 0x92, 0x2f, 0x63, 0x6a, 0x05, 0x2c, 0xa8,
+	0x72, 0x7a, 0x2e, 0xc6, 0x37, 0xa2, 0x89, 0x80, 0x93, 0xa2, 0x3f, 0x11, 0xff, 0x2b, 0x30, 0x27,
+	0x47, 0x64, 0xbb, 0x8e, 0x3d, 0xde, 0xa7, 0x1d, 0x7b, 0xcb, 0xa4, 0x31, 0x26, 0x91, 0xaf, 0x9e,
+	0x78, 0x87, 0x7d, 0x16, 0x96, 0x3b, 0xc3, 0x9e, 0x1d, 0x9e, 0xee, 0xc5, 0x32, 0xf9, 0x18, 0x2a,
+	0x33, 0xf9, 0x18, 0x6a, 0xf2, 0x71, 0x55, 0xf6, 0xd8, 0xe3, 0x2a, 0xf5, 0x2a, 0x2c, 0x4e, 0xfa,
+	0x2f, 0xb3, 0x64, 0x15, 0xb2, 0xfc, 0xe2, 0xf7, 0xd8, 0xaa, 0x90, 0xb8, 0xd9, 0x25, 0x42, 0x40,
+	0xfd, 0xa5, 0x02, 0xe5, 0x29, 0x5f, 0x0c, 0xf1, 0xe7, 0x88, 0x92, 0x38, 0xed, 0xf8, 0x1f, 0xc8,
+	0xf2, 0x2b, 0x68, 0xf9, 0x36, 0xe2, 0xec, 0xc9, 0x0f, 0x0e, 0x7e, 0x5d, 0x4c, 0x84, 0x14, 0x9b,
+	0xd7, 0x3c, 0x21, 0xba, 0xfc, 0xb8, 0x23, 0xda, 0xf0, 0x14, 0x18, 0x4d, 0x9c, 0x80, 0x9c, 0x3c,
+	0x3f, 0xc9, 0xdc, 0xf7, 0xfc, 0x64, 0xed, 0xbb, 0x69, 0xc8, 0x37, 0x8e, 0xda, 0x07, 0xee, 0xb6,
+	0x6b, 0xef, 0xf2, 0xfb, 0xdc, 0x46, 0xcb, 0xbc, 0x8d, 0xce, 0xe0, 0x05, 0x28, 0x1a, 0x4d, 0xd3,
+	0x32, 0x58, 0x65, 0xdc, 0xae, 0x6b, 0xd7, 0x90, 0xc2, 0x4a, 0x67, 0x8b, 0xd4, 0xac, 0xeb, 0xfa,
+	0x6d, 0x41, 0x49, 0xe1, 0x32, 0xcc, 0x77, 0x8c, 0xda, 0x8d, 0x8e, 0x3e, 0x26, 0x66, 0xf0, 0x12,
+	0x2c, 0x34, 0x3a, 0x75, 0xb3, 0xd6, 0xaa, 0x27, 0xc8, 0x39, 0x56, 0x66, 0x37, 0xeb, 0xcd, 0x4d,
+	0xd1, 0x45, 0x4c, 0x7f, 0xc7, 0x68, 0xd7, 0xae, 0x19, 0xfa, 0x96, 0x20, 0xad, 0x30, 0xd2, 0x1b,
+	0x3a, 0x69, 0x6e, 0xd7, 0x22, 0x93, 0x57, 0x31, 0x82, 0xc2, 0x66, 0xcd, 0xd0, 0x88, 0xd4, 0x72,
+	0x4f, 0xc1, 0x25, 0xc8, 0xeb, 0x46, 0xa7, 0x21, 0xfb, 0x29, 0x5c, 0x81, 0xb2, 0xd6, 0x31, 0x9b,
+	0x56, 0xcd, 0xa8, 0x12, 0xbd, 0xa1, 0x1b, 0xa6, 0xe4, 0x64, 0x70, 0x19, 0x4a, 0x66, 0xad, 0xa1,
+	0xb7, 0x4d, 0xad, 0xd1, 0x92, 0x44, 0x36, 0x8a, 0x5c, 0x5b, 0x8f, 0x64, 0x10, 0x5e, 0x86, 0x25,
+	0xa3, 0x69, 0xc9, 0x37, 0x32, 0xd6, 0x4d, 0xad, 0xde, 0xd1, 0x25, 0x6f, 0x05, 0x9f, 0x05, 0xdc,
+	0x34, 0xac, 0x4e, 0x6b, 0x4b, 0x33, 0x75, 0xcb, 0x68, 0xde, 0x92, 0x8c, 0xab, 0xb8, 0x04, 0xb9,
+	0xf1, 0x08, 0xee, 0x31, 0x14, 0x8a, 0x2d, 0x8d, 0x98, 0x63, 0x67, 0xef, 0xdd, 0x63, 0x60, 0xc1,
+	0x35, 0xd2, 0xec, 0xb4, 0xc6, 0x62, 0x0b, 0x50, 0x90, 0x60, 0x49, 0x52, 0x86, 0x91, 0x36, 0x6b,
+	0x46, 0x35, 0x1e, 0xdf, 0xbd, 0xdc, 0x72, 0x0a, 0x29, 0x6b, 0xfb, 0x90, 0xe1, 0xe1, 0xc8, 0x41,
+	0xc6, 0x68, 0x1a, 0x3a, 0x3a, 0x83, 0xe7, 0x01, 0x6a, 0xed, 0x9a, 0x61, 0xea, 0xd7, 0x88, 0x56,
+	0x67, 0x6e, 0x73, 0x42, 0x04, 0x20, 0xf3, 0x76, 0x0e, 0x66, 0x6b, 0xed, 0xed, 0x7a, 0x53, 0x33,
+	0xa5, 0x9b, 0xb5, 0xf6, 0x8d, 0x4e, 0xd3, 0x64, 0x4c, 0x84, 0x0b, 0x30, 0x53, 0x6b, 0x9b, 0xfa,
+	0xeb, 0x26, 0xf3, 0x8b, 0xf3, 0x04, 0xaa, 0xe8, 0xde, 0xd5, 0xb5, 0xf7, 0xd2, 0x90, 0x31, 0x8f,
+	0x86, 0x94, 0x05, 0x88, 0x47, 0xdb, 0xbc, 0xdd, 0x62, 0x26, 0xf3, 0x90, 0xa9, 0x19, 0xe6, 0x15,
+	0xf4, 0xb9, 0x14, 0x06, 0xc8, 0x76, 0x78, 0xfb, 0xf3, 0x33, 0xac, 0x5d, 0x33, 0xcc, 0x97, 0x2e,
+	0xa3, 0xb7, 0x53, 0x4c, 0x6d, 0x47, 0x74, 0xbe, 0x10, 0x31, 0x36, 0x2e, 0xa1, 0x2f, 0xc6, 0x8c,
+	0x8d, 0x4b, 0xe8, 0x4b, 0x11, 0xe3, 0xe2, 0x06, 0xfa, 0x72, 0xcc, 0xb8, 0xb8, 0x81, 0xbe, 0x12,
+	0x31, 0x2e, 0x5f, 0x42, 0x5f, 0x8d, 0x19, 0x97, 0x2f, 0xa1, 0xaf, 0xcd, 0x30, 0x5f, 0xb8, 0x27,
+	0x17, 0x37, 0xd0, 0xd7, 0x73, 0x71, 0xef, 0xf2, 0x25, 0xf4, 0x8d, 0x1c, 0x8b, 0x7f, 0x1c, 0x55,
+	0xf4, 0x4d, 0xc4, 0x86, 0xc9, 0x02, 0x84, 0xbe, 0xc5, 0x9b, 0x8c, 0x85, 0xbe, 0x8d, 0x98, 0x8f,
+	0x8c, 0xca, 0xbb, 0xef, 0x70, 0xce, 0x6d, 0x5d, 0x23, 0xe8, 0x3b, 0x33, 0xe2, 0x49, 0x54, 0xb5,
+	0xd6, 0xd0, 0xea, 0x08, 0xf3, 0x7f, 0x30, 0x54, 0xbe, 0x77, 0x81, 0x35, 0x59, 0x7a, 0xa2, 0xef,
+	0xb7, 0x98, 0xc1, 0x9b, 0x1a, 0xa9, 0xbe, 0xaa, 0x11, 0xf4, 0x83, 0x0b, 0xcc, 0xe0, 0x4d, 0x8d,
+	0x48, 0xbc, 0x7e, 0xd8, 0x62, 0x82, 0x9c, 0xf5, 0xee, 0x05, 0x36, 0x68, 0x49, 0xff, 0x51, 0x0b,
+	0xe7, 0x20, 0xbd, 0x59, 0x33, 0xd1, 0x7b, 0xdc, 0x1a, 0x4b, 0x51, 0xf4, 0x63, 0xc4, 0x88, 0x6d,
+	0xdd, 0x44, 0x3f, 0x61, 0xc4, 0xac, 0xd9, 0x69, 0xd5, 0x75, 0xf4, 0x04, 0x1b, 0xdc, 0x35, 0xbd,
+	0xd9, 0xd0, 0x4d, 0x72, 0x1b, 0xfd, 0x94, 0x8b, 0xbf, 0xd6, 0x6e, 0x1a, 0xe8, 0x7d, 0x84, 0x4b,
+	0x00, 0xfa, 0xeb, 0x2d, 0xa2, 0xb7, 0xdb, 0xb5, 0xa6, 0x81, 0x9e, 0x5e, 0xdb, 0x06, 0x74, 0xbc,
+	0x1c, 0x30, 0x07, 0x3a, 0xc6, 0x75, 0xa3, 0x79, 0xcb, 0x40, 0x67, 0x58, 0xa7, 0x45, 0xf4, 0x96,
+	0x46, 0x74, 0xa4, 0x60, 0x80, 0x19, 0xf1, 0x60, 0x0b, 0xa5, 0xf0, 0x1c, 0xe4, 0x48, 0xb3, 0x5e,
+	0xdf, 0xd4, 0xaa, 0xd7, 0x51, 0x7a, 0x73, 0x01, 0xe6, 0x1d, 0x6f, 0xfd, 0xae, 0x13, 0xd2, 0x20,
+	0x10, 0xaf, 0x65, 0x77, 0x66, 0xf8, 0xcf, 0xc5, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xd9,
+	0xf8, 0x4e, 0x67, 0x2b, 0x00, 0x00,
 }
diff --git a/go/vt/servenv/grpc_server.go b/go/vt/servenv/grpc_server.go
index 34a8eabe753..3cb6cdc0bc9 100644
--- a/go/vt/servenv/grpc_server.go
+++ b/go/vt/servenv/grpc_server.go
@@ -57,10 +57,6 @@ var (
 	// GRPCCA is the CA to use if TLS is enabled
 	GRPCCA *string
 
-	// GRPCMaxMessageSize is the maximum message size which the gRPC server will
-	// accept. Larger messages will be rejected.
-	GRPCMaxMessageSize *int
-
 	// GRPCServer is the global server to serve gRPC.
 	GRPCServer *grpc.Server
 
@@ -114,9 +110,10 @@ func createGRPCServer() {
 	// grpc: received message length XXXXXXX exceeding the max size 4194304
 	// Note: For gRPC 1.0.0 it's sufficient to set the limit on the server only
 	// because it's not enforced on the client side.
-	if GRPCMaxMessageSize != nil {
-		opts = append(opts, grpc.MaxRecvMsgSize(*GRPCMaxMessageSize))
-		opts = append(opts, grpc.MaxSendMsgSize(*GRPCMaxMessageSize))
+	if grpcutils.MaxMessageSize != nil {
+		log.Infof("Setting grpc max message size to %d", *grpcutils.MaxMessageSize)
+		opts = append(opts, grpc.MaxRecvMsgSize(*grpcutils.MaxMessageSize))
+		opts = append(opts, grpc.MaxSendMsgSize(*grpcutils.MaxMessageSize))
 	}
 
 	if GRPCMaxConnectionAge != nil {
@@ -146,6 +143,11 @@ func serveGRPC() {
 	}
 
 	// and serve on it
+	// NOTE: Before we call Serve(), all services must have registered themselves
+	//       with "GRPCServer". This is the case because go/vt/servenv/run.go
+	//       runs all OnRun() hooks after createGRPCServer() and before
+	//       serveGRPC(). If this was not the case, the binary would crash with
+	//       the error "grpc: Server.RegisterService after Server.Serve".
 	go GRPCServer.Serve(listener)
 
 	OnTermSync(func() {
@@ -161,12 +163,11 @@ func RegisterGRPCFlags() {
 	GRPCCert = flag.String("grpc_cert", "", "certificate to use, requires grpc_key, enables TLS")
 	GRPCKey = flag.String("grpc_key", "", "key to use, requires grpc_cert, enables TLS")
 	GRPCCA = flag.String("grpc_ca", "", "ca to use, requires TLS, and enforces client cert check")
-	// Note: We're using 4 MiB as default value because that's the default in the
-	// gRPC 1.0.0 Go server.
-	GRPCMaxMessageSize = flag.Int("grpc_max_message_size", 4*1024*1024, "Maximum allowed RPC message size. Larger messages will be rejected by gRPC with the error 'exceeding the max size'.")
 	// Default is effectively infinity, as defined in grpc.
 	GRPCMaxConnectionAge = flag.Duration("grpc_max_connection_age", time.Duration(math.MaxInt64), "Maximum age of a client connection before GoAway is sent.")
 	GRPCMaxConnectionAgeGrace = flag.Duration("grpc_max_connection_age_grace", time.Duration(math.MaxInt64), "Additional grace period after grpc_max_connection_age, after which connections are forcibly closed.")
+
+	grpcutils.RegisterFlags()
 }
 
 // GRPCCheckServiceMap returns if we should register a gRPC service
diff --git a/go/vt/servenv/grpcutils/options.go b/go/vt/servenv/grpcutils/options.go
new file mode 100644
index 00000000000..95ae7644cf8
--- /dev/null
+++ b/go/vt/servenv/grpcutils/options.go
@@ -0,0 +1,35 @@
+/*
+Copyright 2017 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreedto in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package grpcutils
+
+import (
+	"flag"
+)
+
+var (
+	defaultMaxMessageSize = 4 * 1024 * 1024
+	// MaxMessageSize is the maximum message size which the gRPC server will
+	// accept. Larger messages will be rejected.
+	MaxMessageSize = &defaultMaxMessageSize
+)
+
+// RegisterFlags registers the command line flags for common grpc options
+func RegisterFlags() {
+	// Note: We're using 4 MiB as default value because that's the default in the
+	// gRPC 1.0.0 Go server.
+	MaxMessageSize = flag.Int("grpc_max_message_size", defaultMaxMessageSize, "Maximum allowed RPC message size. Larger messages will be rejected by gRPC with the error 'exceeding the max size'.")
+}
diff --git a/go/vt/sqlparser/analyzer.go b/go/vt/sqlparser/analyzer.go
index 99ce713f270..8b7ac5009e6 100644
--- a/go/vt/sqlparser/analyzer.go
+++ b/go/vt/sqlparser/analyzer.go
@@ -19,13 +19,14 @@ package sqlparser
 // analyzer.go contains utility analysis functions.
 
 import (
-	"errors"
 	"fmt"
 	"strconv"
 	"strings"
 	"unicode"
 
 	"github.com/youtube/vitess/go/sqltypes"
+	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
+	"github.com/youtube/vitess/go/vt/vterrors"
 )
 
 // These constants are used to identify the SQL statement type.
@@ -168,7 +169,7 @@ func NewPlanValue(node Expr) (sqltypes.PlanValue, error) {
 		case IntVal:
 			n, err := sqltypes.NewIntegral(string(node.Val))
 			if err != nil {
-				return sqltypes.PlanValue{}, err
+				return sqltypes.PlanValue{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
 			}
 			return sqltypes.PlanValue{Value: n}, nil
 		case StrVal:
@@ -176,7 +177,7 @@ func NewPlanValue(node Expr) (sqltypes.PlanValue, error) {
 		case HexVal:
 			v, err := node.HexDecode()
 			if err != nil {
-				return sqltypes.PlanValue{}, err
+				return sqltypes.PlanValue{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
 			}
 			return sqltypes.PlanValue{Value: sqltypes.MakeTrusted(sqltypes.VarBinary, v)}, nil
 		}
@@ -192,7 +193,7 @@ func NewPlanValue(node Expr) (sqltypes.PlanValue, error) {
 				return sqltypes.PlanValue{}, err
 			}
 			if innerpv.ListKey != "" || innerpv.Values != nil {
-				return sqltypes.PlanValue{}, errors.New("unsupported: nested lists")
+				return sqltypes.PlanValue{}, vterrors.New(vtrpcpb.Code_UNIMPLEMENTED, "unsupported: nested lists")
 			}
 			pv.Values = append(pv.Values, innerpv)
 		}
@@ -200,7 +201,7 @@ func NewPlanValue(node Expr) (sqltypes.PlanValue, error) {
 	case *NullVal:
 		return sqltypes.PlanValue{}, nil
 	}
-	return sqltypes.PlanValue{}, fmt.Errorf("expression is too complex '%v'", String(node))
+	return sqltypes.PlanValue{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "expression is too complex '%v'", String(node))
 }
 
 // StringIn is a convenience function that returns
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
index 7d180512fb8..3a587b65f47 100644
--- a/go/vt/sqlparser/ast.go
+++ b/go/vt/sqlparser/ast.go
@@ -27,6 +27,8 @@ import (
 
 	"github.com/youtube/vitess/go/sqltypes"
 	querypb "github.com/youtube/vitess/go/vt/proto/query"
+	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
+	"github.com/youtube/vitess/go/vt/vterrors"
 )
 
 // Instructions for creating new types: If a type
@@ -53,7 +55,7 @@ func Parse(sql string) (Statement, error) {
 			tokenizer.ParseTree = tokenizer.partialDDL
 			return tokenizer.ParseTree, nil
 		}
-		return nil, errors.New(tokenizer.LastError)
+		return nil, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, tokenizer.LastError)
 	}
 	return tokenizer.ParseTree, nil
 }
@@ -1024,7 +1026,11 @@ type Use struct {
 
 // Format formats the node.
 func (node *Use) Format(buf *TrackedBuffer) {
-	buf.Myprintf("use %v", node.DBName)
+	if node.DBName.v != "" {
+		buf.Myprintf("use %v", node.DBName)
+	} else {
+		buf.Myprintf("use")
+	}
 }
 
 // WalkSubtree walks the nodes of the subtree.
@@ -1766,6 +1772,24 @@ func (node *ExistsExpr) WalkSubtree(visit Visit) error {
 	)
 }
 
+// ExprFromValue converts the given Value into an Expr or returns an error.
+func ExprFromValue(value sqltypes.Value) (Expr, error) {
+	// The type checks here follow the rules defined in sqltypes/types.go.
+	switch {
+	case value.Type() == sqltypes.Null:
+		return &NullVal{}, nil
+	case value.IsIntegral():
+		return NewIntVal(value.ToBytes()), nil
+	case value.IsFloat() || value.Type() == sqltypes.Decimal:
+		return NewFloatVal(value.ToBytes()), nil
+	case value.IsQuoted():
+		return NewStrVal(value.ToBytes()), nil
+	default:
+		// We cannot support sqltypes.Expression, or any other invalid type.
+		return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "cannot convert value %v to AST", value)
+	}
+}
+
 // ValType specifies the type for SQLVal.
 type ValType int
 
diff --git a/go/vt/sqlparser/ast_test.go b/go/vt/sqlparser/ast_test.go
index 993746c4cf4..3df96370a2d 100644
--- a/go/vt/sqlparser/ast_test.go
+++ b/go/vt/sqlparser/ast_test.go
@@ -22,6 +22,8 @@ import (
 	"reflect"
 	"testing"
 	"unsafe"
+
+	"github.com/youtube/vitess/go/sqltypes"
 )
 
 func TestAppend(t *testing.T) {
@@ -199,6 +201,47 @@ func TestIsAggregate(t *testing.T) {
 	}
 }
 
+func TestExprFromValue(t *testing.T) {
+	tcases := []struct {
+		in  sqltypes.Value
+		out SQLNode
+		err string
+	}{{
+		in:  sqltypes.NULL,
+		out: &NullVal{},
+	}, {
+		in:  sqltypes.NewInt64(1),
+		out: NewIntVal([]byte("1")),
+	}, {
+		in:  sqltypes.NewFloat64(1.1),
+		out: NewFloatVal([]byte("1.1")),
+	}, {
+		in:  sqltypes.MakeTrusted(sqltypes.Decimal, []byte("1.1")),
+		out: NewFloatVal([]byte("1.1")),
+	}, {
+		in:  sqltypes.NewVarChar("aa"),
+		out: NewStrVal([]byte("aa")),
+	}, {
+		in:  sqltypes.MakeTrusted(sqltypes.Expression, []byte("rand()")),
+		err: "cannot convert value EXPRESSION(rand()) to AST",
+	}}
+	for _, tcase := range tcases {
+		got, err := ExprFromValue(tcase.in)
+		if tcase.err != "" {
+			if err == nil || err.Error() != tcase.err {
+				t.Errorf("ExprFromValue(%v) err: %v, want %s", tcase.in, err, tcase.err)
+			}
+			continue
+		}
+		if err != nil {
+			t.Error(err)
+		}
+		if got, want := got, tcase.out; !reflect.DeepEqual(got, want) {
+			t.Errorf("ExprFromValue(%v): %v, want %s", tcase.in, got, want)
+		}
+	}
+}
+
 func TestColNameEqual(t *testing.T) {
 	var c1, c2 *ColName
 	if c1.Equal(c2) {
diff --git a/go/vt/sqlparser/comments.go b/go/vt/sqlparser/comments.go
index 21ceaa07212..62ad15e063e 100644
--- a/go/vt/sqlparser/comments.go
+++ b/go/vt/sqlparser/comments.go
@@ -126,7 +126,7 @@ func StripLeadingComments(sql string) string {
 			// Single line comment
 			index := strings.Index(sql, "\n")
 			if index == -1 {
-				return sql
+				return ""
 			}
 			sql = sql[index+1:]
 		}
diff --git a/go/vt/sqlparser/comments_test.go b/go/vt/sqlparser/comments_test.go
index 5835e69ac30..f23c4f99e0c 100644
--- a/go/vt/sqlparser/comments_test.go
+++ b/go/vt/sqlparser/comments_test.go
@@ -143,7 +143,7 @@ bar`,
 		outSQL: "bar",
 	}, {
 		input:  "-- /* foo */ bar",
-		outSQL: "-- /* foo */ bar",
+		outSQL: "",
 	}, {
 		input:  "foo -- bar */",
 		outSQL: "foo -- bar */",
@@ -157,7 +157,7 @@ a`,
 		outSQL: "a",
 	}, {
 		input:  `-- foo bar`,
-		outSQL: "-- foo bar",
+		outSQL: "",
 	}}
 	for _, testCase := range testCases {
 		gotSQL := StripLeadingComments(testCase.input)
diff --git a/go/vt/sqlparser/normalizer.go b/go/vt/sqlparser/normalizer.go
index 5ec2bbc1228..7daf8ca35ad 100644
--- a/go/vt/sqlparser/normalizer.go
+++ b/go/vt/sqlparser/normalizer.go
@@ -28,78 +28,150 @@ import (
 // updates the bind vars to those values. The supplied prefix
 // is used to generate the bind var names. The function ensures
 // that there are no collisions with existing bind vars.
+// Within Select constructs, bind vars are deduped. This allows
+// us to identify vindex equality. Otherwise, every value is
+// treated as distinct.
 func Normalize(stmt Statement, bindVars map[string]*querypb.BindVariable, prefix string) {
-	reserved := GetBindvars(stmt)
-	// vals allows us to reuse bindvars for
-	// identical values.
-	counter := 1
-	vals := make(map[string]string)
-	_ = Walk(func(node SQLNode) (kontinue bool, err error) {
-		switch node := node.(type) {
-		case *SQLVal:
-			// Make the bindvar
-			bval := sqlToBindvar(node)
-			if bval == nil {
-				// If unsuccessful continue.
-				return true, nil
-			}
-			// Check if there's a bindvar for that value already.
-			var key string
-			if bval.Type == sqltypes.VarBinary {
-				// Prefixing strings with "'" ensures that a string
-				// and number that have the same representation don't
-				// collide.
-				key = "'" + string(node.Val)
-			} else {
-				key = string(node.Val)
-			}
-			bvname, ok := vals[key]
-			if !ok {
-				// If there's no such bindvar, make a new one.
-				bvname, counter = newName(prefix, counter, reserved)
-				vals[key] = bvname
-				bindVars[bvname] = bval
-			}
-			// Modify the AST node to a bindvar.
-			node.Type = ValArg
-			node.Val = append([]byte(":"), bvname...)
-		case *ComparisonExpr:
-			switch node.Operator {
-			case InStr, NotInStr:
-			default:
-				return true, nil
-			}
-			// It's either IN or NOT IN.
-			tupleVals, ok := node.Right.(ValTuple)
-			if !ok {
-				return true, nil
-			}
-			// The RHS is a tuple of values.
-			// Make a list bindvar.
-			bvals := &querypb.BindVariable{
-				Type: querypb.Type_TUPLE,
-			}
-			for _, val := range tupleVals {
-				bval := sqlToBindvar(val)
-				if bval == nil {
-					return true, nil
-				}
-				bvals.Values = append(bvals.Values, &querypb.Value{
-					Type:  bval.Type,
-					Value: bval.Value,
-				})
-			}
-			var bvname string
-			bvname, counter = newName(prefix, counter, reserved)
-			bindVars[bvname] = bvals
-			// Modify RHS to be a list bindvar.
-			node.Right = ListArg(append([]byte("::"), bvname...))
+	nz := newNormalizer(stmt, bindVars, prefix)
+	_ = Walk(nz.WalkStatement, stmt)
+}
+
+type normalizer struct {
+	stmt     Statement
+	bindVars map[string]*querypb.BindVariable
+	prefix   string
+	reserved map[string]struct{}
+	counter  int
+	vals     map[string]string
+}
+
+func newNormalizer(stmt Statement, bindVars map[string]*querypb.BindVariable, prefix string) *normalizer {
+	return &normalizer{
+		stmt:     stmt,
+		bindVars: bindVars,
+		prefix:   prefix,
+		reserved: GetBindvars(stmt),
+		counter:  1,
+		vals:     make(map[string]string),
+	}
+}
+
+// WalkStatement is the top level walk function.
+// If it encounters a Select, it switches to a mode
+// where variables are deduped.
+func (nz *normalizer) WalkStatement(node SQLNode) (bool, error) {
+	switch node := node.(type) {
+	case *Select:
+		_ = Walk(nz.WalkSelect, node)
+		// Don't continue
+		return false, nil
+	case *SQLVal:
+		nz.convertSQLVal(node)
+	case *ComparisonExpr:
+		nz.convertComparison(node)
+	}
+	return true, nil
+}
+
+// WalkSelect normalizes the AST in Select mode.
+func (nz *normalizer) WalkSelect(node SQLNode) (bool, error) {
+	switch node := node.(type) {
+	case *SQLVal:
+		nz.convertSQLValDedup(node)
+	case *ComparisonExpr:
+		nz.convertComparison(node)
+	}
+	return true, nil
+}
+
+func (nz *normalizer) convertSQLValDedup(node *SQLVal) {
+	// If value is too long, don't dedup.
+	// Such values are most likely not for vindexes.
+	// We save a lot of CPU because we avoid building
+	// the key for them.
+	if len(node.Val) > 256 {
+		nz.convertSQLVal(node)
+		return
+	}
+
+	// Make the bindvar
+	bval := nz.sqlToBindvar(node)
+	if bval == nil {
+		return
+	}
+
+	// Check if there's a bindvar for that value already.
+	var key string
+	if bval.Type == sqltypes.VarBinary {
+		// Prefixing strings with "'" ensures that a string
+		// and number that have the same representation don't
+		// collide.
+		key = "'" + string(node.Val)
+	} else {
+		key = string(node.Val)
+	}
+	bvname, ok := nz.vals[key]
+	if !ok {
+		// If there's no such bindvar, make a new one.
+		bvname = nz.newName()
+		nz.vals[key] = bvname
+		nz.bindVars[bvname] = bval
+	}
+
+	// Modify the AST node to a bindvar.
+	node.Type = ValArg
+	node.Val = append([]byte(":"), bvname...)
+}
+
+// convertSQLVal converts an SQLVal without the dedup.
+func (nz *normalizer) convertSQLVal(node *SQLVal) {
+	bval := nz.sqlToBindvar(node)
+	if bval == nil {
+		return
+	}
+
+	bvname := nz.newName()
+	nz.bindVars[bvname] = bval
+
+	node.Type = ValArg
+	node.Val = append([]byte(":"), bvname...)
+}
+
+// convertComparison attempts to convert IN clauses to
+// use the list bind var construct. If it fails, it returns
+// with no change made. The walk function will then continue
+// and iterate on converting each individual value into separate
+// bind vars.
+func (nz *normalizer) convertComparison(node *ComparisonExpr) {
+	if node.Operator != InStr && node.Operator != NotInStr {
+		return
+	}
+	tupleVals, ok := node.Right.(ValTuple)
+	if !ok {
+		return
+	}
+	// The RHS is a tuple of values.
+	// Make a list bindvar.
+	bvals := &querypb.BindVariable{
+		Type: querypb.Type_TUPLE,
+	}
+	for _, val := range tupleVals {
+		bval := nz.sqlToBindvar(val)
+		if bval == nil {
+			return
 		}
-		return true, nil
-	}, stmt)
+		bvals.Values = append(bvals.Values, &querypb.Value{
+			Type:  bval.Type,
+			Value: bval.Value,
+		})
+	}
+	bvname := nz.newName()
+	nz.bindVars[bvname] = bvals
+	// Modify RHS to be a list bindvar.
+	node.Right = ListArg(append([]byte("::"), bvname...))
 }
 
-func sqlToBindvar(node SQLNode) *querypb.BindVariable {
+func (nz *normalizer) sqlToBindvar(node SQLNode) *querypb.BindVariable {
 	if node, ok := node.(*SQLVal); ok {
 		var v sqltypes.Value
 		var err error
@@ -121,14 +193,14 @@ func sqlToBindvar(node SQLNode) *querypb.BindVariable {
 	return nil
 }
 
-func newName(prefix string, counter int, reserved map[string]struct{}) (string, int) {
+func (nz *normalizer) newName() string {
 	for {
-		newName := fmt.Sprintf("%s%d", prefix, counter)
-		if _, ok := reserved[newName]; !ok {
-			reserved[newName] = struct{}{}
-			return newName, counter + 1
+		newName := fmt.Sprintf("%s%d", nz.prefix, nz.counter)
+		if _, ok := nz.reserved[newName]; !ok {
+			nz.reserved[newName] = struct{}{}
+			return newName
 		}
-		counter++
+		nz.counter++
 	}
 }
 
diff --git a/go/vt/sqlparser/normalizer_test.go b/go/vt/sqlparser/normalizer_test.go
index 07b68168ebd..9f6742c61e0 100644
--- a/go/vt/sqlparser/normalizer_test.go
+++ b/go/vt/sqlparser/normalizer_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package sqlparser
 
 import (
+	"fmt"
 	"reflect"
 	"testing"
 
@@ -81,6 +82,56 @@ func TestNormalize(t *testing.T) {
 			"bv1": sqltypes.Int64BindVariable(1),
 			"bv2": sqltypes.BytesBindVariable([]byte("1")),
 		},
+	}, {
+		// val should not be reused for non-select statements
+		in:      "insert into a values(1, 1)",
+		outstmt: "insert into a values (:bv1, :bv2)",
+		outbv: map[string]*querypb.BindVariable{
+			"bv1": sqltypes.Int64BindVariable(1),
+			"bv2": sqltypes.Int64BindVariable(1),
+		},
+	}, {
+		// val should be reused only in subqueries of DMLs
+		in:      "update a set v1=(select 5 from t), v2=5, v3=(select 5 from t), v4=5",
+		outstmt: "update a set v1 = (select :bv1 from t), v2 = :bv2, v3 = (select :bv1 from t), v4 = :bv3",
+		outbv: map[string]*querypb.BindVariable{
+			"bv1": sqltypes.Int64BindVariable(5),
+			"bv2": sqltypes.Int64BindVariable(5),
+			"bv3": sqltypes.Int64BindVariable(5),
+		},
+	}, {
+		// list vars should work for DMLs also
+		in:      "update a set v1=5 where v2 in (1, 4, 5)",
+		outstmt: "update a set v1 = :bv1 where v2 in ::bv2",
+		outbv: map[string]*querypb.BindVariable{
+			"bv1": sqltypes.Int64BindVariable(5),
+			"bv2": sqltypes.TestBindVariable([]interface{}{1, 4, 5}),
+		},
+	}, {
+		// Hex value does not convert
+		in:      "select * from t where v1 = 0x1234",
+		outstmt: "select * from t where v1 = 0x1234",
+		outbv:   map[string]*querypb.BindVariable{},
+	}, {
+		// Hex value does not convert for DMLs
+		in:      "update a set v1 = 0x1234",
+		outstmt: "update a set v1 = 0x1234",
+		outbv:   map[string]*querypb.BindVariable{},
+	}, {
+		// Values up to len 256 will reuse.
+		in:      fmt.Sprintf("select * from t where v1 = '%256s' and v2 = '%256s'", "a", "a"),
+		outstmt: "select * from t where v1 = :bv1 and v2 = :bv1",
+		outbv: map[string]*querypb.BindVariable{
+			"bv1": sqltypes.BytesBindVariable([]byte(fmt.Sprintf("%256s", "a"))),
+		},
+	}, {
+		// Values greater than len 256 will not reuse.
+		in:      fmt.Sprintf("select * from t where v1 = '%257s' and v2 = '%257s'", "b", "b"),
+		outstmt: "select * from t where v1 = :bv1 and v2 = :bv2",
+		outbv: map[string]*querypb.BindVariable{
+			"bv1": sqltypes.BytesBindVariable([]byte(fmt.Sprintf("%257s", "b"))),
+			"bv2": sqltypes.BytesBindVariable([]byte(fmt.Sprintf("%257s", "b"))),
+		},
 	}, {
 		// bad int
 		in:      "select * from t where v1 = 12345678901234567890",
diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
index f2648ec1f7c..c5ccf1faad9 100644
--- a/go/vt/sqlparser/parse_test.go
+++ b/go/vt/sqlparser/parse_test.go
@@ -637,6 +637,12 @@ func TestValid(t *testing.T) {
 	}, {
 		input:  "set character set utf8",
 		output: "set ",
+	}, {
+		input:  "set character set 'utf8'",
+		output: "set ",
+	}, {
+		input:  "set character set \"utf8\"",
+		output: "set ",
 	}, {
 		input:  "set charset default",
 		output: "set ",
diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go
index 0e505eece6b..47581a3cd7e 100644
--- a/go/vt/sqlparser/sql.go
+++ b/go/vt/sqlparser/sql.go
@@ -1,9 +1,9 @@
-//line sql.y:18
+//line ./go/vt/sqlparser/sql.y:18
 package sqlparser
 
 import __yyfmt__ "fmt"
 
-//line sql.y:18
+//line ./go/vt/sqlparser/sql.y:18
 func setParseTree(yylex interface{}, stmt Statement) {
 	yylex.(*Tokenizer).ParseTree = stmt
 }
@@ -32,7 +32,7 @@ func forceEOF(yylex interface{}) {
 	yylex.(*Tokenizer).ForceEOF = true
 }
 
-//line sql.y:50
+//line ./go/vt/sqlparser/sql.y:50
 type yySymType struct {
 	yys               int
 	empty             struct{}
@@ -491,503 +491,491 @@ var yyExca = [...]int{
 	5, 21,
 	-2, 4,
 	-1, 263,
-	77, 550,
-	105, 550,
+	77, 552,
+	105, 552,
 	-2, 38,
 	-1, 265,
-	77, 572,
-	105, 572,
+	77, 574,
+	105, 574,
 	-2, 40,
 	-1, 270,
-	105, 451,
-	-2, 447,
+	105, 453,
+	-2, 449,
 	-1, 271,
-	105, 452,
-	-2, 448,
-	-1, 539,
-	5, 21,
-	-2, 398,
-	-1, 576,
 	105, 454,
 	-2, 450,
-	-1, 729,
+	-1, 541,
+	5, 21,
+	-2, 400,
+	-1, 578,
+	105, 456,
+	-2, 452,
+	-1, 731,
 	5, 22,
-	-2, 276,
-	-1, 820,
+	-2, 278,
+	-1, 822,
 	5, 22,
-	-2, 399,
-	-1, 892,
-	5, 21,
 	-2, 401,
-	-1, 959,
+	-1, 894,
+	5, 21,
+	-2, 403,
+	-1, 961,
 	5, 22,
-	-2, 402,
+	-2, 404,
 }
 
-const yyNprod = 611
 const yyPrivate = 57344
 
-var yyTokenNames []string
-var yyStates []string
-
-const yyLast = 7223
+const yyLast = 7320
 
 var yyAct = [...]int{
 
-	328, 37, 964, 289, 498, 835, 327, 897, 717, 302,
-	262, 615, 602, 567, 718, 235, 869, 790, 376, 437,
-	43, 681, 674, 377, 3, 575, 579, 782, 753, 578,
-	714, 698, 684, 291, 271, 651, 588, 300, 37, 350,
-	365, 273, 250, 42, 356, 380, 240, 683, 266, 244,
-	251, 255, 611, 991, 392, 47, 596, 982, 631, 62,
-	988, 234, 267, 977, 135, 227, 986, 981, 976, 249,
-	882, 929, 629, 277, 439, 49, 50, 51, 52, 228,
-	749, 595, 839, 951, 134, 227, 227, 603, 924, 922,
-	985, 227, 983, 965, 304, 773, 283, 635, 906, 590,
-	18, 38, 20, 21, 619, 388, 628, 284, 279, 560,
-	562, 126, 229, 230, 231, 232, 233, 125, 31, 126,
-	870, 445, 440, 22, 732, 274, 731, 297, 967, 465,
-	464, 474, 475, 467, 468, 469, 470, 471, 472, 473,
-	466, 30, 872, 476, 40, 254, 387, 128, 129, 130,
-	510, 730, 770, 625, 630, 623, 590, 275, 772, 280,
-	227, 799, 227, 874, 131, 878, 227, 873, 127, 871,
-	488, 489, 936, 914, 876, 633, 636, 453, 452, 561,
-	823, 794, 743, 875, 736, 603, 589, 497, 877, 879,
-	907, 587, 905, 586, 454, 396, 384, 466, 754, 627,
-	476, 476, 24, 25, 27, 26, 28, 848, 451, 454,
-	658, 395, 288, 626, 884, 389, 29, 32, 33, 975,
-	452, 34, 35, 36, 656, 657, 655, 286, 699, 290,
-	800, 699, 442, 806, 747, 632, 454, 644, 646, 647,
-	968, 37, 645, 589, 943, 771, 634, 769, 467, 468,
-	469, 470, 471, 472, 473, 466, 378, 849, 476, 352,
-	358, 453, 452, 910, 353, 465, 464, 474, 475, 467,
-	468, 469, 470, 471, 472, 473, 466, 438, 454, 476,
-	909, 962, 438, 227, 39, 453, 452, 762, 40, 592,
-	227, 227, 886, 227, 593, 761, 62, 354, 654, 485,
-	487, 444, 454, 325, 469, 470, 471, 472, 473, 466,
-	750, 62, 476, 227, 954, 227, 62, 908, 227, 456,
-	760, 227, 775, 776, 777, 675, 496, 676, 60, 500,
-	501, 502, 503, 504, 505, 506, 390, 509, 511, 511,
-	511, 511, 511, 511, 511, 511, 519, 520, 521, 522,
-	254, 972, 290, 455, 938, 290, 268, 528, 902, 901,
-	540, 788, 290, 290, 255, 255, 255, 255, 527, 453,
-	452, 847, 267, 542, 854, 853, 851, 850, 947, 378,
-	556, 557, 837, 539, 525, 526, 454, 255, 822, 290,
-	62, 744, 689, 290, 486, 227, 677, 436, 227, 227,
-	227, 227, 558, 267, 529, 569, 543, 285, 545, 227,
-	564, 363, 290, 227, 554, 544, 227, 546, 274, 227,
-	946, 227, 227, 604, 605, 606, 844, 563, 453, 452,
-	398, 397, 62, 490, 491, 492, 493, 494, 495, 566,
-	583, 815, 572, 18, 715, 454, 393, 617, 689, 393,
-	438, 576, 362, 801, 818, 363, 852, 568, 254, 254,
-	254, 254, 598, 599, 600, 601, 652, 788, 891, 639,
-	571, 574, 580, 254, 363, 227, 737, 608, 609, 610,
-	227, 254, 788, 227, 62, 613, 614, 40, 37, 512,
-	513, 514, 515, 516, 517, 518, 44, 363, 568, 453,
-	452, 500, 690, 686, 464, 474, 475, 467, 468, 469,
-	470, 471, 472, 473, 466, 701, 454, 476, 523, 840,
-	841, 842, 18, 40, 558, 597, 678, 679, 843, 241,
-	62, 616, 18, 788, 740, 612, 607, 124, 393, 720,
-	54, 37, 703, 763, 62, 719, 725, 267, 716, 691,
-	692, 696, 576, 695, 653, 537, 724, 538, 715, 448,
-	16, 707, 729, 706, 721, 391, 40, 702, 535, 704,
-	705, 728, 688, 40, 551, 62, 40, 727, 548, 552,
-	391, 547, 713, 735, 984, 391, 650, 248, 733, 659,
-	660, 661, 662, 663, 664, 665, 666, 667, 668, 669,
-	670, 671, 672, 673, 549, 738, 239, 245, 246, 550,
-	980, 751, 752, 62, 774, 979, 367, 370, 371, 372,
-	368, 438, 369, 373, 742, 640, 726, 316, 315, 318,
-	319, 320, 321, 756, 757, 758, 317, 322, 357, 553,
-	765, 371, 372, 367, 370, 371, 372, 368, 860, 369,
-	373, 355, 712, 580, 62, 62, 711, 755, 394, 531,
-	746, 945, 652, 944, 889, 741, 268, 816, 465, 464,
-	474, 475, 467, 468, 469, 470, 471, 472, 473, 466,
-	292, 785, 476, 912, 375, 786, 621, 447, 357, 795,
-	710, 778, 293, 242, 243, 797, 798, 268, 709, 802,
-	391, 391, 766, 236, 808, 957, 809, 810, 811, 812,
-	474, 475, 467, 468, 469, 470, 471, 472, 473, 466,
-	237, 62, 476, 44, 819, 820, 821, 956, 932, 805,
-	787, 827, 828, 829, 568, 933, 450, 46, 48, 386,
-	294, 351, 41, 227, 803, 824, 1, 817, 624, 830,
-	653, 963, 834, 391, 465, 464, 474, 475, 467, 468,
-	469, 470, 471, 472, 473, 466, 833, 832, 476, 585,
-	577, 62, 62, 272, 62, 62, 53, 584, 759, 904,
-	845, 846, 838, 591, 779, 780, 781, 748, 594, 942,
-	745, 863, 783, 401, 402, 400, 404, 403, 227, 680,
-	457, 391, 227, 399, 132, 374, 379, 859, 62, 865,
-	789, 831, 580, 700, 580, 618, 255, 868, 881, 720,
-	867, 864, 893, 880, 883, 719, 62, 55, 887, 768,
-	767, 622, 499, 890, 888, 278, 899, 900, 484, 508,
-	896, 268, 708, 261, 723, 892, 722, 524, 857, 576,
-	227, 349, 955, 931, 804, 507, 438, 62, 62, 738,
-	697, 303, 62, 62, 62, 643, 314, 62, 311, 688,
-	313, 312, 915, 916, 530, 911, 536, 458, 301, 295,
-	559, 253, 391, 927, 925, 926, 920, 359, 366, 326,
-	62, 364, 720, 903, 37, 259, 252, 814, 719, 573,
-	934, 937, 928, 939, 940, 966, 534, 580, 941, 19,
-	254, 861, 862, 948, 45, 247, 15, 935, 14, 13,
-	225, 12, 23, 764, 391, 11, 256, 917, 918, 10,
-	919, 950, 953, 921, 9, 923, 8, 62, 7, 959,
-	257, 257, 269, 267, 958, 6, 257, 5, 4, 62,
-	238, 17, 2, 0, 0, 0, 641, 642, 0, 648,
-	649, 0, 970, 0, 0, 0, 0, 971, 0, 0,
-	974, 62, 0, 62, 0, 978, 0, 0, 260, 0,
-	0, 0, 0, 276, 0, 0, 987, 0, 913, 831,
-	792, 0, 0, 992, 993, 0, 0, 0, 0, 0,
-	62, 0, 0, 0, 499, 0, 0, 693, 694, 0,
-	0, 0, 0, 0, 0, 257, 0, 257, 0, 0,
-	0, 257, 0, 0, 0, 0, 0, 351, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 784,
-	391, 391, 0, 391, 836, 0, 0, 0, 0, 0,
-	0, 0, 281, 0, 282, 952, 0, 0, 287, 465,
-	464, 474, 475, 467, 468, 469, 470, 471, 472, 473,
-	466, 0, 734, 476, 0, 0, 0, 858, 465, 464,
-	474, 475, 467, 468, 469, 470, 471, 472, 473, 466,
-	0, 0, 476, 0, 0, 792, 0, 0, 391, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 989, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 894, 895, 0, 0,
-	0, 898, 898, 898, 0, 0, 391, 0, 257, 0,
-	0, 0, 0, 0, 0, 257, 382, 0, 257, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 391,
-	0, 0, 0, 0, 0, 0, 0, 0, 257, 0,
-	257, 0, 0, 257, 0, 361, 257, 0, 0, 0,
-	0, 0, 0, 0, 0, 385, 0, 0, 0, 0,
-	0, 0, 0, 796, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 807, 0, 441, 836, 443, 0, 0,
-	446, 0, 0, 449, 0, 0, 0, 0, 391, 0,
-	0, 0, 0, 0, 499, 0, 0, 0, 0, 825,
-	826, 0, 0, 0, 0, 0, 0, 268, 0, 0,
-	960, 0, 961, 0, 0, 0, 0, 0, 0, 0,
-	257, 0, 269, 257, 257, 257, 257, 0, 0, 0,
-	0, 0, 0, 0, 555, 0, 0, 0, 257, 973,
-	0, 382, 0, 0, 565, 0, 257, 257, 0, 0,
-	0, 0, 0, 269, 0, 0, 565, 541, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	885, 0, 0, 0, 570, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	257, 0, 0, 0, 0, 257, 0, 0, 257, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 95, 0, 0, 0, 0, 0, 620, 0, 0,
-	76, 0, 637, 0, 0, 638, 84, 0, 0, 103,
-	91, 0, 0, 0, 0, 0, 687, 565, 0, 0,
-	930, 687, 687, 0, 0, 687, 0, 61, 0, 0,
-	0, 0, 0, 0, 0, 0, 71, 0, 0, 687,
-	687, 687, 687, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 687, 0, 0, 269, 0, 0,
-	0, 0, 465, 464, 474, 475, 467, 468, 469, 470,
-	471, 472, 473, 466, 0, 0, 476, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 224,
-	969, 499, 0, 0, 0, 98, 0, 0, 0, 72,
-	0, 102, 96, 113, 0, 97, 101, 85, 107, 65,
-	111, 105, 89, 80, 81, 64, 0, 100, 75, 79,
-	74, 94, 108, 109, 73, 122, 68, 117, 67, 69,
-	116, 93, 106, 112, 90, 87, 66, 110, 88, 86,
-	82, 77, 0, 0, 0, 104, 114, 123, 0, 0,
-	118, 119, 120, 92, 70, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	63, 0, 83, 121, 99, 78, 115, 407, 0, 0,
+	328, 37, 966, 289, 500, 837, 327, 719, 899, 302,
+	262, 604, 617, 439, 720, 235, 376, 676, 871, 394,
+	581, 792, 577, 377, 3, 683, 686, 784, 580, 716,
+	685, 569, 700, 755, 271, 653, 350, 43, 37, 590,
+	613, 291, 228, 266, 441, 273, 240, 251, 356, 134,
+	47, 255, 42, 380, 993, 244, 984, 990, 979, 62,
+	988, 234, 267, 365, 135, 227, 983, 249, 300, 884,
+	49, 50, 51, 52, 250, 229, 230, 231, 232, 233,
+	931, 277, 978, 633, 598, 227, 227, 751, 597, 841,
+	953, 227, 605, 926, 304, 924, 987, 631, 969, 467,
+	466, 476, 477, 469, 470, 471, 472, 473, 474, 475,
+	468, 985, 967, 478, 18, 38, 20, 21, 872, 775,
+	592, 297, 637, 621, 283, 284, 801, 562, 564, 908,
+	388, 630, 31, 772, 279, 126, 125, 22, 126, 774,
+	874, 447, 455, 454, 442, 254, 274, 128, 129, 130,
+	490, 491, 734, 733, 732, 30, 275, 512, 40, 456,
+	227, 876, 227, 880, 280, 875, 227, 873, 131, 127,
+	938, 387, 878, 916, 325, 288, 592, 825, 627, 632,
+	625, 877, 796, 738, 499, 453, 879, 881, 398, 384,
+	468, 756, 605, 478, 478, 802, 397, 563, 456, 60,
+	635, 638, 745, 886, 701, 455, 454, 591, 444, 850,
+	970, 749, 589, 454, 588, 803, 24, 25, 27, 26,
+	28, 909, 456, 907, 629, 945, 773, 268, 771, 456,
+	29, 32, 33, 977, 594, 34, 35, 36, 628, 595,
+	389, 37, 358, 467, 466, 476, 477, 469, 470, 471,
+	472, 473, 474, 475, 468, 286, 378, 478, 912, 851,
+	634, 455, 454, 591, 353, 471, 472, 473, 474, 475,
+	468, 636, 660, 478, 40, 911, 352, 440, 456, 764,
+	964, 785, 440, 227, 656, 763, 658, 659, 657, 752,
+	227, 227, 354, 227, 956, 446, 62, 910, 39, 487,
+	489, 762, 849, 455, 454, 701, 391, 808, 527, 528,
+	888, 62, 677, 227, 678, 227, 62, 839, 227, 746,
+	456, 227, 974, 290, 458, 679, 498, 940, 290, 502,
+	503, 504, 505, 506, 507, 508, 438, 511, 513, 513,
+	513, 513, 513, 513, 513, 513, 521, 522, 523, 524,
+	254, 285, 455, 454, 646, 648, 649, 530, 457, 647,
+	542, 777, 778, 779, 255, 255, 255, 255, 529, 456,
+	904, 903, 267, 544, 455, 454, 842, 843, 844, 378,
+	558, 559, 274, 541, 290, 845, 949, 255, 790, 290,
+	62, 456, 856, 855, 488, 227, 853, 852, 227, 227,
+	227, 227, 560, 571, 568, 267, 948, 566, 846, 227,
+	531, 691, 546, 227, 548, 717, 227, 395, 578, 227,
+	18, 227, 227, 395, 606, 607, 608, 492, 493, 494,
+	495, 496, 497, 573, 62, 565, 393, 556, 545, 574,
+	547, 824, 290, 576, 582, 893, 585, 691, 290, 820,
+	619, 393, 440, 363, 290, 363, 393, 362, 254, 254,
+	254, 254, 400, 399, 40, 641, 18, 854, 654, 44,
+	790, 817, 18, 254, 570, 615, 616, 227, 570, 363,
+	739, 254, 227, 525, 40, 227, 62, 599, 618, 539,
+	37, 540, 600, 601, 602, 603, 514, 515, 516, 517,
+	518, 519, 520, 502, 692, 765, 790, 610, 611, 612,
+	40, 256, 790, 727, 363, 742, 40, 703, 395, 578,
+	614, 367, 370, 371, 372, 368, 560, 369, 373, 609,
+	533, 728, 62, 54, 693, 694, 241, 268, 697, 717,
+	450, 722, 537, 37, 690, 730, 62, 721, 705, 267,
+	718, 729, 704, 550, 706, 707, 655, 698, 16, 680,
+	681, 124, 708, 260, 731, 549, 723, 715, 276, 986,
+	268, 709, 982, 393, 393, 981, 726, 62, 553, 551,
+	40, 776, 652, 554, 552, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	688, 740, 642, 737, 239, 245, 246, 735, 290, 357,
+	714, 248, 753, 754, 555, 62, 371, 372, 713, 292,
+	757, 396, 355, 440, 748, 582, 393, 947, 818, 744,
+	946, 293, 891, 743, 914, 623, 767, 281, 449, 282,
+	758, 759, 760, 287, 467, 466, 476, 477, 469, 470,
+	471, 472, 473, 474, 475, 468, 62, 62, 478, 367,
+	370, 371, 372, 368, 654, 369, 373, 768, 375, 242,
+	243, 357, 682, 236, 393, 469, 470, 471, 472, 473,
+	474, 475, 468, 787, 712, 478, 702, 788, 959, 958,
+	237, 797, 711, 780, 44, 935, 934, 799, 800, 570,
+	452, 804, 46, 48, 386, 41, 810, 1, 811, 812,
+	813, 814, 626, 965, 268, 789, 836, 725, 587, 579,
+	272, 53, 586, 62, 761, 906, 821, 822, 823, 805,
+	840, 593, 807, 829, 830, 831, 750, 316, 315, 318,
+	319, 320, 321, 596, 944, 227, 317, 322, 819, 747,
+	403, 832, 655, 404, 402, 393, 406, 405, 401, 132,
+	361, 374, 835, 379, 826, 390, 791, 620, 834, 55,
+	385, 770, 769, 62, 62, 624, 62, 62, 278, 486,
+	781, 782, 783, 833, 582, 710, 582, 847, 848, 261,
+	443, 724, 445, 865, 526, 448, 766, 393, 451, 349,
+	227, 957, 933, 806, 227, 509, 699, 303, 645, 861,
+	62, 314, 311, 859, 313, 867, 578, 866, 255, 869,
+	882, 722, 883, 870, 895, 312, 532, 721, 62, 538,
+	460, 301, 295, 561, 890, 892, 253, 294, 351, 901,
+	902, 690, 898, 885, 359, 366, 364, 894, 889, 259,
+	252, 816, 227, 930, 968, 740, 536, 19, 440, 62,
+	62, 45, 247, 794, 62, 62, 62, 15, 14, 62,
+	13, 913, 543, 12, 917, 918, 23, 11, 10, 582,
+	9, 8, 7, 6, 5, 929, 927, 928, 4, 922,
+	238, 326, 62, 17, 722, 2, 37, 459, 0, 572,
+	721, 936, 0, 939, 0, 941, 942, 863, 864, 0,
+	943, 0, 254, 393, 393, 950, 393, 838, 0, 937,
+	0, 0, 225, 905, 0, 0, 0, 0, 0, 501,
+	0, 0, 952, 0, 955, 0, 510, 0, 0, 62,
+	0, 961, 257, 257, 269, 267, 960, 0, 257, 0,
+	860, 62, 0, 0, 622, 0, 0, 919, 920, 639,
+	921, 833, 640, 923, 972, 925, 0, 0, 794, 973,
+	0, 393, 976, 62, 0, 62, 0, 980, 0, 0,
+	0, 0, 0, 0, 915, 0, 0, 0, 989, 0,
+	0, 0, 0, 0, 0, 994, 995, 0, 575, 896,
+	897, 0, 62, 0, 900, 900, 900, 0, 0, 393,
+	0, 0, 0, 862, 0, 0, 0, 257, 0, 257,
+	0, 0, 0, 257, 0, 0, 0, 0, 0, 0,
+	0, 0, 393, 467, 466, 476, 477, 469, 470, 471,
+	472, 473, 474, 475, 468, 0, 786, 478, 0, 0,
+	0, 954, 0, 0, 0, 643, 644, 0, 650, 651,
+	0, 0, 0, 0, 0, 0, 467, 466, 476, 477,
+	469, 470, 471, 472, 473, 474, 475, 468, 0, 838,
+	478, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 393, 466, 476, 477, 469, 470, 471, 472, 473,
+	474, 475, 468, 501, 0, 478, 695, 696, 0, 0,
+	268, 991, 0, 962, 0, 963, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 351, 467, 466, 476,
+	477, 469, 470, 471, 472, 473, 474, 475, 468, 0,
+	257, 478, 975, 0, 0, 0, 0, 257, 382, 0,
+	257, 409, 476, 477, 469, 470, 471, 472, 473, 474,
+	475, 468, 0, 0, 478, 0, 0, 0, 0, 0,
+	257, 736, 257, 421, 0, 257, 0, 0, 257, 0,
+	0, 0, 0, 426, 427, 428, 429, 430, 431, 432,
+	0, 433, 434, 435, 436, 437, 422, 423, 424, 425,
+	407, 408, 0, 0, 410, 0, 411, 412, 413, 414,
+	415, 416, 417, 418, 419, 420, 462, 0, 465, 0,
+	0, 0, 815, 0, 479, 480, 481, 482, 483, 484,
+	485, 0, 463, 464, 461, 467, 466, 476, 477, 469,
+	470, 471, 472, 473, 474, 475, 468, 0, 0, 478,
+	0, 0, 257, 0, 269, 257, 257, 257, 257, 0,
+	0, 0, 0, 0, 0, 0, 557, 0, 0, 0,
+	257, 0, 0, 382, 0, 0, 567, 857, 257, 257,
+	0, 858, 0, 0, 0, 0, 0, 269, 0, 0,
+	567, 0, 798, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 809, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 419,
-	0, 0, 687, 0, 0, 0, 0, 0, 0, 424,
-	425, 426, 427, 428, 429, 430, 687, 431, 432, 433,
-	434, 435, 420, 421, 422, 423, 405, 406, 257, 0,
-	408, 0, 409, 410, 411, 412, 413, 414, 415, 416,
-	417, 418, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 501, 0, 0, 0, 0, 827, 828,
+	0, 0, 0, 0, 257, 0, 0, 0, 0, 257,
+	0, 0, 257, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 813, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 257, 0, 0, 0, 257, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 687, 0,
-	0, 0, 0, 0, 565, 687, 0, 0, 0, 0,
-	855, 0, 0, 0, 856, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 257, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 213, 203, 176, 215,
-	154, 168, 223, 169, 170, 197, 142, 184, 95, 166,
-	0, 157, 137, 163, 138, 155, 178, 76, 181, 153,
-	205, 187, 221, 84, 192, 0, 103, 91, 0, 0,
-	180, 207, 182, 202, 175, 198, 147, 191, 216, 167,
-	195, 0, 0, 0, 61, 0, 581, 582, 0, 0,
-	0, 0, 0, 71, 0, 194, 212, 165, 196, 136,
-	193, 0, 140, 143, 222, 210, 160, 161, 739, 0,
-	0, 0, 0, 0, 0, 179, 183, 199, 173, 0,
-	0, 0, 0, 0, 0, 0, 0, 158, 0, 190,
-	0, 0, 0, 144, 141, 177, 0, 0, 0, 146,
-	0, 159, 200, 269, 208, 174, 224, 211, 172, 171,
-	214, 217, 98, 206, 156, 164, 72, 162, 102, 96,
-	113, 189, 97, 101, 85, 107, 65, 111, 105, 89,
-	80, 81, 64, 0, 100, 75, 79, 74, 94, 108,
-	109, 73, 122, 68, 117, 67, 69, 116, 93, 106,
-	112, 90, 87, 66, 110, 88, 86, 82, 77, 0,
-	139, 0, 104, 114, 123, 152, 209, 118, 119, 120,
-	92, 70, 150, 151, 148, 149, 185, 186, 218, 219,
-	220, 201, 145, 0, 0, 204, 188, 63, 0, 83,
-	121, 99, 78, 115, 213, 203, 176, 215, 154, 168,
-	223, 169, 170, 197, 142, 184, 95, 166, 0, 157,
-	137, 163, 138, 155, 178, 76, 181, 153, 205, 187,
-	221, 84, 192, 0, 103, 91, 0, 0, 180, 207,
-	182, 202, 175, 198, 147, 191, 216, 167, 195, 0,
-	0, 0, 61, 0, 581, 582, 0, 0, 0, 0,
-	0, 71, 0, 194, 212, 165, 196, 136, 193, 0,
-	140, 143, 222, 210, 160, 161, 0, 0, 0, 0,
-	0, 0, 0, 179, 183, 199, 173, 0, 0, 0,
-	0, 0, 0, 0, 0, 158, 0, 190, 0, 0,
-	0, 144, 141, 177, 0, 0, 0, 146, 0, 159,
-	200, 0, 208, 174, 224, 211, 172, 171, 214, 217,
-	98, 206, 156, 164, 72, 162, 102, 96, 113, 189,
-	97, 101, 85, 107, 65, 111, 105, 89, 80, 81,
-	64, 0, 100, 75, 79, 74, 94, 108, 109, 73,
-	122, 68, 117, 67, 69, 116, 93, 106, 112, 90,
-	87, 66, 110, 88, 86, 82, 77, 0, 139, 0,
-	104, 114, 123, 152, 209, 118, 119, 120, 92, 70,
-	150, 151, 148, 149, 185, 186, 218, 219, 220, 201,
-	145, 0, 0, 204, 188, 63, 0, 83, 121, 99,
-	78, 115, 213, 203, 176, 215, 154, 168, 223, 169,
-	170, 197, 142, 184, 95, 166, 0, 157, 137, 163,
-	138, 155, 178, 76, 181, 153, 205, 187, 221, 84,
-	192, 0, 103, 91, 0, 0, 180, 207, 182, 202,
-	175, 198, 147, 191, 216, 167, 195, 0, 0, 0,
-	61, 0, 0, 0, 0, 0, 0, 0, 0, 71,
-	0, 194, 212, 165, 196, 136, 193, 0, 140, 143,
-	222, 210, 160, 161, 0, 0, 0, 0, 0, 0,
-	0, 179, 183, 199, 173, 0, 0, 0, 0, 0,
-	0, 949, 0, 158, 0, 190, 0, 0, 0, 144,
-	141, 177, 0, 0, 0, 146, 0, 159, 200, 0,
-	208, 174, 224, 211, 172, 171, 214, 217, 98, 206,
-	156, 164, 72, 162, 102, 96, 113, 189, 97, 101,
-	85, 107, 65, 111, 105, 89, 80, 81, 64, 0,
-	100, 75, 79, 74, 94, 108, 109, 73, 122, 68,
-	117, 67, 69, 116, 93, 106, 112, 90, 87, 66,
-	110, 88, 86, 82, 77, 0, 139, 0, 104, 114,
-	123, 152, 209, 118, 119, 120, 92, 70, 150, 151,
-	148, 149, 185, 186, 218, 219, 220, 201, 145, 0,
-	0, 204, 188, 63, 0, 83, 121, 99, 78, 115,
-	213, 203, 176, 215, 154, 168, 223, 169, 170, 197,
-	142, 184, 95, 166, 0, 157, 137, 163, 138, 155,
-	178, 76, 181, 153, 205, 187, 221, 84, 192, 0,
-	103, 91, 0, 0, 180, 207, 182, 202, 175, 198,
-	147, 191, 216, 167, 195, 40, 0, 0, 61, 0,
-	0, 0, 0, 0, 0, 0, 0, 71, 0, 194,
-	212, 165, 196, 136, 193, 0, 140, 143, 222, 210,
-	160, 161, 0, 0, 0, 0, 0, 0, 0, 179,
-	183, 199, 173, 0, 0, 0, 0, 0, 0, 0,
-	0, 158, 0, 190, 0, 0, 0, 144, 141, 177,
-	0, 0, 0, 146, 0, 159, 200, 0, 208, 174,
-	224, 211, 172, 171, 214, 217, 98, 206, 156, 164,
-	72, 162, 102, 96, 113, 189, 97, 101, 85, 107,
-	65, 111, 105, 89, 80, 81, 64, 0, 100, 75,
-	79, 74, 94, 108, 109, 73, 122, 68, 117, 67,
-	69, 116, 93, 106, 112, 90, 87, 66, 110, 88,
-	86, 82, 77, 0, 139, 0, 104, 114, 123, 152,
-	209, 118, 119, 120, 92, 70, 150, 151, 148, 149,
-	185, 186, 218, 219, 220, 201, 145, 0, 0, 204,
-	188, 63, 0, 83, 121, 99, 78, 115, 213, 203,
-	176, 215, 154, 168, 223, 169, 170, 197, 142, 184,
-	95, 166, 0, 157, 137, 163, 138, 155, 178, 76,
-	181, 153, 205, 187, 221, 84, 192, 0, 103, 91,
-	0, 0, 180, 207, 182, 202, 175, 198, 147, 191,
-	216, 167, 195, 0, 0, 0, 270, 0, 0, 0,
-	0, 0, 0, 0, 0, 71, 0, 194, 212, 165,
-	196, 136, 193, 0, 140, 143, 222, 210, 160, 161,
-	0, 0, 0, 0, 0, 0, 0, 179, 183, 199,
-	173, 0, 0, 0, 0, 0, 0, 866, 0, 158,
-	0, 190, 0, 0, 0, 144, 141, 177, 0, 0,
-	0, 146, 0, 159, 200, 0, 208, 174, 224, 211,
-	172, 171, 214, 217, 98, 206, 156, 164, 72, 162,
-	102, 96, 113, 189, 97, 101, 85, 107, 65, 111,
-	105, 89, 80, 81, 64, 0, 100, 75, 79, 74,
-	94, 108, 109, 73, 122, 68, 117, 67, 69, 116,
-	93, 106, 112, 90, 87, 66, 110, 88, 86, 82,
-	77, 0, 139, 0, 104, 114, 123, 152, 209, 118,
-	119, 120, 92, 70, 150, 151, 148, 149, 185, 186,
-	218, 219, 220, 201, 145, 0, 0, 204, 188, 63,
-	0, 83, 121, 99, 78, 115, 213, 203, 176, 215,
-	154, 168, 223, 169, 170, 197, 142, 184, 95, 166,
-	0, 157, 137, 163, 138, 155, 178, 76, 181, 153,
-	205, 187, 221, 84, 192, 0, 103, 91, 0, 0,
-	180, 207, 182, 202, 175, 198, 147, 191, 216, 167,
-	195, 0, 0, 0, 61, 0, 0, 0, 0, 0,
-	0, 0, 0, 71, 0, 194, 212, 165, 196, 136,
-	193, 0, 140, 143, 222, 210, 160, 161, 0, 0,
-	0, 0, 0, 0, 0, 179, 183, 199, 173, 0,
-	0, 0, 0, 0, 0, 0, 0, 158, 0, 190,
-	0, 0, 0, 144, 141, 177, 0, 0, 0, 146,
-	0, 159, 200, 0, 208, 174, 224, 211, 172, 171,
-	214, 217, 98, 206, 156, 164, 72, 162, 102, 96,
-	113, 189, 97, 101, 85, 107, 65, 111, 105, 89,
-	80, 81, 64, 0, 100, 75, 79, 74, 94, 108,
-	109, 73, 122, 68, 117, 67, 69, 116, 93, 106,
-	112, 90, 87, 66, 110, 88, 86, 82, 77, 0,
-	139, 0, 104, 114, 123, 152, 209, 118, 119, 120,
-	92, 70, 150, 151, 148, 149, 185, 186, 218, 219,
-	220, 201, 145, 0, 0, 204, 188, 63, 0, 83,
-	121, 99, 78, 115, 213, 203, 176, 215, 154, 168,
-	223, 169, 170, 197, 142, 184, 95, 166, 0, 157,
-	137, 163, 138, 155, 178, 76, 181, 153, 205, 187,
-	221, 84, 192, 0, 103, 91, 0, 0, 180, 207,
-	182, 202, 175, 198, 147, 191, 216, 167, 195, 0,
-	0, 0, 270, 0, 0, 0, 0, 0, 0, 0,
-	0, 71, 0, 194, 212, 165, 196, 136, 193, 0,
-	140, 143, 222, 210, 160, 161, 0, 0, 0, 0,
-	0, 0, 0, 179, 183, 199, 173, 0, 0, 0,
-	0, 0, 0, 0, 0, 158, 0, 190, 0, 0,
-	0, 144, 141, 177, 0, 0, 0, 146, 0, 159,
-	200, 0, 208, 174, 224, 211, 172, 171, 214, 217,
-	98, 206, 156, 164, 72, 162, 102, 96, 113, 189,
-	97, 101, 85, 107, 65, 111, 105, 89, 80, 81,
-	64, 0, 100, 75, 79, 74, 94, 108, 109, 73,
-	122, 68, 117, 67, 69, 116, 93, 106, 112, 90,
-	87, 66, 110, 88, 86, 82, 77, 0, 139, 0,
-	104, 114, 123, 152, 209, 118, 119, 120, 92, 70,
-	150, 151, 148, 149, 185, 186, 218, 219, 220, 201,
-	145, 0, 0, 204, 188, 63, 0, 83, 121, 99,
-	78, 115, 213, 203, 176, 215, 154, 168, 223, 169,
-	170, 197, 142, 184, 95, 166, 0, 157, 137, 163,
-	138, 155, 178, 76, 181, 153, 205, 187, 221, 84,
-	192, 0, 103, 91, 0, 0, 180, 207, 182, 202,
-	175, 198, 147, 191, 216, 167, 195, 0, 0, 0,
-	226, 0, 0, 0, 0, 0, 0, 0, 0, 71,
-	0, 194, 212, 165, 196, 136, 193, 0, 140, 143,
-	222, 210, 160, 161, 0, 0, 0, 0, 0, 0,
-	0, 179, 183, 199, 173, 0, 0, 0, 0, 0,
-	0, 0, 0, 158, 0, 190, 0, 0, 0, 144,
-	141, 177, 0, 0, 0, 146, 0, 159, 200, 0,
-	208, 174, 224, 211, 172, 171, 214, 217, 98, 206,
-	156, 164, 72, 162, 102, 96, 113, 189, 97, 101,
-	85, 107, 65, 111, 105, 89, 80, 81, 64, 0,
-	100, 75, 79, 74, 94, 108, 109, 73, 122, 68,
-	117, 67, 69, 116, 93, 106, 112, 90, 87, 66,
-	110, 88, 86, 82, 77, 0, 139, 0, 104, 114,
-	123, 152, 209, 118, 119, 120, 92, 70, 150, 151,
-	148, 149, 185, 186, 218, 219, 220, 201, 145, 0,
-	0, 204, 188, 63, 0, 83, 121, 99, 78, 115,
-	213, 203, 176, 215, 154, 168, 223, 169, 170, 197,
-	142, 184, 95, 166, 0, 157, 137, 163, 138, 155,
-	178, 76, 181, 153, 205, 187, 221, 84, 192, 0,
-	103, 91, 0, 0, 180, 207, 182, 202, 175, 198,
-	147, 191, 216, 167, 195, 0, 0, 0, 133, 0,
-	0, 0, 0, 0, 0, 0, 0, 71, 0, 194,
-	212, 165, 196, 136, 193, 0, 140, 143, 222, 210,
-	160, 161, 0, 0, 0, 0, 0, 0, 0, 179,
-	183, 199, 173, 0, 0, 0, 0, 0, 0, 0,
-	0, 158, 0, 190, 0, 0, 0, 144, 141, 177,
-	0, 0, 0, 146, 0, 159, 200, 0, 208, 174,
-	224, 211, 172, 171, 214, 217, 98, 206, 156, 164,
-	72, 162, 102, 96, 113, 189, 97, 101, 85, 107,
-	65, 111, 105, 89, 80, 81, 64, 0, 100, 75,
-	79, 74, 94, 108, 109, 73, 122, 68, 117, 67,
-	69, 116, 93, 106, 112, 90, 87, 66, 110, 88,
-	86, 82, 77, 0, 139, 0, 104, 114, 123, 152,
-	209, 118, 119, 120, 92, 70, 150, 151, 148, 149,
-	185, 186, 218, 219, 220, 201, 145, 0, 0, 204,
-	188, 63, 0, 83, 121, 99, 78, 115, 95, 0,
-	0, 682, 0, 299, 0, 0, 0, 76, 0, 298,
-	0, 0, 336, 84, 0, 0, 103, 91, 0, 0,
-	0, 0, 329, 330, 0, 0, 0, 0, 0, 0,
-	0, 40, 0, 0, 270, 316, 315, 318, 319, 320,
-	321, 0, 0, 71, 317, 322, 323, 324, 0, 0,
-	296, 309, 0, 335, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 95, 0,
+	689, 567, 0, 0, 0, 689, 689, 76, 0, 689,
+	0, 0, 0, 84, 0, 0, 103, 91, 0, 887,
+	0, 0, 0, 689, 689, 689, 689, 0, 0, 0,
+	0, 0, 0, 0, 61, 0, 0, 0, 689, 0,
+	0, 269, 0, 71, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 306, 307, 685, 0, 0, 0, 347,
-	0, 308, 0, 0, 305, 310, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 224, 0, 0, 345,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 467,
+	466, 476, 477, 469, 470, 471, 472, 473, 474, 475,
+	468, 0, 0, 478, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 224, 0, 0, 932,
 	0, 0, 98, 0, 0, 0, 72, 0, 102, 96,
 	113, 0, 97, 101, 85, 107, 65, 111, 105, 89,
 	80, 81, 64, 0, 100, 75, 79, 74, 94, 108,
 	109, 73, 122, 68, 117, 67, 69, 116, 93, 106,
 	112, 90, 87, 66, 110, 88, 86, 82, 77, 0,
 	0, 0, 104, 114, 123, 0, 0, 118, 119, 120,
-	92, 70, 337, 346, 343, 344, 341, 342, 340, 339,
-	338, 348, 331, 332, 334, 0, 333, 63, 0, 83,
-	121, 99, 78, 115, 95, 0, 0, 0, 0, 299,
-	0, 0, 0, 76, 0, 298, 0, 0, 336, 84,
-	0, 0, 103, 91, 0, 0, 0, 0, 329, 330,
-	0, 0, 0, 0, 0, 0, 0, 40, 0, 0,
-	270, 316, 315, 318, 319, 320, 321, 0, 0, 71,
-	317, 322, 323, 324, 0, 0, 296, 309, 0, 335,
+	92, 70, 0, 0, 0, 0, 0, 0, 0, 971,
+	501, 0, 0, 0, 0, 0, 0, 63, 0, 83,
+	121, 99, 78, 115, 0, 0, 689, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 306,
-	307, 685, 0, 0, 0, 347, 0, 308, 0, 0,
-	305, 310, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 224, 0, 0, 345, 0, 0, 98, 0,
-	0, 0, 72, 0, 102, 96, 113, 0, 97, 101,
-	85, 107, 65, 111, 105, 89, 80, 81, 64, 0,
-	100, 75, 79, 74, 94, 108, 109, 73, 122, 68,
-	117, 67, 69, 116, 93, 106, 112, 90, 87, 66,
-	110, 88, 86, 82, 77, 0, 0, 0, 104, 114,
-	123, 0, 0, 118, 119, 120, 92, 70, 337, 346,
-	343, 344, 341, 342, 340, 339, 338, 348, 331, 332,
-	334, 0, 333, 63, 0, 83, 121, 99, 78, 115,
-	95, 0, 0, 0, 0, 299, 0, 0, 0, 76,
-	0, 298, 0, 0, 336, 84, 0, 0, 103, 91,
-	0, 0, 0, 0, 329, 330, 0, 0, 0, 0,
-	0, 0, 0, 40, 0, 290, 270, 316, 315, 318,
-	319, 320, 321, 0, 0, 71, 317, 322, 323, 324,
-	0, 0, 296, 309, 0, 335, 0, 0, 0, 0,
+	689, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 257, 0, 0, 213, 203, 176, 215, 154,
+	168, 223, 169, 170, 197, 142, 184, 95, 166, 0,
+	157, 137, 163, 138, 155, 178, 76, 181, 153, 205,
+	187, 221, 84, 192, 0, 103, 91, 0, 0, 180,
+	207, 182, 202, 175, 198, 147, 191, 216, 167, 195,
+	0, 0, 0, 61, 0, 583, 584, 257, 0, 0,
+	0, 257, 71, 0, 194, 212, 165, 196, 136, 193,
+	0, 140, 143, 222, 210, 160, 161, 741, 0, 0,
+	0, 0, 689, 0, 179, 183, 199, 173, 567, 689,
+	0, 0, 0, 0, 0, 0, 158, 0, 190, 0,
+	0, 0, 144, 141, 177, 0, 0, 0, 146, 257,
+	159, 200, 0, 208, 174, 224, 211, 172, 171, 214,
+	217, 98, 206, 156, 164, 72, 162, 102, 96, 113,
+	189, 97, 101, 85, 107, 65, 111, 105, 89, 80,
+	81, 64, 0, 100, 75, 79, 74, 94, 108, 109,
+	73, 122, 68, 117, 67, 69, 116, 93, 106, 112,
+	90, 87, 66, 110, 88, 86, 82, 77, 0, 139,
+	0, 104, 114, 123, 152, 209, 118, 119, 120, 92,
+	70, 150, 151, 148, 149, 185, 186, 218, 219, 220,
+	201, 145, 0, 0, 204, 188, 63, 0, 83, 121,
+	99, 78, 115, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 213, 203, 176, 215, 154, 168, 223,
+	169, 170, 197, 142, 184, 95, 166, 269, 157, 137,
+	163, 138, 155, 178, 76, 181, 153, 205, 187, 221,
+	84, 192, 0, 103, 91, 0, 0, 180, 207, 182,
+	202, 175, 198, 147, 191, 216, 167, 195, 0, 0,
+	0, 61, 0, 583, 584, 0, 0, 0, 0, 0,
+	71, 0, 194, 212, 165, 196, 136, 193, 0, 140,
+	143, 222, 210, 160, 161, 0, 0, 0, 0, 0,
+	0, 0, 179, 183, 199, 173, 0, 0, 0, 0,
+	0, 0, 0, 0, 158, 0, 190, 0, 0, 0,
+	144, 141, 177, 0, 0, 0, 146, 0, 159, 200,
+	0, 208, 174, 224, 211, 172, 171, 214, 217, 98,
+	206, 156, 164, 72, 162, 102, 96, 113, 189, 97,
+	101, 85, 107, 65, 111, 105, 89, 80, 81, 64,
+	0, 100, 75, 79, 74, 94, 108, 109, 73, 122,
+	68, 117, 67, 69, 116, 93, 106, 112, 90, 87,
+	66, 110, 88, 86, 82, 77, 0, 139, 0, 104,
+	114, 123, 152, 209, 118, 119, 120, 92, 70, 150,
+	151, 148, 149, 185, 186, 218, 219, 220, 201, 145,
+	0, 0, 204, 188, 63, 0, 83, 121, 99, 78,
+	115, 213, 203, 176, 215, 154, 168, 223, 169, 170,
+	197, 142, 184, 95, 166, 0, 157, 137, 163, 138,
+	155, 178, 76, 181, 153, 205, 187, 221, 84, 192,
+	0, 103, 91, 0, 0, 180, 207, 182, 202, 175,
+	198, 147, 191, 216, 167, 195, 0, 0, 0, 61,
+	0, 0, 0, 0, 0, 0, 0, 0, 71, 0,
+	194, 212, 165, 196, 136, 193, 0, 140, 143, 222,
+	210, 160, 161, 0, 0, 0, 0, 0, 0, 0,
+	179, 183, 199, 173, 0, 0, 0, 0, 0, 0,
+	951, 0, 158, 0, 190, 0, 0, 0, 144, 141,
+	177, 0, 0, 0, 146, 0, 159, 200, 0, 208,
+	174, 224, 211, 172, 171, 214, 217, 98, 206, 156,
+	164, 72, 162, 102, 96, 113, 189, 97, 101, 85,
+	107, 65, 111, 105, 89, 80, 81, 64, 0, 100,
+	75, 79, 74, 94, 108, 109, 73, 122, 68, 117,
+	67, 69, 116, 93, 106, 112, 90, 87, 66, 110,
+	88, 86, 82, 77, 0, 139, 0, 104, 114, 123,
+	152, 209, 118, 119, 120, 92, 70, 150, 151, 148,
+	149, 185, 186, 218, 219, 220, 201, 145, 0, 0,
+	204, 188, 63, 0, 83, 121, 99, 78, 115, 213,
+	203, 176, 215, 154, 168, 223, 169, 170, 197, 142,
+	184, 95, 166, 0, 157, 137, 163, 138, 155, 178,
+	76, 181, 153, 205, 187, 221, 84, 192, 0, 103,
+	91, 0, 0, 180, 207, 182, 202, 175, 198, 147,
+	191, 216, 167, 195, 40, 0, 0, 61, 0, 0,
+	0, 0, 0, 0, 0, 0, 71, 0, 194, 212,
+	165, 196, 136, 193, 0, 140, 143, 222, 210, 160,
+	161, 0, 0, 0, 0, 0, 0, 0, 179, 183,
+	199, 173, 0, 0, 0, 0, 0, 0, 0, 0,
+	158, 0, 190, 0, 0, 0, 144, 141, 177, 0,
+	0, 0, 146, 0, 159, 200, 0, 208, 174, 224,
+	211, 172, 171, 214, 217, 98, 206, 156, 164, 72,
+	162, 102, 96, 113, 189, 97, 101, 85, 107, 65,
+	111, 105, 89, 80, 81, 64, 0, 100, 75, 79,
+	74, 94, 108, 109, 73, 122, 68, 117, 67, 69,
+	116, 93, 106, 112, 90, 87, 66, 110, 88, 86,
+	82, 77, 0, 139, 0, 104, 114, 123, 152, 209,
+	118, 119, 120, 92, 70, 150, 151, 148, 149, 185,
+	186, 218, 219, 220, 201, 145, 0, 0, 204, 188,
+	63, 0, 83, 121, 99, 78, 115, 213, 203, 176,
+	215, 154, 168, 223, 169, 170, 197, 142, 184, 95,
+	166, 0, 157, 137, 163, 138, 155, 178, 76, 181,
+	153, 205, 187, 221, 84, 192, 0, 103, 91, 0,
+	0, 180, 207, 182, 202, 175, 198, 147, 191, 216,
+	167, 195, 0, 0, 0, 270, 0, 0, 0, 0,
+	0, 0, 0, 0, 71, 0, 194, 212, 165, 196,
+	136, 193, 0, 140, 143, 222, 210, 160, 161, 0,
+	0, 0, 0, 0, 0, 0, 179, 183, 199, 173,
+	0, 0, 0, 0, 0, 0, 868, 0, 158, 0,
+	190, 0, 0, 0, 144, 141, 177, 0, 0, 0,
+	146, 0, 159, 200, 0, 208, 174, 224, 211, 172,
+	171, 214, 217, 98, 206, 156, 164, 72, 162, 102,
+	96, 113, 189, 97, 101, 85, 107, 65, 111, 105,
+	89, 80, 81, 64, 0, 100, 75, 79, 74, 94,
+	108, 109, 73, 122, 68, 117, 67, 69, 116, 93,
+	106, 112, 90, 87, 66, 110, 88, 86, 82, 77,
+	0, 139, 0, 104, 114, 123, 152, 209, 118, 119,
+	120, 92, 70, 150, 151, 148, 149, 185, 186, 218,
+	219, 220, 201, 145, 0, 0, 204, 188, 63, 0,
+	83, 121, 99, 78, 115, 213, 203, 176, 215, 154,
+	168, 223, 169, 170, 197, 142, 184, 95, 166, 0,
+	157, 137, 163, 138, 155, 178, 76, 181, 153, 205,
+	187, 221, 84, 192, 0, 103, 91, 0, 0, 180,
+	207, 182, 202, 175, 198, 147, 191, 216, 167, 195,
+	0, 0, 0, 61, 0, 392, 0, 0, 0, 0,
+	0, 0, 71, 0, 194, 212, 165, 196, 136, 193,
+	0, 140, 143, 222, 210, 160, 161, 0, 0, 0,
+	0, 0, 0, 0, 179, 183, 199, 173, 0, 0,
+	0, 0, 0, 0, 0, 0, 158, 0, 190, 0,
+	0, 0, 144, 141, 177, 0, 0, 0, 146, 0,
+	159, 200, 0, 208, 174, 224, 211, 172, 171, 214,
+	217, 98, 206, 156, 164, 72, 162, 102, 96, 113,
+	189, 97, 101, 85, 107, 65, 111, 105, 89, 80,
+	81, 64, 0, 100, 75, 79, 74, 94, 108, 109,
+	73, 122, 68, 117, 67, 69, 116, 93, 106, 112,
+	90, 87, 66, 110, 88, 86, 82, 77, 0, 139,
+	0, 104, 114, 123, 152, 209, 118, 119, 120, 92,
+	70, 150, 151, 148, 149, 185, 186, 218, 219, 220,
+	201, 145, 0, 0, 204, 188, 63, 0, 83, 121,
+	99, 78, 115, 213, 203, 176, 215, 154, 168, 223,
+	169, 170, 197, 142, 184, 95, 166, 0, 157, 137,
+	163, 138, 155, 178, 76, 181, 153, 205, 187, 221,
+	84, 192, 0, 103, 91, 0, 0, 180, 207, 182,
+	202, 175, 198, 147, 191, 216, 167, 195, 0, 0,
+	0, 61, 0, 0, 0, 0, 0, 0, 0, 0,
+	71, 0, 194, 212, 165, 196, 136, 193, 0, 140,
+	143, 222, 210, 160, 161, 0, 0, 0, 0, 0,
+	0, 0, 179, 183, 199, 173, 0, 0, 0, 0,
+	0, 0, 0, 0, 158, 0, 190, 0, 0, 0,
+	144, 141, 177, 0, 0, 0, 146, 0, 159, 200,
+	0, 208, 174, 224, 211, 172, 171, 214, 217, 98,
+	206, 156, 164, 72, 162, 102, 96, 113, 189, 97,
+	101, 85, 107, 65, 111, 105, 89, 80, 81, 64,
+	0, 100, 75, 79, 74, 94, 108, 109, 73, 122,
+	68, 117, 67, 69, 116, 93, 106, 112, 90, 87,
+	66, 110, 88, 86, 82, 77, 0, 139, 0, 104,
+	114, 123, 152, 209, 118, 119, 120, 92, 70, 150,
+	151, 148, 149, 185, 186, 218, 219, 220, 201, 145,
+	0, 0, 204, 188, 63, 0, 83, 121, 99, 78,
+	115, 213, 203, 176, 215, 154, 168, 223, 169, 170,
+	197, 142, 184, 95, 166, 0, 157, 137, 163, 138,
+	155, 178, 76, 181, 153, 205, 187, 221, 84, 192,
+	0, 103, 91, 0, 0, 180, 207, 182, 202, 175,
+	198, 147, 191, 216, 167, 195, 0, 0, 0, 270,
+	0, 0, 0, 0, 0, 0, 0, 0, 71, 0,
+	194, 212, 165, 196, 136, 193, 0, 140, 143, 222,
+	210, 160, 161, 0, 0, 0, 0, 0, 0, 0,
+	179, 183, 199, 173, 0, 0, 0, 0, 0, 0,
+	0, 0, 158, 0, 190, 0, 0, 0, 144, 141,
+	177, 0, 0, 0, 146, 0, 159, 200, 0, 208,
+	174, 224, 211, 172, 171, 214, 217, 98, 206, 156,
+	164, 72, 162, 102, 96, 113, 189, 97, 101, 85,
+	107, 65, 111, 105, 89, 80, 81, 64, 0, 100,
+	75, 79, 74, 94, 108, 109, 73, 122, 68, 117,
+	67, 69, 116, 93, 106, 112, 90, 87, 66, 110,
+	88, 86, 82, 77, 0, 139, 0, 104, 114, 123,
+	152, 209, 118, 119, 120, 92, 70, 150, 151, 148,
+	149, 185, 186, 218, 219, 220, 201, 145, 0, 0,
+	204, 188, 63, 0, 83, 121, 99, 78, 115, 213,
+	203, 176, 215, 154, 168, 223, 169, 170, 197, 142,
+	184, 95, 166, 0, 157, 137, 163, 138, 155, 178,
+	76, 181, 153, 205, 187, 221, 84, 192, 0, 103,
+	91, 0, 0, 180, 207, 182, 202, 175, 198, 147,
+	191, 216, 167, 195, 0, 0, 0, 226, 0, 0,
+	0, 0, 0, 0, 0, 0, 71, 0, 194, 212,
+	165, 196, 136, 193, 0, 140, 143, 222, 210, 160,
+	161, 0, 0, 0, 0, 0, 0, 0, 179, 183,
+	199, 173, 0, 0, 0, 0, 0, 0, 0, 0,
+	158, 0, 190, 0, 0, 0, 144, 141, 177, 0,
+	0, 0, 146, 0, 159, 200, 0, 208, 174, 224,
+	211, 172, 171, 214, 217, 98, 206, 156, 164, 72,
+	162, 102, 96, 113, 189, 97, 101, 85, 107, 65,
+	111, 105, 89, 80, 81, 64, 0, 100, 75, 79,
+	74, 94, 108, 109, 73, 122, 68, 117, 67, 69,
+	116, 93, 106, 112, 90, 87, 66, 110, 88, 86,
+	82, 77, 0, 139, 0, 104, 114, 123, 152, 209,
+	118, 119, 120, 92, 70, 150, 151, 148, 149, 185,
+	186, 218, 219, 220, 201, 145, 0, 0, 204, 188,
+	63, 0, 83, 121, 99, 78, 115, 213, 203, 176,
+	215, 154, 168, 223, 169, 170, 197, 142, 184, 95,
+	166, 0, 157, 137, 163, 138, 155, 178, 76, 181,
+	153, 205, 187, 221, 84, 192, 0, 103, 91, 0,
+	0, 180, 207, 182, 202, 175, 198, 147, 191, 216,
+	167, 195, 0, 0, 0, 133, 0, 0, 0, 0,
+	0, 0, 0, 0, 71, 0, 194, 212, 165, 196,
+	136, 193, 0, 140, 143, 222, 210, 160, 161, 0,
+	0, 0, 0, 0, 0, 0, 179, 183, 199, 173,
+	0, 0, 0, 0, 0, 0, 0, 0, 158, 0,
+	190, 0, 0, 0, 144, 141, 177, 0, 0, 0,
+	146, 0, 159, 200, 0, 208, 174, 224, 211, 172,
+	171, 214, 217, 98, 206, 156, 164, 72, 162, 102,
+	96, 113, 189, 97, 101, 85, 107, 65, 111, 105,
+	89, 80, 81, 64, 0, 100, 75, 79, 74, 94,
+	108, 109, 73, 122, 68, 117, 67, 69, 116, 93,
+	106, 112, 90, 87, 66, 110, 88, 86, 82, 77,
+	0, 139, 0, 104, 114, 123, 152, 209, 118, 119,
+	120, 92, 70, 150, 151, 148, 149, 185, 186, 218,
+	219, 220, 201, 145, 0, 0, 204, 188, 63, 0,
+	83, 121, 99, 78, 115, 95, 0, 0, 684, 0,
+	299, 0, 0, 0, 76, 0, 298, 0, 0, 336,
+	84, 0, 0, 103, 91, 0, 0, 0, 0, 329,
+	330, 0, 0, 0, 0, 0, 0, 0, 40, 0,
+	0, 270, 316, 315, 318, 319, 320, 321, 0, 0,
+	71, 317, 322, 323, 324, 0, 0, 296, 309, 0,
+	335, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 306, 307, 0, 0, 0,
-	0, 347, 0, 308, 0, 0, 305, 310, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 224, 0,
-	0, 345, 0, 0, 98, 0, 0, 0, 72, 0,
-	102, 96, 113, 0, 97, 101, 85, 107, 65, 111,
-	105, 89, 80, 81, 64, 0, 100, 75, 79, 74,
-	94, 108, 109, 73, 122, 68, 117, 67, 69, 116,
-	93, 106, 112, 90, 87, 66, 110, 88, 86, 82,
-	77, 0, 0, 0, 104, 114, 123, 0, 0, 118,
-	119, 120, 92, 70, 337, 346, 343, 344, 341, 342,
-	340, 339, 338, 348, 331, 332, 334, 18, 333, 63,
-	0, 83, 121, 99, 78, 115, 0, 0, 95, 0,
-	0, 0, 0, 299, 0, 0, 0, 76, 0, 298,
-	0, 0, 336, 84, 0, 0, 103, 91, 0, 0,
-	0, 0, 329, 330, 0, 0, 0, 0, 0, 0,
-	0, 40, 0, 0, 270, 316, 315, 318, 319, 320,
-	321, 0, 0, 71, 317, 322, 323, 324, 0, 0,
-	296, 309, 0, 335, 0, 0, 0, 0, 0, 0,
+	306, 307, 687, 0, 0, 0, 347, 0, 308, 0,
+	0, 305, 310, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 224, 0, 0, 345, 0, 0, 98,
+	0, 0, 0, 72, 0, 102, 96, 113, 0, 97,
+	101, 85, 107, 65, 111, 105, 89, 80, 81, 64,
+	0, 100, 75, 79, 74, 94, 108, 109, 73, 122,
+	68, 117, 67, 69, 116, 93, 106, 112, 90, 87,
+	66, 110, 88, 86, 82, 77, 0, 0, 0, 104,
+	114, 123, 0, 0, 118, 119, 120, 92, 70, 337,
+	346, 343, 344, 341, 342, 340, 339, 338, 348, 331,
+	332, 334, 0, 333, 63, 0, 83, 121, 99, 78,
+	115, 95, 0, 0, 0, 0, 299, 0, 0, 0,
+	76, 0, 298, 0, 0, 336, 84, 0, 0, 103,
+	91, 0, 0, 0, 0, 329, 330, 0, 0, 0,
+	0, 0, 0, 0, 40, 0, 0, 270, 316, 315,
+	318, 319, 320, 321, 0, 0, 71, 317, 322, 323,
+	324, 0, 0, 296, 309, 0, 335, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 306, 307, 0, 0, 0, 0, 347,
-	0, 308, 0, 0, 305, 310, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 224, 0, 0, 345,
-	0, 0, 98, 0, 0, 0, 72, 0, 102, 96,
-	113, 0, 97, 101, 85, 107, 65, 111, 105, 89,
-	80, 81, 64, 0, 100, 75, 79, 74, 94, 108,
-	109, 73, 122, 68, 117, 67, 69, 116, 93, 106,
-	112, 90, 87, 66, 110, 88, 86, 82, 77, 0,
-	0, 0, 104, 114, 123, 0, 0, 118, 119, 120,
-	92, 70, 337, 346, 343, 344, 341, 342, 340, 339,
-	338, 348, 331, 332, 334, 0, 333, 63, 0, 83,
-	121, 99, 78, 115, 95, 0, 0, 0, 0, 299,
-	0, 0, 0, 76, 0, 298, 0, 0, 336, 84,
-	0, 0, 103, 91, 0, 0, 0, 0, 329, 330,
-	0, 0, 0, 0, 0, 0, 0, 40, 0, 0,
-	270, 316, 315, 318, 319, 320, 321, 0, 0, 71,
-	317, 322, 323, 324, 0, 0, 296, 309, 0, 335,
+	0, 0, 0, 0, 0, 0, 306, 307, 687, 0,
+	0, 0, 347, 0, 308, 0, 0, 305, 310, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 224,
+	0, 0, 345, 0, 0, 98, 0, 0, 0, 72,
+	0, 102, 96, 113, 0, 97, 101, 85, 107, 65,
+	111, 105, 89, 80, 81, 64, 0, 100, 75, 79,
+	74, 94, 108, 109, 73, 122, 68, 117, 67, 69,
+	116, 93, 106, 112, 90, 87, 66, 110, 88, 86,
+	82, 77, 0, 0, 0, 104, 114, 123, 0, 0,
+	118, 119, 120, 92, 70, 337, 346, 343, 344, 341,
+	342, 340, 339, 338, 348, 331, 332, 334, 0, 333,
+	63, 0, 83, 121, 99, 78, 115, 95, 0, 0,
+	0, 0, 299, 0, 0, 0, 76, 0, 298, 0,
+	0, 336, 84, 0, 0, 103, 91, 0, 0, 0,
+	0, 329, 330, 0, 0, 0, 0, 0, 0, 0,
+	40, 0, 290, 270, 316, 315, 318, 319, 320, 321,
+	0, 0, 71, 317, 322, 323, 324, 0, 0, 296,
+	309, 0, 335, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 306,
-	307, 0, 0, 0, 0, 347, 0, 308, 0, 0,
-	305, 310, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 224, 0, 0, 345, 0, 0, 98, 0,
-	0, 0, 72, 0, 102, 96, 113, 0, 97, 101,
-	85, 107, 65, 111, 105, 89, 80, 81, 64, 0,
-	100, 75, 79, 74, 94, 108, 109, 73, 122, 68,
-	117, 67, 69, 116, 93, 106, 112, 90, 87, 66,
-	110, 88, 86, 82, 77, 0, 0, 0, 104, 114,
-	123, 0, 0, 118, 119, 120, 92, 70, 337, 346,
-	343, 344, 341, 342, 340, 339, 338, 348, 331, 332,
-	334, 95, 333, 63, 0, 83, 121, 99, 78, 115,
-	76, 0, 0, 0, 0, 336, 84, 0, 0, 103,
+	0, 0, 306, 307, 0, 0, 0, 0, 347, 0,
+	308, 0, 0, 305, 310, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 224, 0, 0, 345, 0,
+	0, 98, 0, 0, 0, 72, 0, 102, 96, 113,
+	0, 97, 101, 85, 107, 65, 111, 105, 89, 80,
+	81, 64, 0, 100, 75, 79, 74, 94, 108, 109,
+	73, 122, 68, 117, 67, 69, 116, 93, 106, 112,
+	90, 87, 66, 110, 88, 86, 82, 77, 0, 0,
+	0, 104, 114, 123, 0, 0, 118, 119, 120, 92,
+	70, 337, 346, 343, 344, 341, 342, 340, 339, 338,
+	348, 331, 332, 334, 18, 333, 63, 0, 83, 121,
+	99, 78, 115, 0, 0, 95, 0, 0, 0, 0,
+	299, 0, 0, 0, 76, 0, 298, 0, 0, 336,
+	84, 0, 0, 103, 91, 0, 0, 0, 0, 329,
+	330, 0, 0, 0, 0, 0, 0, 0, 40, 0,
+	0, 270, 316, 315, 318, 319, 320, 321, 0, 0,
+	71, 317, 322, 323, 324, 0, 0, 296, 309, 0,
+	335, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	306, 307, 0, 0, 0, 0, 347, 0, 308, 0,
+	0, 305, 310, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 224, 0, 0, 345, 0, 0, 98,
+	0, 0, 0, 72, 0, 102, 96, 113, 0, 97,
+	101, 85, 107, 65, 111, 105, 89, 80, 81, 64,
+	0, 100, 75, 79, 74, 94, 108, 109, 73, 122,
+	68, 117, 67, 69, 116, 93, 106, 112, 90, 87,
+	66, 110, 88, 86, 82, 77, 0, 0, 0, 104,
+	114, 123, 0, 0, 118, 119, 120, 92, 70, 337,
+	346, 343, 344, 341, 342, 340, 339, 338, 348, 331,
+	332, 334, 0, 333, 63, 0, 83, 121, 99, 78,
+	115, 95, 0, 0, 0, 0, 299, 0, 0, 0,
+	76, 0, 298, 0, 0, 336, 84, 0, 0, 103,
 	91, 0, 0, 0, 0, 329, 330, 0, 0, 0,
 	0, 0, 0, 0, 40, 0, 0, 270, 316, 315,
 	318, 319, 320, 321, 0, 0, 71, 317, 322, 323,
-	324, 0, 0, 0, 309, 0, 335, 0, 0, 0,
+	324, 0, 0, 296, 309, 0, 335, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 306, 307, 0, 0,
 	0, 0, 347, 0, 308, 0, 0, 305, 310, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 224,
 	0, 0, 345, 0, 0, 98, 0, 0, 0, 72,
-	0, 102, 96, 113, 990, 97, 101, 85, 107, 65,
+	0, 102, 96, 113, 0, 97, 101, 85, 107, 65,
 	111, 105, 89, 80, 81, 64, 0, 100, 75, 79,
 	74, 94, 108, 109, 73, 122, 68, 117, 67, 69,
 	116, 93, 106, 112, 90, 87, 66, 110, 88, 86,
@@ -1005,58 +993,58 @@ var yyAct = [...]int{
 	0, 308, 0, 0, 305, 310, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 224, 0, 0, 345,
 	0, 0, 98, 0, 0, 0, 72, 0, 102, 96,
-	113, 0, 97, 101, 85, 107, 65, 111, 105, 89,
+	113, 992, 97, 101, 85, 107, 65, 111, 105, 89,
 	80, 81, 64, 0, 100, 75, 79, 74, 94, 108,
 	109, 73, 122, 68, 117, 67, 69, 116, 93, 106,
 	112, 90, 87, 66, 110, 88, 86, 82, 77, 0,
 	0, 0, 104, 114, 123, 0, 0, 118, 119, 120,
 	92, 70, 337, 346, 343, 344, 341, 342, 340, 339,
-	338, 348, 331, 332, 334, 0, 333, 63, 0, 83,
-	121, 99, 78, 115, 95, 0, 0, 0, 791, 0,
-	0, 0, 0, 76, 0, 0, 0, 0, 0, 84,
-	0, 0, 103, 91, 0, 0, 0, 0, 0, 0,
+	338, 348, 331, 332, 334, 95, 333, 63, 0, 83,
+	121, 99, 78, 115, 76, 0, 0, 0, 0, 336,
+	84, 0, 0, 103, 91, 0, 0, 0, 0, 329,
+	330, 0, 0, 0, 0, 0, 0, 0, 40, 0,
+	0, 270, 316, 315, 318, 319, 320, 321, 0, 0,
+	71, 317, 322, 323, 324, 0, 0, 0, 309, 0,
+	335, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	61, 0, 793, 0, 0, 0, 0, 0, 0, 71,
-	0, 0, 0, 0, 453, 452, 0, 0, 0, 0,
-	0, 0, 0, 0, 460, 0, 463, 0, 0, 0,
-	0, 454, 477, 478, 479, 480, 481, 482, 483, 0,
-	461, 462, 459, 465, 464, 474, 475, 467, 468, 469,
-	470, 471, 472, 473, 466, 0, 0, 476, 0, 0,
-	0, 0, 224, 0, 0, 0, 0, 0, 98, 0,
-	0, 0, 72, 0, 102, 96, 113, 0, 97, 101,
-	85, 107, 65, 111, 105, 89, 80, 81, 64, 0,
-	100, 75, 79, 74, 94, 108, 109, 73, 122, 68,
-	117, 67, 69, 116, 93, 106, 112, 90, 87, 66,
-	110, 88, 86, 82, 77, 0, 0, 0, 104, 114,
-	123, 95, 0, 118, 119, 120, 92, 70, 0, 0,
+	306, 307, 0, 0, 0, 0, 347, 0, 308, 0,
+	0, 305, 310, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 224, 0, 0, 345, 0, 0, 98,
+	0, 0, 0, 72, 0, 102, 96, 113, 0, 97,
+	101, 85, 107, 65, 111, 105, 89, 80, 81, 64,
+	0, 100, 75, 79, 74, 94, 108, 109, 73, 122,
+	68, 117, 67, 69, 116, 93, 106, 112, 90, 87,
+	66, 110, 88, 86, 82, 77, 0, 0, 0, 104,
+	114, 123, 0, 0, 118, 119, 120, 92, 70, 337,
+	346, 343, 344, 341, 342, 340, 339, 338, 348, 331,
+	332, 334, 0, 333, 63, 0, 83, 121, 99, 78,
+	115, 95, 0, 0, 0, 793, 0, 0, 0, 0,
 	76, 0, 0, 0, 0, 0, 84, 0, 0, 103,
-	91, 0, 0, 63, 0, 83, 121, 99, 78, 115,
-	0, 0, 0, 0, 0, 0, 0, 61, 0, 0,
+	91, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 61, 0, 795,
 	0, 0, 0, 0, 0, 0, 71, 0, 0, 0,
-	0, 57, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 455, 454, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 456, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 58, 0, 56,
-	0, 0, 0, 59, 0, 98, 0, 0, 0, 72,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 224,
+	0, 0, 0, 0, 0, 98, 0, 0, 0, 72,
 	0, 102, 96, 113, 0, 97, 101, 85, 107, 65,
 	111, 105, 89, 80, 81, 64, 0, 100, 75, 79,
 	74, 94, 108, 109, 73, 122, 68, 117, 67, 69,
 	116, 93, 106, 112, 90, 87, 66, 110, 88, 86,
-	82, 77, 0, 0, 0, 104, 114, 123, 0, 0,
-	118, 119, 120, 92, 70, 0, 0, 18, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 95, 0,
-	63, 0, 83, 121, 99, 78, 115, 76, 0, 0,
+	82, 77, 0, 0, 0, 104, 114, 123, 95, 0,
+	118, 119, 120, 92, 70, 0, 0, 76, 0, 0,
 	0, 0, 0, 84, 0, 0, 103, 91, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 40, 0, 0, 61, 0, 0, 0, 0, 0,
-	0, 0, 0, 71, 0, 0, 0, 0, 0, 0,
+	63, 0, 83, 121, 99, 78, 115, 0, 0, 0,
+	0, 0, 0, 0, 61, 0, 0, 0, 0, 0,
+	0, 0, 0, 71, 0, 0, 0, 0, 57, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 224, 0, 0, 0,
-	0, 0, 98, 0, 0, 0, 72, 0, 102, 96,
+	0, 0, 0, 0, 58, 0, 56, 0, 0, 0,
+	59, 0, 98, 0, 0, 0, 72, 0, 102, 96,
 	113, 0, 97, 101, 85, 107, 65, 111, 105, 89,
 	80, 81, 64, 0, 100, 75, 79, 74, 94, 108,
 	109, 73, 122, 68, 117, 67, 69, 116, 93, 106,
@@ -1067,7 +1055,7 @@ var yyAct = [...]int{
 	121, 99, 78, 115, 76, 0, 0, 0, 0, 0,
 	84, 0, 0, 103, 91, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 40, 0,
-	0, 226, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 61, 0, 0, 0, 0, 0, 0, 0, 0,
 	71, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1079,11 +1067,13 @@ var yyAct = [...]int{
 	0, 100, 75, 79, 74, 94, 108, 109, 73, 122,
 	68, 117, 67, 69, 116, 93, 106, 112, 90, 87,
 	66, 110, 88, 86, 82, 77, 0, 0, 0, 104,
-	114, 123, 95, 0, 118, 119, 120, 92, 70, 0,
-	0, 76, 0, 0, 0, 0, 0, 84, 0, 0,
-	103, 91, 0, 0, 63, 0, 83, 121, 99, 78,
-	115, 0, 0, 0, 0, 0, 0, 0, 61, 0,
-	0, 532, 0, 0, 533, 0, 0, 71, 0, 0,
+	114, 123, 0, 0, 118, 119, 120, 92, 70, 0,
+	0, 18, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 95, 0, 63, 0, 83, 121, 99, 78,
+	115, 76, 0, 0, 0, 0, 0, 84, 0, 0,
+	103, 91, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 40, 0, 0, 226, 0,
+	0, 0, 0, 0, 0, 0, 0, 71, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1094,28 +1084,28 @@ var yyAct = [...]int{
 	65, 111, 105, 89, 80, 81, 64, 0, 100, 75,
 	79, 74, 94, 108, 109, 73, 122, 68, 117, 67,
 	69, 116, 93, 106, 112, 90, 87, 66, 110, 88,
-	86, 82, 77, 0, 0, 0, 104, 114, 123, 0,
-	0, 118, 119, 120, 92, 70, 0, 0, 0, 0,
-	0, 0, 0, 95, 0, 0, 0, 381, 0, 0,
-	0, 63, 76, 83, 121, 99, 78, 115, 84, 0,
-	0, 103, 91, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 226,
-	0, 383, 0, 0, 0, 0, 0, 0, 71, 0,
+	86, 82, 77, 0, 0, 0, 104, 114, 123, 95,
+	0, 118, 119, 120, 92, 70, 0, 0, 76, 0,
+	0, 0, 0, 0, 84, 0, 0, 103, 91, 0,
+	0, 63, 0, 83, 121, 99, 78, 115, 0, 0,
+	0, 0, 0, 0, 0, 61, 0, 0, 534, 0,
+	0, 535, 0, 0, 71, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 224, 0, 0,
+	0, 0, 0, 98, 0, 0, 0, 72, 0, 102,
+	96, 113, 0, 97, 101, 85, 107, 65, 111, 105,
+	89, 80, 81, 64, 0, 100, 75, 79, 74, 94,
+	108, 109, 73, 122, 68, 117, 67, 69, 116, 93,
+	106, 112, 90, 87, 66, 110, 88, 86, 82, 77,
+	0, 0, 0, 104, 114, 123, 0, 0, 118, 119,
+	120, 92, 70, 0, 0, 0, 0, 0, 0, 0,
+	95, 0, 0, 0, 381, 0, 0, 0, 63, 76,
+	83, 121, 99, 78, 115, 84, 0, 0, 103, 91,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 224, 0, 0, 0, 0, 0, 98, 0, 0,
-	0, 72, 0, 102, 96, 113, 0, 97, 101, 85,
-	107, 65, 111, 105, 89, 80, 81, 64, 0, 100,
-	75, 79, 74, 94, 108, 109, 73, 122, 68, 117,
-	67, 69, 116, 93, 106, 112, 90, 87, 66, 110,
-	88, 86, 82, 77, 0, 0, 0, 104, 114, 123,
-	95, 0, 118, 119, 120, 92, 70, 0, 0, 76,
-	0, 0, 0, 0, 0, 84, 0, 0, 103, 91,
-	0, 0, 63, 0, 83, 121, 99, 78, 115, 0,
-	0, 0, 0, 40, 0, 0, 226, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 226, 0, 383, 0,
 	0, 0, 0, 0, 0, 71, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1131,7 +1121,7 @@ var yyAct = [...]int{
 	119, 120, 92, 70, 0, 0, 76, 0, 0, 0,
 	0, 0, 84, 0, 0, 103, 91, 0, 0, 63,
 	0, 83, 121, 99, 78, 115, 0, 0, 0, 0,
-	0, 0, 0, 61, 0, 793, 0, 0, 0, 0,
+	40, 0, 0, 226, 0, 0, 0, 0, 0, 0,
 	0, 0, 71, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1147,7 +1137,7 @@ var yyAct = [...]int{
 	70, 0, 0, 76, 0, 0, 0, 0, 0, 84,
 	0, 0, 103, 91, 0, 0, 63, 0, 83, 121,
 	99, 78, 115, 0, 0, 0, 0, 0, 0, 0,
-	226, 0, 383, 0, 0, 0, 0, 0, 0, 71,
+	61, 0, 795, 0, 0, 0, 0, 0, 0, 71,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1159,10 +1149,10 @@ var yyAct = [...]int{
 	100, 75, 79, 74, 94, 108, 109, 73, 122, 68,
 	117, 67, 69, 116, 93, 106, 112, 90, 87, 66,
 	110, 88, 86, 82, 77, 0, 0, 0, 104, 114,
-	123, 95, 0, 118, 119, 120, 92, 70, 0, 360,
+	123, 95, 0, 118, 119, 120, 92, 70, 0, 0,
 	76, 0, 0, 0, 0, 0, 84, 0, 0, 103,
 	91, 0, 0, 63, 0, 83, 121, 99, 78, 115,
-	0, 0, 0, 0, 0, 0, 0, 226, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 226, 0, 383,
 	0, 0, 0, 0, 0, 0, 71, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1174,27 +1164,27 @@ var yyAct = [...]int{
 	111, 105, 89, 80, 81, 64, 0, 100, 75, 79,
 	74, 94, 108, 109, 73, 122, 68, 117, 67, 69,
 	116, 93, 106, 112, 90, 87, 66, 110, 88, 86,
-	82, 77, 258, 0, 0, 104, 114, 123, 0, 95,
-	118, 119, 120, 92, 70, 0, 0, 0, 76, 0,
-	0, 0, 0, 0, 84, 0, 0, 103, 91, 0,
+	82, 77, 0, 0, 0, 104, 114, 123, 95, 0,
+	118, 119, 120, 92, 70, 0, 360, 76, 0, 0,
+	0, 0, 0, 84, 0, 0, 103, 91, 0, 0,
 	63, 0, 83, 121, 99, 78, 115, 0, 0, 0,
-	0, 0, 0, 0, 0, 226, 0, 0, 0, 0,
-	0, 0, 0, 0, 71, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 226, 0, 0, 0, 0, 0,
+	0, 0, 0, 71, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 224, 0, 0,
-	0, 0, 0, 98, 0, 0, 0, 72, 0, 102,
-	96, 113, 0, 97, 101, 85, 107, 65, 111, 105,
-	89, 80, 81, 64, 0, 100, 75, 79, 74, 94,
-	108, 109, 73, 122, 68, 117, 67, 69, 116, 93,
-	106, 112, 90, 87, 66, 110, 88, 86, 82, 77,
-	0, 0, 0, 104, 114, 123, 95, 0, 118, 119,
-	120, 92, 70, 0, 0, 76, 0, 0, 0, 0,
-	0, 84, 0, 0, 103, 91, 0, 0, 63, 0,
-	83, 121, 99, 78, 115, 0, 0, 0, 0, 0,
-	0, 0, 61, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 224, 0, 0, 0,
+	0, 0, 98, 0, 0, 0, 72, 0, 102, 96,
+	113, 0, 97, 101, 85, 107, 65, 111, 105, 89,
+	80, 81, 64, 0, 100, 75, 79, 74, 94, 108,
+	109, 73, 122, 68, 117, 67, 69, 116, 93, 106,
+	112, 90, 87, 66, 110, 88, 86, 82, 77, 258,
+	0, 0, 104, 114, 123, 0, 95, 118, 119, 120,
+	92, 70, 0, 0, 0, 76, 0, 0, 0, 0,
+	0, 84, 0, 0, 103, 91, 0, 63, 0, 83,
+	121, 99, 78, 115, 0, 0, 0, 0, 0, 0,
+	0, 0, 226, 0, 0, 0, 0, 0, 0, 0,
 	0, 71, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1209,7 +1199,7 @@ var yyAct = [...]int{
 	104, 114, 123, 95, 0, 118, 119, 120, 92, 70,
 	0, 0, 76, 0, 0, 0, 0, 0, 84, 0,
 	0, 103, 91, 0, 0, 63, 0, 83, 121, 99,
-	78, 115, 0, 0, 0, 0, 0, 0, 0, 270,
+	78, 115, 0, 0, 0, 0, 0, 0, 0, 61,
 	0, 0, 0, 0, 0, 0, 0, 0, 71, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1225,7 +1215,7 @@ var yyAct = [...]int{
 	95, 0, 118, 119, 120, 92, 70, 0, 0, 76,
 	0, 0, 0, 0, 0, 84, 0, 0, 103, 91,
 	0, 0, 63, 0, 83, 121, 99, 78, 115, 0,
-	0, 0, 0, 0, 0, 0, 226, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 270, 0, 0, 0,
 	0, 0, 0, 0, 0, 71, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1241,7 +1231,7 @@ var yyAct = [...]int{
 	119, 120, 92, 70, 0, 0, 76, 0, 0, 0,
 	0, 0, 84, 0, 0, 103, 91, 0, 0, 63,
 	0, 83, 121, 99, 78, 115, 0, 0, 0, 0,
-	0, 0, 0, 270, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 226, 0, 0, 0, 0, 0, 0,
 	0, 0, 71, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1251,29 +1241,44 @@ var yyAct = [...]int{
 	0, 98, 0, 0, 0, 72, 0, 102, 96, 113,
 	0, 97, 101, 85, 107, 65, 111, 105, 89, 80,
 	81, 64, 0, 100, 75, 79, 74, 94, 108, 109,
-	73, 122, 68, 117, 67, 264, 116, 93, 106, 112,
+	73, 122, 68, 117, 67, 69, 116, 93, 106, 112,
 	90, 87, 66, 110, 88, 86, 82, 77, 0, 0,
-	0, 104, 114, 123, 0, 0, 118, 119, 120, 265,
-	263, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 63, 0, 83, 121,
-	99, 78, 115,
+	0, 104, 114, 123, 95, 0, 118, 119, 120, 92,
+	70, 0, 0, 76, 0, 0, 0, 0, 0, 84,
+	0, 0, 103, 91, 0, 0, 63, 0, 83, 121,
+	99, 78, 115, 0, 0, 0, 0, 0, 0, 0,
+	270, 0, 0, 0, 0, 0, 0, 0, 0, 71,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 224, 0, 0, 0, 0, 0, 98, 0,
+	0, 0, 72, 0, 102, 96, 113, 0, 97, 101,
+	85, 107, 65, 111, 105, 89, 80, 81, 64, 0,
+	100, 75, 79, 74, 94, 108, 109, 73, 122, 68,
+	117, 67, 264, 116, 93, 106, 112, 90, 87, 66,
+	110, 88, 86, 82, 77, 0, 0, 0, 104, 114,
+	123, 0, 0, 118, 119, 120, 265, 263, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 63, 0, 83, 121, 99, 78, 115,
 }
 var yyPact = [...]int{
 
-	94, -1000, -160, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 709, 732, -1000, -1000,
-	-1000, -1000, -1000, 490, 4924, 2, 55, 34, 51, 3295,
-	6863, -1000, -1000, -1000, -1000, -1000, -1000, 516, -1000, -1000,
-	-1000, -1000, -1000, 687, 705, 523, 674, 570, -1000, -6,
-	5763, 6392, 7020, -1000, 365, 43, 6863, -117, -10, -1000,
+	108, -1000, -151, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 680, 697, -1000, -1000,
+	-1000, -1000, -1000, 483, 5021, 21, 56, 34, 55, 3392,
+	6960, -1000, -1000, -1000, -1000, -1000, -1000, 466, -1000, -1000,
+	-1000, -1000, -1000, 657, 675, 530, 650, 568, -1000, 18,
+	5860, 6489, 7117, -1000, 329, 42, 6960, -109, 16, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 46, 6863, -1000, 6863, -11, 354,
-	-11, 6863, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 51, 6960, -1000, 6960, 7, 298,
+	7, 6960, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
@@ -1283,151 +1288,151 @@ var yyPact = [...]int{
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 311, 662, 4227, 4227, 709, -1000,
-	516, -1000, -1000, -1000, 618, -1000, -1000, 199, 6234, 423,
-	604, -1000, -1000, -1000, 663, 5278, 5606, 91, 6863, 95,
-	-1000, 2701, 398, -1000, 629, -1000, -1000, 134, -1000, 90,
-	-1000, -1000, 379, -1000, 1444, 344, 2305, 7, 6863, 163,
-	6863, 2305, 5, 6863, 665, 510, 6863, -1000, -1000, -1000,
-	-1000, -1000, 728, 121, 302, -1000, 4227, 4775, 473, 473,
-	-1000, -1000, 64, -1000, -1000, 4581, 4581, 4581, 4581, 4581,
-	4581, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 473, 82, -1000, 4041, 473,
-	473, 473, 473, 473, 473, 4227, 473, 473, 473, 473,
-	473, 473, 473, 473, 473, 473, 473, 473, 473, 467,
-	-1000, 361, 687, 311, 570, 5435, 528, -1000, -1000, 526,
-	6863, -1000, 6706, 5763, 5763, 5763, 5763, -1000, 542, 539,
-	-1000, 565, 535, 600, 6863, -1000, 360, 311, 5278, 62,
-	-1000, 6077, -1000, -1000, 3097, 723, 5763, 6863, -1000, -1000,
-	-1000, -1000, -1000, 6706, -1000, 4227, 2899, 1909, 72, 225,
-	-91, -1000, -1000, 475, -1000, 475, 475, 475, 475, -68,
-	-68, -68, -68, -1000, -1000, -1000, -1000, -1000, 486, -1000,
-	475, 475, 475, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 485, 485, 485, 481, 481, -16, -1000, -1000, -1000,
-	6863, -1000, 664, 44, -1000, 6863, -1000, -1000, 6863, 2305,
-	-1000, 590, 4227, 4227, 173, 4227, 4227, 125, 4581, 238,
-	139, 4581, 4581, 4581, 4581, 4581, 4581, 4581, 4581, 4581,
-	4581, 4581, 4581, 4581, 4581, 4581, 272, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 343, -1000, 516, 573, 573,
-	99, 99, 99, 99, 99, 1344, 3481, 2899, 341, 194,
-	4041, 3667, 3667, 4227, 4227, 3667, 668, 155, 194, 6549,
-	-1000, 311, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 3667,
-	3667, 3667, 3667, 4227, -1000, -1000, -1000, 662, -1000, 668,
-	680, -1000, 625, 621, 3667, -1000, 509, 6706, 473, -1000,
-	5101, -1000, 487, 604, 497, 577, -1000, -1000, -1000, -1000,
-	538, -1000, 532, -1000, -1000, -1000, -1000, -1000, 311, -1000,
-	37, 12, 10, -1000, -1000, -1000, -1000, 709, 4227, 446,
-	-1000, -1000, -1000, 194, -1000, 79, -1000, 425, 1711, -1000,
-	-1000, -1000, -1000, -1000, -1000, 484, 638, 129, 338, -1000,
-	-1000, 632, -1000, 170, -93, -1000, -1000, 254, -68, -68,
-	-1000, -1000, 96, 628, 96, 96, 96, 265, -1000, -1000,
-	-1000, -1000, 239, -1000, -1000, -1000, 231, -1000, 494, 6549,
-	2305, -1000, -1000, 131, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -36, -1000, -1000, -1000,
-	578, 125, 152, -1000, -1000, 258, -1000, -1000, 194, 194,
-	990, -1000, -1000, -1000, -1000, 238, 4581, 4581, 4581, 666,
-	990, 971, 620, 415, 99, 210, 210, 98, 98, 98,
-	98, 98, 156, 156, -1000, -1000, -1000, 311, -1000, -1000,
-	-1000, 311, 3667, 416, -1000, -1000, 4767, 76, 473, 4227,
-	-1000, 310, 310, 110, 432, 310, 3667, 158, -1000, 4227,
-	311, -1000, 310, 311, 310, 310, -1000, -1000, 6863, -1000,
-	-1000, -1000, -1000, 431, -1000, 641, 395, 403, -1000, -1000,
-	3853, 311, 337, 75, 709, 4227, 4227, -1000, -1000, -1000,
-	473, 473, 473, 687, 194, -1000, 2701, 1909, -1000, 1909,
-	6549, -1000, 329, -1000, -1000, -87, 464, -1000, -1000, -1000,
-	374, 96, 96, -1000, 318, 154, -1000, -1000, -1000, 325,
-	-1000, 405, 323, 6863, -1000, -1000, -1000, 6863, -1000, -1000,
-	-1000, -1000, -1000, 6549, -1000, -1000, -1000, -1000, -1000, 666,
-	990, 580, -1000, 4581, 4581, -1000, -1000, 310, 3667, -1000,
-	-1000, 5920, -1000, -1000, 2503, 3667, 194, -1000, -1000, 17,
-	272, 17, -126, 482, 138, -1000, 4227, 218, -1000, -1000,
-	-1000, -1000, -1000, -1000, 723, 5763, 637, -1000, 473, -1000,
-	-1000, 437, 6549, 6549, 687, 194, 194, 6549, 6549, 6549,
-	-1000, -1000, 1711, -1000, 307, -1000, 475, -1000, 71, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 262, 224, -1000, 207, 2305, -1000, -1000, 658, -1000,
-	4581, 990, 990, -1000, -1000, -1000, -1000, 68, 311, 311,
-	475, 475, -1000, 475, 481, -1000, 475, -51, 475, -52,
-	311, 311, 473, -123, -1000, 194, 4227, 716, 404, 727,
-	-1000, 473, -1000, 516, 67, -1000, -1000, 303, -1000, 303,
-	303, -1000, 6549, -1000, 182, 636, -1000, 634, -1000, 368,
-	326, -1000, 473, 990, 2107, -1000, -1000, -1000, 30, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 4581, 311, 259,
-	194, 714, 690, 6706, 403, 311, 6549, -1000, 6549, -1000,
-	-1000, -1000, -1000, 226, -1000, -1000, -1000, -1000, -38, -1000,
-	-1000, -1000, 41, -1000, -1000, -1000, 4227, 4227, 398, -1000,
-	-1000, -1000, -1000, 300, -1000, 6549, 311, 22, -137, 194,
-	397, -1000, -38, 584, -1000, 574, -131, -144, -1000, -41,
-	-1000, 548, -1000, -44, -133, 473, -140, 4404, -148, 177,
-	311, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 332, 601, 4324, 4324, 680, -1000,
+	466, -1000, -1000, -1000, 589, -1000, -1000, 181, 6331, 428,
+	620, -1000, -1000, -1000, 647, 5375, 5703, 84, 6960, 120,
+	-1000, 2600, 372, -1000, 592, -1000, -1000, 119, -1000, 83,
+	-1000, -1000, 411, -1000, 1048, 283, 2204, 29, 6960, 139,
+	6960, 2204, 25, 6960, 616, 491, 6960, -1000, -1000, -1000,
+	-1000, -1000, 692, 98, 307, -1000, 4324, 1147, 434, 434,
+	-1000, -1000, 44, -1000, -1000, 4678, 4678, 4678, 4678, 4678,
+	4678, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 434, 79, -1000, 4138, 434,
+	434, 434, 434, 434, 434, 4324, 434, 434, 434, 434,
+	434, 434, 434, 434, 434, 434, 434, 434, 434, 432,
+	-1000, 285, 657, 332, 568, 5532, 502, -1000, -1000, 460,
+	6960, -1000, 6803, 5860, 5860, 5860, 5860, -1000, 526, 514,
+	-1000, 540, 539, 575, 6960, -1000, 402, 332, 5375, 80,
+	-1000, 6174, -1000, -1000, 3194, 688, 5860, 6960, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 6803, -1000, 4324, 2996, 1808,
+	93, 170, -84, -1000, -1000, 437, -1000, 437, 437, 437,
+	437, -63, -63, -63, -63, -1000, -1000, -1000, -1000, -1000,
+	479, -1000, 437, 437, 437, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 470, 470, 470, 438, 438, 3, -1000,
+	-1000, -1000, 6960, -1000, 613, 69, -1000, 6960, -1000, -1000,
+	6960, 2204, -1000, 567, 4324, 4324, 290, 4324, 4324, 114,
+	4678, 224, 201, 4678, 4678, 4678, 4678, 4678, 4678, 4678,
+	4678, 4678, 4678, 4678, 4678, 4678, 4678, 4678, 259, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 272, -1000, 466,
+	683, 683, 92, 92, 92, 92, 92, 1371, 3578, 2996,
+	396, 138, 4138, 3764, 3764, 4324, 4324, 3764, 651, 131,
+	138, 6646, -1000, 332, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 3764, 3764, 3764, 3764, 4324, -1000, -1000, -1000, 601,
+	-1000, 651, 674, -1000, 587, 579, 3764, -1000, 490, 6803,
+	434, -1000, 5198, -1000, 467, 620, 464, 482, -1000, -1000,
+	-1000, -1000, 512, -1000, 506, -1000, -1000, -1000, -1000, -1000,
+	332, -1000, 40, 39, 38, -1000, -1000, -1000, -1000, 680,
+	4324, 463, -1000, -1000, -1000, 138, -1000, 78, -1000, 429,
+	1600, -1000, -1000, -1000, -1000, -1000, -1000, 465, 606, 149,
+	266, -1000, -1000, 596, -1000, 147, -86, -1000, -1000, 233,
+	-63, -63, -1000, -1000, 89, 591, 89, 89, 89, 246,
+	-1000, -1000, -1000, -1000, 229, -1000, -1000, -1000, 223, -1000,
+	456, 6646, 2204, -1000, -1000, 112, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -12, -1000,
+	-1000, -1000, 545, 114, 145, -1000, -1000, 297, -1000, -1000,
+	138, 138, 1039, -1000, -1000, -1000, -1000, 224, 4678, 4678,
+	4678, 155, 1039, 978, 1062, 1003, 92, 171, 171, 91,
+	91, 91, 91, 91, 583, 583, -1000, -1000, -1000, 332,
+	-1000, -1000, -1000, 332, 3764, 419, -1000, -1000, 4864, 77,
+	434, 4324, -1000, 337, 337, 75, 194, 337, 3764, 232,
+	-1000, 4324, 332, -1000, 337, 332, 337, 337, -1000, -1000,
+	6960, -1000, -1000, -1000, -1000, 461, -1000, 602, 366, 398,
+	-1000, -1000, 3950, 332, 390, 72, 680, 4324, 4324, -1000,
+	-1000, -1000, 434, 434, 434, 657, 138, -1000, 2798, 1808,
+	-1000, 1808, 6646, -1000, 264, -1000, -1000, -80, 321, -1000,
+	-1000, -1000, 356, 89, 89, -1000, 249, 156, -1000, -1000,
+	-1000, 345, -1000, 416, 341, 6960, -1000, -1000, -1000, 6960,
+	-1000, -1000, -1000, -1000, -1000, 6646, -1000, -1000, -1000, -1000,
+	-1000, 155, 1039, 945, -1000, 4678, 4678, -1000, -1000, 337,
+	3764, -1000, -1000, 6017, -1000, -1000, 2402, 3764, 138, -1000,
+	-1000, 15, 259, 15, -127, 455, 127, -1000, 4324, 236,
+	-1000, -1000, -1000, -1000, -1000, -1000, 688, 5860, 605, -1000,
+	434, -1000, -1000, 414, 6646, 6646, 657, 138, 138, 6646,
+	6646, 6646, -1000, -1000, 1600, -1000, 319, -1000, 437, -1000,
+	102, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 242, 219, -1000, 202, 2204, -1000, -1000,
+	609, -1000, 4678, 1039, 1039, -1000, -1000, -1000, -1000, 68,
+	332, 332, 437, 437, -1000, 437, 438, -1000, 437, -45,
+	437, -47, 332, 332, 434, -114, -1000, 138, 4324, 684,
+	404, 687, -1000, 434, -1000, 466, 65, -1000, -1000, 276,
+	-1000, 276, 276, -1000, 6646, -1000, 163, 603, -1000, 600,
+	-1000, 354, 334, -1000, 434, 1039, 2006, -1000, -1000, -1000,
+	37, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 4678,
+	332, 239, 138, 676, 673, 6803, 398, 332, 6646, -1000,
+	6646, -1000, -1000, -1000, -1000, 225, -1000, -1000, -1000, -1000,
+	-19, -1000, -1000, -1000, 11, -1000, -1000, -1000, 4324, 4324,
+	372, -1000, -1000, -1000, -1000, 271, -1000, 6646, 332, 36,
+	-142, 138, 360, -1000, -19, 544, -1000, 536, -132, -145,
+	-1000, -22, -1000, 533, -1000, -38, -139, 434, -143, 4501,
+	-147, 556, 332, -1000, -1000, -1000,
 }
 var yyPgo = [...]int{
 
-	0, 952, 23, 560, 951, 950, 948, 947, 945, 938,
-	936, 934, 929, 925, 922, 921, 919, 918, 916, 55,
-	915, 914, 909, 44, 906, 49, 905, 902, 27, 47,
-	21, 32, 503, 897, 18, 42, 50, 896, 895, 891,
-	40, 888, 926, 887, 881, 880, 7, 13, 879, 878,
-	877, 876, 37, 127, 874, 871, 870, 868, 866, 865,
-	35, 4, 8, 6, 14, 861, 94, 9, 860, 31,
-	855, 854, 853, 852, 20, 851, 39, 847, 15, 33,
-	846, 30, 10, 843, 48, 842, 537, 838, 96, 835,
-	831, 830, 829, 827, 815, 54, 34, 303, 74, 17,
-	810, 889, 25, 45, 806, 805, 79, 19, 22, 16,
-	804, 803, 797, 796, 795, 794, 793, 56, 790, 789,
-	12, 28, 788, 787, 52, 11, 783, 782, 779, 778,
-	41, 777, 36, 776, 773, 770, 29, 26, 769, 5,
-	752, 751, 2, 748, 746, 742, 0, 3, 739, 738,
-	150,
+	0, 895, 23, 558, 893, 890, 888, 884, 883, 882,
+	881, 880, 878, 877, 876, 873, 870, 868, 867, 50,
+	862, 861, 857, 48, 856, 55, 854, 853, 27, 30,
+	25, 26, 600, 851, 16, 74, 47, 850, 849, 846,
+	63, 845, 511, 844, 836, 833, 8, 31, 832, 831,
+	830, 829, 68, 121, 826, 825, 814, 812, 811, 808,
+	35, 4, 7, 6, 14, 807, 94, 9, 806, 32,
+	805, 803, 802, 801, 37, 799, 36, 794, 15, 41,
+	791, 29, 10, 789, 43, 785, 561, 779, 124, 778,
+	775, 772, 771, 769, 767, 19, 34, 174, 44, 21,
+	766, 765, 891, 22, 53, 763, 761, 42, 13, 17,
+	18, 759, 758, 757, 756, 754, 753, 750, 84, 749,
+	744, 11, 33, 743, 736, 40, 12, 731, 730, 725,
+	724, 45, 722, 39, 721, 720, 719, 28, 20, 718,
+	5, 716, 713, 2, 712, 707, 705, 0, 3, 704,
+	703, 157,
 }
 var yyR1 = [...]int{
 
-	0, 144, 145, 145, 1, 1, 1, 1, 1, 1,
+	0, 145, 146, 146, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
 	3, 4, 4, 5, 5, 6, 6, 22, 22, 7,
-	8, 8, 148, 148, 38, 38, 9, 9, 83, 83,
-	83, 10, 10, 10, 10, 14, 133, 134, 134, 134,
-	130, 111, 111, 111, 114, 114, 112, 112, 112, 112,
-	112, 112, 112, 113, 113, 113, 113, 113, 115, 115,
-	115, 115, 115, 116, 116, 116, 116, 116, 116, 116,
-	116, 116, 116, 116, 116, 116, 116, 129, 129, 117,
-	117, 124, 124, 125, 125, 125, 122, 122, 123, 123,
-	126, 126, 126, 118, 118, 118, 118, 118, 127, 127,
-	120, 120, 120, 121, 121, 128, 128, 128, 128, 128,
-	119, 119, 131, 138, 138, 138, 138, 132, 132, 140,
-	140, 139, 135, 135, 135, 136, 136, 136, 137, 137,
-	137, 11, 11, 11, 11, 11, 143, 141, 141, 142,
-	142, 12, 13, 13, 13, 15, 110, 110, 110, 16,
-	17, 18, 18, 18, 18, 18, 18, 149, 19, 20,
-	20, 21, 21, 21, 25, 25, 25, 23, 23, 24,
-	24, 30, 30, 29, 29, 31, 31, 31, 31, 100,
-	100, 100, 99, 99, 33, 33, 34, 34, 35, 35,
-	36, 36, 36, 44, 37, 37, 37, 37, 105, 105,
-	104, 104, 104, 103, 103, 39, 39, 39, 39, 40,
-	40, 40, 40, 41, 41, 43, 43, 42, 42, 45,
-	45, 45, 45, 46, 46, 47, 47, 32, 32, 32,
-	32, 32, 32, 32, 87, 87, 49, 49, 48, 48,
-	48, 48, 48, 48, 48, 48, 48, 48, 59, 59,
-	59, 59, 59, 59, 50, 50, 50, 50, 50, 50,
-	50, 28, 28, 60, 60, 60, 66, 61, 61, 53,
+	8, 8, 149, 149, 38, 38, 9, 9, 83, 83,
+	83, 101, 101, 10, 10, 10, 10, 14, 134, 135,
+	135, 135, 131, 112, 112, 112, 115, 115, 113, 113,
+	113, 113, 113, 113, 113, 114, 114, 114, 114, 114,
+	116, 116, 116, 116, 116, 117, 117, 117, 117, 117,
+	117, 117, 117, 117, 117, 117, 117, 117, 117, 130,
+	130, 118, 118, 125, 125, 126, 126, 126, 123, 123,
+	124, 124, 127, 127, 127, 119, 119, 119, 119, 119,
+	128, 128, 121, 121, 121, 122, 122, 129, 129, 129,
+	129, 129, 120, 120, 132, 139, 139, 139, 139, 133,
+	133, 141, 141, 140, 136, 136, 136, 137, 137, 137,
+	138, 138, 138, 11, 11, 11, 11, 11, 144, 142,
+	142, 143, 143, 12, 13, 13, 13, 15, 111, 111,
+	111, 16, 17, 18, 18, 18, 18, 18, 18, 150,
+	19, 20, 20, 21, 21, 21, 25, 25, 25, 23,
+	23, 24, 24, 30, 30, 29, 29, 31, 31, 31,
+	31, 100, 100, 100, 99, 99, 33, 33, 34, 34,
+	35, 35, 36, 36, 36, 44, 37, 37, 37, 37,
+	106, 106, 105, 105, 105, 104, 104, 39, 39, 39,
+	39, 40, 40, 40, 40, 41, 41, 43, 43, 42,
+	42, 45, 45, 45, 45, 46, 46, 47, 47, 32,
+	32, 32, 32, 32, 32, 32, 87, 87, 49, 49,
+	48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+	59, 59, 59, 59, 59, 59, 50, 50, 50, 50,
+	50, 50, 50, 28, 28, 60, 60, 60, 66, 61,
+	61, 53, 53, 53, 53, 53, 53, 53, 53, 53,
 	53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
 	53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-	53, 53, 53, 53, 53, 53, 53, 53, 53, 57,
-	57, 57, 55, 55, 55, 55, 55, 55, 55, 55,
-	55, 56, 56, 56, 56, 56, 56, 56, 56, 150,
-	150, 58, 58, 58, 58, 26, 26, 26, 26, 26,
-	108, 108, 109, 109, 109, 109, 109, 109, 109, 109,
-	109, 109, 109, 109, 109, 70, 70, 27, 27, 68,
-	68, 69, 71, 71, 67, 67, 67, 52, 52, 52,
-	52, 52, 52, 52, 52, 54, 54, 54, 72, 72,
-	73, 73, 74, 74, 75, 75, 76, 77, 77, 77,
-	78, 78, 78, 78, 79, 79, 79, 51, 51, 51,
-	51, 51, 51, 80, 80, 80, 80, 81, 81, 62,
-	62, 64, 64, 63, 65, 82, 82, 84, 85, 85,
-	88, 88, 89, 89, 86, 86, 90, 90, 90, 90,
-	90, 90, 90, 90, 90, 90, 90, 91, 91, 91,
-	92, 92, 93, 93, 93, 94, 94, 97, 97, 98,
-	98, 101, 101, 102, 102, 95, 95, 95, 95, 95,
+	53, 57, 57, 57, 55, 55, 55, 55, 55, 55,
+	55, 55, 55, 56, 56, 56, 56, 56, 56, 56,
+	56, 151, 151, 58, 58, 58, 58, 26, 26, 26,
+	26, 26, 109, 109, 110, 110, 110, 110, 110, 110,
+	110, 110, 110, 110, 110, 110, 110, 70, 70, 27,
+	27, 68, 68, 69, 71, 71, 67, 67, 67, 52,
+	52, 52, 52, 52, 52, 52, 52, 54, 54, 54,
+	72, 72, 73, 73, 74, 74, 75, 75, 76, 77,
+	77, 77, 78, 78, 78, 78, 79, 79, 79, 51,
+	51, 51, 51, 51, 51, 80, 80, 80, 80, 81,
+	81, 62, 62, 64, 64, 63, 65, 82, 82, 84,
+	85, 85, 88, 88, 89, 89, 86, 86, 90, 90,
+	90, 90, 90, 90, 90, 90, 90, 90, 90, 91,
+	91, 91, 92, 92, 93, 93, 93, 94, 94, 97,
+	97, 98, 98, 102, 102, 103, 103, 95, 95, 95,
 	95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
 	95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
 	95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
@@ -1436,14 +1441,14 @@ var yyR1 = [...]int{
 	95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
 	95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
 	95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
-	95, 95, 95, 96, 96, 96, 96, 96, 96, 96,
+	95, 95, 95, 95, 95, 96, 96, 96, 96, 96,
 	96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
 	96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
 	96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
 	96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
 	96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-	96, 96, 96, 96, 96, 146, 147, 106, 107, 107,
-	107,
+	96, 96, 96, 96, 96, 96, 96, 147, 148, 107,
+	108, 108, 108,
 }
 var yyR2 = [...]int{
 
@@ -1451,47 +1456,47 @@ var yyR2 = [...]int{
 	1, 1, 1, 1, 1, 1, 1, 4, 6, 7,
 	10, 1, 3, 1, 3, 6, 7, 1, 1, 8,
 	7, 6, 1, 1, 1, 3, 5, 3, 1, 2,
-	1, 2, 8, 4, 6, 4, 4, 1, 3, 3,
-	7, 3, 1, 1, 2, 1, 1, 1, 1, 1,
-	1, 1, 1, 2, 2, 2, 2, 2, 1, 2,
-	2, 2, 1, 4, 4, 2, 2, 3, 3, 3,
-	3, 1, 1, 1, 1, 1, 4, 1, 3, 0,
-	3, 0, 5, 0, 3, 5, 0, 1, 0, 1,
-	0, 1, 2, 0, 2, 2, 2, 2, 0, 1,
-	0, 3, 3, 0, 2, 0, 2, 1, 2, 1,
-	0, 2, 4, 2, 3, 2, 2, 1, 1, 1,
-	3, 2, 0, 1, 3, 1, 2, 3, 1, 1,
-	1, 6, 7, 7, 4, 5, 7, 1, 3, 8,
-	8, 5, 4, 5, 5, 3, 1, 1, 1, 3,
-	2, 2, 2, 2, 2, 2, 2, 0, 2, 0,
-	2, 1, 2, 2, 0, 1, 1, 0, 1, 0,
-	1, 0, 1, 1, 3, 1, 2, 3, 5, 0,
-	1, 2, 1, 1, 0, 2, 1, 3, 1, 1,
-	1, 3, 3, 3, 3, 5, 5, 3, 0, 1,
-	0, 1, 2, 1, 1, 1, 2, 2, 1, 2,
-	3, 2, 3, 2, 2, 2, 1, 1, 3, 0,
-	5, 5, 5, 1, 3, 0, 2, 1, 3, 3,
-	2, 3, 1, 2, 0, 3, 1, 1, 3, 3,
-	4, 4, 5, 3, 4, 5, 6, 2, 1, 2,
-	1, 2, 1, 2, 1, 1, 1, 1, 1, 1,
-	1, 0, 2, 1, 1, 1, 3, 1, 3, 1,
-	1, 1, 1, 1, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 3, 3, 3, 3, 3, 3, 2,
-	2, 2, 2, 2, 3, 1, 1, 1, 1, 4,
-	5, 6, 4, 4, 6, 6, 6, 9, 7, 5,
-	4, 2, 2, 2, 2, 2, 2, 2, 2, 0,
-	2, 4, 4, 4, 4, 0, 3, 4, 7, 3,
-	1, 1, 2, 3, 3, 1, 2, 2, 1, 2,
-	1, 2, 2, 1, 2, 0, 1, 0, 2, 1,
-	2, 4, 0, 2, 1, 3, 5, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 2, 2, 0, 3,
-	0, 2, 0, 3, 1, 3, 2, 0, 1, 1,
-	0, 2, 4, 4, 0, 2, 4, 2, 1, 3,
-	5, 4, 6, 1, 3, 3, 5, 0, 5, 1,
-	3, 1, 2, 3, 1, 1, 3, 3, 1, 1,
-	0, 2, 0, 3, 0, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
-	1, 1, 0, 1, 1, 0, 2, 1, 1, 1,
+	1, 1, 1, 2, 8, 4, 6, 4, 4, 1,
+	3, 3, 7, 3, 1, 1, 2, 1, 1, 1,
+	1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
+	1, 2, 2, 2, 1, 4, 4, 2, 2, 3,
+	3, 3, 3, 1, 1, 1, 1, 1, 4, 1,
+	3, 0, 3, 0, 5, 0, 3, 5, 0, 1,
+	0, 1, 0, 1, 2, 0, 2, 2, 2, 2,
+	0, 1, 0, 3, 3, 0, 2, 0, 2, 1,
+	2, 1, 0, 2, 4, 2, 3, 2, 2, 1,
+	1, 1, 3, 2, 0, 1, 3, 1, 2, 3,
+	1, 1, 1, 6, 7, 7, 4, 5, 7, 1,
+	3, 8, 8, 5, 4, 5, 5, 3, 1, 1,
+	1, 3, 2, 2, 2, 2, 2, 2, 2, 0,
+	2, 0, 2, 1, 2, 2, 0, 1, 1, 0,
+	1, 0, 1, 0, 1, 1, 3, 1, 2, 3,
+	5, 0, 1, 2, 1, 1, 0, 2, 1, 3,
+	1, 1, 1, 3, 3, 3, 3, 5, 5, 3,
+	0, 1, 0, 1, 2, 1, 1, 1, 2, 2,
+	1, 2, 3, 2, 3, 2, 2, 2, 1, 1,
+	3, 0, 5, 5, 5, 1, 3, 0, 2, 1,
+	3, 3, 2, 3, 1, 2, 0, 3, 1, 1,
+	3, 3, 4, 4, 5, 3, 4, 5, 6, 2,
+	1, 2, 1, 2, 1, 2, 1, 1, 1, 1,
+	1, 1, 1, 0, 2, 1, 1, 1, 3, 1,
+	3, 1, 1, 1, 1, 1, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+	3, 2, 2, 2, 2, 2, 3, 1, 1, 1,
+	1, 4, 5, 6, 4, 4, 6, 6, 6, 9,
+	7, 5, 4, 2, 2, 2, 2, 2, 2, 2,
+	2, 0, 2, 4, 4, 4, 4, 0, 3, 4,
+	7, 3, 1, 1, 2, 3, 3, 1, 2, 2,
+	1, 2, 1, 2, 2, 1, 2, 0, 1, 0,
+	2, 1, 2, 4, 0, 2, 1, 3, 5, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
+	0, 3, 0, 2, 0, 3, 1, 3, 2, 0,
+	1, 1, 0, 2, 4, 4, 0, 2, 4, 2,
+	1, 3, 5, 4, 6, 1, 3, 3, 5, 0,
+	5, 1, 3, 1, 2, 3, 1, 1, 3, 3,
+	1, 1, 0, 2, 0, 3, 0, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+	1, 1, 1, 1, 0, 1, 1, 0, 2, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -1507,17 +1512,17 @@ var yyR2 = [...]int{
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 0, 0, 1,
-	1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+	0, 1, 1,
 }
 var yyChk = [...]int{
 
-	-1000, -144, -1, -2, -6, -7, -8, -9, -10, -11,
+	-1000, -145, -1, -2, -6, -7, -8, -9, -10, -11,
 	-12, -13, -15, -16, -17, -18, -3, -4, 6, -22,
 	8, 9, 29, -14, 108, 109, 111, 110, 112, 122,
-	47, 24, 123, 124, 127, 128, 129, -146, 7, 190,
-	50, -145, 203, -74, 14, -21, 5, -19, -149, -19,
-	-19, -19, -19, -133, 50, -93, 115, 67, 113, 119,
+	47, 24, 123, 124, 127, 128, 129, -147, 7, 190,
+	50, -146, 203, -74, 14, -21, 5, -19, -150, -19,
+	-19, -19, -19, -134, 50, -93, 115, 67, 113, 119,
 	-97, 53, -96, 196, 141, 135, 162, 154, 152, 155,
 	180, 62, 125, 150, 146, 144, 26, 167, 201, 145,
 	139, 140, 166, 198, 32, 133, 165, 161, 164, 138,
@@ -1525,7 +1530,7 @@ var yyChk = [...]int{
 	143, 132, 127, 35, 171, 137, 158, 134, 148, 149,
 	163, 136, 159, 129, 172, 202, 156, 153, 176, 177,
 	178, 199, 151, 173, -86, 115, 117, 113, 113, 114,
-	115, 113, -110, 53, -95, -96, 68, 21, 23, 169,
+	115, 113, -111, 53, -95, -96, 68, 21, 23, 169,
 	71, 103, 15, 72, 102, 191, 108, 45, 183, 184,
 	181, 182, 174, 28, 9, 24, 123, 20, 96, 110,
 	75, 76, 126, 22, 124, 66, 18, 48, 10, 12,
@@ -1534,187 +1539,187 @@ var yyChk = [...]int{
 	98, 46, 33, 69, 64, 49, 67, 14, 44, 86,
 	111, 190, 42, 6, 194, 29, 122, 40, 113, 175,
 	74, 116, 65, 5, 119, 8, 47, 120, 187, 188,
-	189, 31, 73, 11, 115, -101, 53, -96, -106, -106,
-	-106, -106, -106, -106, -2, -78, 16, 15, -5, -3,
-	-146, 6, 19, 20, -25, 37, 38, -20, -86, -34,
-	-35, -36, -37, -44, -66, -146, -42, -101, 10, -38,
-	-42, -83, -82, 180, 155, 179, -84, -67, -97, -101,
-	53, -96, -134, -130, 53, 114, -42, 190, -89, 118,
-	113, -42, -42, -88, 118, 53, -88, -42, -106, -147,
+	189, 31, 73, 11, 115, -102, 53, -96, -107, -107,
+	-107, -107, -107, -107, -2, -78, 16, 15, -5, -3,
+	-147, 6, 19, 20, -25, 37, 38, -20, -86, -34,
+	-35, -36, -37, -44, -66, -147, -42, -102, 10, -38,
+	-42, -83, -82, 180, 155, 179, -84, -67, -97, -102,
+	53, -96, -135, -131, 53, 114, -42, 190, -89, 118,
+	113, -42, -42, -88, 118, 53, -88, -42, -107, -148,
 	52, -79, 18, 30, -32, -48, 69, -53, 28, 22,
 	-52, -49, -67, -65, -66, 103, 92, 93, 100, 70,
 	104, -57, -55, -56, -58, 55, 54, 63, 56, 57,
-	58, 59, 64, 65, 66, -97, -101, -63, -146, 41,
+	58, 59, 64, 65, 66, -97, -102, -63, -147, 41,
 	42, 191, 192, 195, 193, 72, 31, 181, 189, 188,
 	187, 185, 186, 183, 184, 118, 182, 98, 190, -75,
 	-76, -32, -74, -2, -19, 33, -23, 20, 61, -43,
 	25, -42, 29, 51, -39, -40, -41, 39, 43, 45,
-	40, 41, 42, 46, -105, 21, -34, -2, -146, -104,
-	-103, 21, -101, 55, 105, -42, -148, 51, 10, 120,
-	-98, -97, -95, 51, 29, 77, 105, 52, 51, -111,
-	-114, -116, -115, -112, -113, 152, 153, 103, 156, 158,
-	159, 160, 161, 162, 163, 164, 165, 166, 167, 125,
-	148, 149, 150, 151, 135, 136, 137, 138, 139, 140,
-	141, 143, 144, 145, 146, 147, 53, -107, -146, -98,
-	115, -42, 69, -42, -107, 116, -42, 22, 49, -42,
-	8, 87, 68, 67, 84, 51, 17, -32, -50, 87,
-	69, 85, 86, 71, 89, 88, 99, 92, 93, 94,
-	95, 96, 97, 98, 90, 91, 102, 77, 78, 79,
-	80, 81, 82, 83, -87, -146, -66, -146, 106, 107,
-	-53, -53, -53, -53, -53, -53, -146, 105, -61, -32,
-	-146, -146, -146, -146, -146, -146, -146, -70, -32, -146,
-	-150, -146, -150, -150, -150, -150, -150, -150, -150, -146,
-	-146, -146, -146, 51, -77, 23, 24, -78, -147, -25,
-	-54, -97, 56, 59, -24, 40, -51, 29, 31, -2,
-	-146, -42, -82, -35, -36, -35, -36, 39, 39, 39,
-	44, 39, 44, 39, -40, -101, -147, -147, -2, -45,
-	47, 117, 48, -103, -102, -101, -95, -47, 11, -34,
-	-42, -106, -84, -32, -98, -102, -95, -135, -136, -137,
-	-98, 55, 56, -130, -131, -138, 121, 119, -132, 114,
-	27, -126, 64, 69, -122, 172, -117, 50, -117, -117,
-	-117, -117, -120, 155, -120, -120, -120, 50, -117, -117,
-	-117, -124, 50, -124, -124, -125, 50, -125, -94, 120,
-	-42, 22, -90, 111, -143, 109, 169, 155, 62, 28,
-	110, 14, 191, 131, 202, 53, 132, -42, -42, -107,
-	35, -32, -32, -59, 64, 69, 65, 66, -32, -32,
-	-53, -60, -63, -66, 60, 87, 85, 86, 71, -53,
-	-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-	-53, -53, -53, -53, -108, 53, 55, 53, -52, -52,
-	-97, -30, 20, -29, -31, 94, -32, -101, -98, 51,
-	-147, -29, -29, -32, -32, -29, -23, -68, -69, 73,
-	-97, -147, -29, -30, -29, -29, -76, -79, -85, 18,
-	10, 31, 31, -29, -81, 49, -82, -62, -64, -63,
-	-146, -2, -80, -97, -47, 49, 49, 39, 39, -147,
-	114, 114, 114, -74, -32, -47, 105, 51, -137, 77,
-	50, 27, -132, 53, 53, -118, 28, 64, -123, 173,
-	56, -120, -120, -121, 102, 29, -121, -121, -121, -129,
-	55, 56, 56, 49, -97, -107, -106, -91, -92, 116,
-	21, 114, 27, 131, 36, 64, 65, 66, -60, -53,
-	-53, -53, -28, 126, 68, -147, -147, -29, 51, -100,
-	-99, 21, -97, 55, 105, -146, -32, -147, -147, 51,
-	120, 21, -147, -29, -71, -69, 75, -32, -147, -147,
-	-147, -147, -147, -42, -33, 10, 26, -81, 51, -147,
-	-147, -147, 51, 105, -74, -32, -32, -146, -146, -146,
-	-78, -98, -136, -137, -140, -139, -97, 53, -127, 169,
-	55, 56, 57, 64, 52, -121, -121, 53, 53, 103,
-	52, 51, 51, 52, 51, -42, -42, -106, -97, -28,
-	68, -53, -53, -147, -31, -99, 94, -102, -30, -109,
-	103, 152, 125, 150, 146, 166, 157, 171, 148, 172,
-	-108, -109, 196, -74, 76, -32, 74, -47, -34, 27,
-	-64, 31, -2, -146, -97, -97, -78, -46, -97, -46,
-	-46, 52, 51, -117, -128, 121, 27, 119, 55, 56,
-	56, -107, 25, -53, 105, -147, -147, -117, -117, -117,
-	-125, -117, 140, -117, 140, -147, -147, -146, -27, 194,
-	-32, -72, 12, 8, -62, -2, 105, -147, 51, -147,
-	-147, -139, -119, 62, 27, 27, 52, 52, -146, 94,
-	-120, 53, -53, -147, 55, -73, 13, 15, -82, -147,
-	-97, -97, 55, -141, -142, 131, -26, 87, 199, -32,
-	-61, -147, 51, -97, -147, 197, 46, 200, -142, 31,
-	36, 198, 201, 133, 36, 134, 199, -146, 200, -53,
-	130, 201, -147, -147,
+	40, 41, 42, 46, -106, 21, -34, -2, -147, -105,
+	-104, 21, -102, 55, 105, -42, -149, 51, 10, 120,
+	-101, -98, 55, -97, -95, 51, 29, 77, 105, 52,
+	51, -112, -115, -117, -116, -113, -114, 152, 153, 103,
+	156, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+	167, 125, 148, 149, 150, 151, 135, 136, 137, 138,
+	139, 140, 141, 143, 144, 145, 146, 147, 53, -108,
+	-147, -98, 115, -42, 69, -42, -108, 116, -42, 22,
+	49, -42, 8, 87, 68, 67, 84, 51, 17, -32,
+	-50, 87, 69, 85, 86, 71, 89, 88, 99, 92,
+	93, 94, 95, 96, 97, 98, 90, 91, 102, 77,
+	78, 79, 80, 81, 82, 83, -87, -147, -66, -147,
+	106, 107, -53, -53, -53, -53, -53, -53, -147, 105,
+	-61, -32, -147, -147, -147, -147, -147, -147, -147, -70,
+	-32, -147, -151, -147, -151, -151, -151, -151, -151, -151,
+	-151, -147, -147, -147, -147, 51, -77, 23, 24, -78,
+	-148, -25, -54, -97, 56, 59, -24, 40, -51, 29,
+	31, -2, -147, -42, -82, -35, -36, -35, -36, 39,
+	39, 39, 44, 39, 44, 39, -40, -102, -148, -148,
+	-2, -45, 47, 117, 48, -104, -103, -102, -95, -47,
+	11, -34, -42, -107, -84, -32, -98, -103, -95, -136,
+	-137, -138, -98, 55, 56, -131, -132, -139, 121, 119,
+	-133, 114, 27, -127, 64, 69, -123, 172, -118, 50,
+	-118, -118, -118, -118, -121, 155, -121, -121, -121, 50,
+	-118, -118, -118, -125, 50, -125, -125, -126, 50, -126,
+	-94, 120, -42, 22, -90, 111, -144, 109, 169, 155,
+	62, 28, 110, 14, 191, 131, 202, 53, 132, -42,
+	-42, -108, 35, -32, -32, -59, 64, 69, 65, 66,
+	-32, -32, -53, -60, -63, -66, 60, 87, 85, 86,
+	71, -53, -53, -53, -53, -53, -53, -53, -53, -53,
+	-53, -53, -53, -53, -53, -53, -109, 53, 55, 53,
+	-52, -52, -97, -30, 20, -29, -31, 94, -32, -102,
+	-98, 51, -148, -29, -29, -32, -32, -29, -23, -68,
+	-69, 73, -97, -148, -29, -30, -29, -29, -76, -79,
+	-85, 18, 10, 31, 31, -29, -81, 49, -82, -62,
+	-64, -63, -147, -2, -80, -97, -47, 49, 49, 39,
+	39, -148, 114, 114, 114, -74, -32, -47, 105, 51,
+	-138, 77, 50, 27, -133, 53, 53, -119, 28, 64,
+	-124, 173, 56, -121, -121, -122, 102, 29, -122, -122,
+	-122, -130, 55, 56, 56, 49, -97, -108, -107, -91,
+	-92, 116, 21, 114, 27, 131, 36, 64, 65, 66,
+	-60, -53, -53, -53, -28, 126, 68, -148, -148, -29,
+	51, -100, -99, 21, -97, 55, 105, -147, -32, -148,
+	-148, 51, 120, 21, -148, -29, -71, -69, 75, -32,
+	-148, -148, -148, -148, -148, -42, -33, 10, 26, -81,
+	51, -148, -148, -148, 51, 105, -74, -32, -32, -147,
+	-147, -147, -78, -98, -137, -138, -141, -140, -97, 53,
+	-128, 169, 55, 56, 57, 64, 52, -122, -122, 53,
+	53, 103, 52, 51, 51, 52, 51, -42, -42, -107,
+	-97, -28, 68, -53, -53, -148, -31, -99, 94, -103,
+	-30, -110, 103, 152, 125, 150, 146, 166, 157, 171,
+	148, 172, -109, -110, 196, -74, 76, -32, 74, -47,
+	-34, 27, -64, 31, -2, -147, -97, -97, -78, -46,
+	-97, -46, -46, 52, 51, -118, -129, 121, 27, 119,
+	55, 56, 56, -108, 25, -53, 105, -148, -148, -118,
+	-118, -118, -126, -118, 140, -118, 140, -148, -148, -147,
+	-27, 194, -32, -72, 12, 8, -62, -2, 105, -148,
+	51, -148, -148, -140, -120, 62, 27, 27, 52, 52,
+	-147, 94, -121, 53, -53, -148, 55, -73, 13, 15,
+	-82, -148, -97, -97, 55, -142, -143, 131, -26, 87,
+	199, -32, -61, -148, 51, -97, -148, 197, 46, 200,
+	-143, 31, 36, 198, 201, 133, 36, 134, 199, -147,
+	200, -53, 130, 201, -148, -148,
 }
 var yyDef = [...]int{
 
 	0, -2, 2, -2, 5, 6, 7, 8, 9, 10,
-	11, 12, 13, 14, 15, 16, 382, 0, 167, 167,
-	167, 167, 167, 0, 442, 424, 0, 0, 0, 0,
-	0, 607, 607, 607, 607, 607, 607, 0, 27, 28,
-	605, 1, 3, 390, 0, 0, 171, 174, 169, 424,
-	0, 0, 0, 41, 0, 0, 598, 0, 422, 443,
-	444, 447, 448, 543, 544, 545, 546, 547, 548, 549,
-	550, 551, 552, 553, 554, 555, 556, 557, 558, 559,
-	560, 561, 562, 563, 564, 565, 566, 567, 568, 569,
-	570, 571, 572, 573, 574, 575, 576, 577, 578, 579,
-	580, 581, 582, 583, 584, 585, 586, 587, 588, 589,
-	590, 591, 592, 593, 594, 595, 596, 597, 599, 600,
-	601, 602, 603, 604, 0, 0, 425, 0, 420, 0,
-	420, 0, 607, 156, 157, 158, 455, 456, 457, 458,
-	459, 460, 461, 462, 463, 464, 465, 466, 467, 468,
-	469, 470, 471, 472, 473, 474, 475, 476, 477, 478,
-	479, 480, 481, 482, 483, 484, 485, 486, 487, 488,
-	489, 490, 491, 492, 493, 494, 495, 496, 497, 498,
-	499, 500, 501, 502, 503, 504, 505, 506, 507, 508,
-	509, 510, 511, 512, 513, 514, 515, 516, 517, 518,
-	519, 520, 521, 522, 523, 524, 525, 526, 527, 528,
-	529, 530, 531, 532, 533, 534, 535, 536, 537, 538,
-	539, 540, 541, 542, 598, 160, 451, 452, 161, 162,
-	163, 164, 165, 166, 21, 394, 0, 0, 382, 23,
-	0, 167, 172, 173, 177, 175, 176, 168, 0, 0,
-	196, 198, 199, 200, 208, 0, 210, 227, 0, 0,
-	34, 0, 37, -2, 549, -2, 415, 0, 364, 0,
-	-2, -2, 0, 47, 0, 0, 608, 0, 0, 0,
-	0, 608, 0, 0, 0, 0, 0, 155, 159, 22,
-	606, 17, 0, 0, 391, 237, 0, 242, 244, 0,
-	279, 280, 281, 282, 283, 0, 0, 0, 0, 0,
-	0, 305, 306, 307, 308, 367, 368, 369, 370, 371,
-	372, 373, 374, 246, 247, 364, 0, 414, 0, 0,
-	0, 0, 0, 0, 0, 355, 0, 329, 329, 329,
-	329, 329, 329, 329, 329, 0, 0, 0, 0, 383,
-	384, 387, 390, 21, 174, 0, 179, 178, 170, 0,
-	0, 226, 0, 0, 0, 0, 0, 215, 0, 0,
-	218, 0, 0, 0, 0, 209, 0, 21, 0, 229,
-	211, 0, 213, 214, 0, 235, 0, 0, 32, 33,
-	607, 449, 450, 0, 39, 0, 0, 132, 0, 100,
-	96, 52, 53, 89, 55, 89, 89, 89, 89, 110,
-	110, 110, 110, 81, 82, 83, 84, 85, 0, 68,
-	89, 89, 89, 72, 56, 57, 58, 59, 60, 61,
-	62, 91, 91, 91, 93, 93, 445, 43, 609, 610,
-	0, 45, 0, 0, 144, 0, 152, 421, 0, 608,
-	395, 0, 0, 0, 0, 0, 0, 240, 0, 0,
+	11, 12, 13, 14, 15, 16, 384, 0, 169, 169,
+	169, 169, 169, 0, 444, 426, 0, 0, 0, 0,
+	0, 609, 609, 609, 609, 609, 609, 0, 27, 28,
+	607, 1, 3, 392, 0, 0, 173, 176, 171, 426,
+	0, 0, 0, 43, 0, 0, 600, 0, 424, 445,
+	446, 449, 450, 545, 546, 547, 548, 549, 550, 551,
+	552, 553, 554, 555, 556, 557, 558, 559, 560, 561,
+	562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+	572, 573, 574, 575, 576, 577, 578, 579, 580, 581,
+	582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+	592, 593, 594, 595, 596, 597, 598, 599, 601, 602,
+	603, 604, 605, 606, 0, 0, 427, 0, 422, 0,
+	422, 0, 609, 158, 159, 160, 457, 458, 459, 460,
+	461, 462, 463, 464, 465, 466, 467, 468, 469, 470,
+	471, 472, 473, 474, 475, 476, 477, 478, 479, 480,
+	481, 482, 483, 484, 485, 486, 487, 488, 489, 490,
+	491, 492, 493, 494, 495, 496, 497, 498, 499, 500,
+	501, 502, 503, 504, 505, 506, 507, 508, 509, 510,
+	511, 512, 513, 514, 515, 516, 517, 518, 519, 520,
+	521, 522, 523, 524, 525, 526, 527, 528, 529, 530,
+	531, 532, 533, 534, 535, 536, 537, 538, 539, 540,
+	541, 542, 543, 544, 600, 162, 453, 454, 163, 164,
+	165, 166, 167, 168, 21, 396, 0, 0, 384, 23,
+	0, 169, 174, 175, 179, 177, 178, 170, 0, 0,
+	198, 200, 201, 202, 210, 0, 212, 229, 0, 0,
+	34, 0, 37, -2, 551, -2, 417, 0, 366, 0,
+	-2, -2, 0, 49, 0, 0, 610, 0, 0, 0,
+	0, 610, 0, 0, 0, 0, 0, 157, 161, 22,
+	608, 17, 0, 0, 393, 239, 0, 244, 246, 0,
+	281, 282, 283, 284, 285, 0, 0, 0, 0, 0,
+	0, 307, 308, 309, 310, 369, 370, 371, 372, 373,
+	374, 375, 376, 248, 249, 366, 0, 416, 0, 0,
+	0, 0, 0, 0, 0, 357, 0, 331, 331, 331,
+	331, 331, 331, 331, 331, 0, 0, 0, 0, 385,
+	386, 389, 392, 21, 176, 0, 181, 180, 172, 0,
+	0, 228, 0, 0, 0, 0, 0, 217, 0, 0,
+	220, 0, 0, 0, 0, 211, 0, 21, 0, 231,
+	213, 0, 215, 216, 0, 237, 0, 0, 32, 33,
+	609, 41, 42, 451, 452, 0, 39, 0, 0, 134,
+	0, 102, 98, 54, 55, 91, 57, 91, 91, 91,
+	91, 112, 112, 112, 112, 83, 84, 85, 86, 87,
+	0, 70, 91, 91, 91, 74, 58, 59, 60, 61,
+	62, 63, 64, 93, 93, 93, 95, 95, 447, 45,
+	611, 612, 0, 47, 0, 0, 146, 0, 154, 423,
+	0, 610, 397, 0, 0, 0, 0, 0, 0, 242,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 264, 265, 266,
-	267, 268, 269, 270, 243, 0, 257, 0, 0, 0,
-	299, 300, 301, 302, 303, 0, 181, 0, 0, 277,
-	0, 0, 0, 0, 0, 0, 177, 0, 356, 0,
-	321, 0, 322, 323, 324, 325, 326, 327, 328, 0,
-	181, 0, 0, 0, 386, 388, 389, 394, 24, 177,
-	0, 375, 0, 0, 0, 180, 407, 0, 0, -2,
-	0, 225, 235, 197, 204, 0, 207, 216, 217, 219,
-	0, 221, 0, 223, 224, 201, 202, 276, 21, 203,
-	0, 0, 0, 212, 228, 453, 454, 382, 0, 235,
-	35, 36, 416, 417, 365, 0, -2, 46, 133, 135,
-	138, 139, 140, 48, 49, 0, 0, 0, 0, 127,
-	128, 103, 101, 0, 98, 97, 54, 0, 110, 110,
-	75, 76, 113, 0, 113, 113, 113, 0, 69, 70,
-	71, 63, 0, 64, 65, 66, 0, 67, 0, 0,
-	608, 423, 607, 437, 145, 426, 427, 428, 429, 430,
-	431, 432, 433, 434, 435, 436, 0, 151, 153, 154,
-	0, 238, 239, 241, 258, 0, 260, 262, 392, 393,
-	248, 249, 273, 274, 275, 0, 0, 0, 0, 271,
-	253, 0, 284, 285, 286, 287, 288, 289, 290, 291,
-	292, 293, 294, 295, 298, 340, 341, 0, 296, 297,
-	304, 0, 0, 182, 183, 185, 189, 0, 365, 0,
-	413, 0, 0, 0, 0, 0, 0, 362, 359, 0,
-	0, 330, 0, 0, 0, 0, 385, 18, 0, 418,
-	419, 376, 377, 194, 25, 0, 407, 397, 409, 411,
-	0, 21, 0, 403, 382, 0, 0, 220, 222, -2,
-	0, 0, 0, 390, 236, 31, 0, 0, 136, 0,
-	0, 123, 0, 125, 126, 108, 0, 102, 51, 99,
-	0, 113, 113, 77, 0, 0, 78, 79, 80, 0,
-	87, 0, 0, 0, 446, 44, 141, 0, 607, 438,
-	439, 440, 441, 0, 396, 259, 261, 263, 250, 271,
-	254, 0, 251, 0, 0, 245, 309, 0, 0, 186,
-	190, 0, 192, 193, 0, 181, 278, 312, 313, 0,
-	0, 0, 0, 382, 0, 360, 0, 0, 320, 331,
-	332, 333, 334, 19, 235, 0, 0, 26, 0, 412,
-	-2, 0, 0, 0, 390, 205, 206, 0, 0, 0,
-	30, 366, 134, 137, 0, 129, 89, 124, 115, 109,
-	104, 105, 106, 107, 90, 73, 74, 114, 111, 112,
-	86, 0, 0, 94, 0, 608, 142, 143, 0, 252,
-	0, 272, 255, 310, 184, 191, 187, 0, 0, 0,
-	89, 89, 345, 89, 93, 348, 89, 350, 89, 353,
-	0, 0, 0, 357, 319, 363, 0, 378, 195, 0,
-	410, 0, -2, 0, 405, 404, 29, 0, 233, 0,
-	0, 122, 0, 131, 120, 0, 117, 119, 88, 0,
-	0, 42, 0, 256, 0, 311, 314, 342, 110, 346,
-	347, 349, 351, 352, 354, 316, 315, 0, 0, 0,
-	361, 380, 0, 0, 400, 21, 0, 230, 0, 231,
-	232, 130, 50, 0, 116, 118, 92, 95, 0, 188,
-	343, 344, 335, 318, 358, 20, 0, 0, 408, -2,
-	406, 234, 121, 0, 147, 0, 0, 0, 0, 381,
-	379, 146, 0, 0, 317, 0, 0, 0, 148, 0,
-	336, 0, 339, 0, 337, 0, 0, 0, 0, 0,
-	0, 338, 149, 150,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 266,
+	267, 268, 269, 270, 271, 272, 245, 0, 259, 0,
+	0, 0, 301, 302, 303, 304, 305, 0, 183, 0,
+	0, 279, 0, 0, 0, 0, 0, 0, 179, 0,
+	358, 0, 323, 0, 324, 325, 326, 327, 328, 329,
+	330, 0, 183, 0, 0, 0, 388, 390, 391, 396,
+	24, 179, 0, 377, 0, 0, 0, 182, 409, 0,
+	0, -2, 0, 227, 237, 199, 206, 0, 209, 218,
+	219, 221, 0, 223, 0, 225, 226, 203, 204, 278,
+	21, 205, 0, 0, 0, 214, 230, 455, 456, 384,
+	0, 237, 35, 36, 418, 419, 367, 0, -2, 48,
+	135, 137, 140, 141, 142, 50, 51, 0, 0, 0,
+	0, 129, 130, 105, 103, 0, 100, 99, 56, 0,
+	112, 112, 77, 78, 115, 0, 115, 115, 115, 0,
+	71, 72, 73, 65, 0, 66, 67, 68, 0, 69,
+	0, 0, 610, 425, 609, 439, 147, 428, 429, 430,
+	431, 432, 433, 434, 435, 436, 437, 438, 0, 153,
+	155, 156, 0, 240, 241, 243, 260, 0, 262, 264,
+	394, 395, 250, 251, 275, 276, 277, 0, 0, 0,
+	0, 273, 255, 0, 286, 287, 288, 289, 290, 291,
+	292, 293, 294, 295, 296, 297, 300, 342, 343, 0,
+	298, 299, 306, 0, 0, 184, 185, 187, 191, 0,
+	367, 0, 415, 0, 0, 0, 0, 0, 0, 364,
+	361, 0, 0, 332, 0, 0, 0, 0, 387, 18,
+	0, 420, 421, 378, 379, 196, 25, 0, 409, 399,
+	411, 413, 0, 21, 0, 405, 384, 0, 0, 222,
+	224, -2, 0, 0, 0, 392, 238, 31, 0, 0,
+	138, 0, 0, 125, 0, 127, 128, 110, 0, 104,
+	53, 101, 0, 115, 115, 79, 0, 0, 80, 81,
+	82, 0, 89, 0, 0, 0, 448, 46, 143, 0,
+	609, 440, 441, 442, 443, 0, 398, 261, 263, 265,
+	252, 273, 256, 0, 253, 0, 0, 247, 311, 0,
+	0, 188, 192, 0, 194, 195, 0, 183, 280, 314,
+	315, 0, 0, 0, 0, 384, 0, 362, 0, 0,
+	322, 333, 334, 335, 336, 19, 237, 0, 0, 26,
+	0, 414, -2, 0, 0, 0, 392, 207, 208, 0,
+	0, 0, 30, 368, 136, 139, 0, 131, 91, 126,
+	117, 111, 106, 107, 108, 109, 92, 75, 76, 116,
+	113, 114, 88, 0, 0, 96, 0, 610, 144, 145,
+	0, 254, 0, 274, 257, 312, 186, 193, 189, 0,
+	0, 0, 91, 91, 347, 91, 95, 350, 91, 352,
+	91, 355, 0, 0, 0, 359, 321, 365, 0, 380,
+	197, 0, 412, 0, -2, 0, 407, 406, 29, 0,
+	235, 0, 0, 124, 0, 133, 122, 0, 119, 121,
+	90, 0, 0, 44, 0, 258, 0, 313, 316, 344,
+	112, 348, 349, 351, 353, 354, 356, 318, 317, 0,
+	0, 0, 363, 382, 0, 0, 402, 21, 0, 232,
+	0, 233, 234, 132, 52, 0, 118, 120, 94, 97,
+	0, 190, 345, 346, 337, 320, 360, 20, 0, 0,
+	410, -2, 408, 236, 123, 0, 149, 0, 0, 0,
+	0, 383, 381, 148, 0, 0, 319, 0, 0, 0,
+	150, 0, 338, 0, 341, 0, 339, 0, 0, 0,
+	0, 0, 0, 340, 151, 152,
 }
 var yyTok1 = [...]int{
 
@@ -2097,29 +2102,29 @@ yydefault:
 
 	case 1:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:270
+		//line ./go/vt/sqlparser/sql.y:270
 		{
 			setParseTree(yylex, yyDollar[1].statement)
 		}
 	case 2:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:275
+		//line ./go/vt/sqlparser/sql.y:275
 		{
 		}
 	case 3:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:276
+		//line ./go/vt/sqlparser/sql.y:276
 		{
 		}
 	case 4:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:280
+		//line ./go/vt/sqlparser/sql.y:280
 		{
 			yyVAL.statement = yyDollar[1].selStmt
 		}
 	case 17:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:298
+		//line ./go/vt/sqlparser/sql.y:298
 		{
 			sel := yyDollar[1].selStmt.(*Select)
 			sel.OrderBy = yyDollar[2].orderBy
@@ -2129,49 +2134,49 @@ yydefault:
 		}
 	case 18:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:306
+		//line ./go/vt/sqlparser/sql.y:306
 		{
 			yyVAL.selStmt = &Union{Type: yyDollar[2].str, Left: yyDollar[1].selStmt, Right: yyDollar[3].selStmt, OrderBy: yyDollar[4].orderBy, Limit: yyDollar[5].limit, Lock: yyDollar[6].str}
 		}
 	case 19:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:310
+		//line ./go/vt/sqlparser/sql.y:310
 		{
 			yyVAL.selStmt = &Select{Comments: Comments(yyDollar[2].bytes2), Cache: yyDollar[3].str, SelectExprs: SelectExprs{Nextval{Expr: yyDollar[5].expr}}, From: TableExprs{&AliasedTableExpr{Expr: yyDollar[7].tableName}}}
 		}
 	case 20:
 		yyDollar = yyS[yypt-10 : yypt+1]
-		//line sql.y:317
+		//line ./go/vt/sqlparser/sql.y:317
 		{
 			yyVAL.selStmt = &Select{Comments: Comments(yyDollar[2].bytes2), Cache: yyDollar[3].str, Distinct: yyDollar[4].str, Hints: yyDollar[5].str, SelectExprs: yyDollar[6].selectExprs, From: yyDollar[7].tableExprs, Where: NewWhere(WhereStr, yyDollar[8].expr), GroupBy: GroupBy(yyDollar[9].exprs), Having: NewWhere(HavingStr, yyDollar[10].expr)}
 		}
 	case 21:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:323
+		//line ./go/vt/sqlparser/sql.y:323
 		{
 			yyVAL.selStmt = yyDollar[1].selStmt
 		}
 	case 22:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:327
+		//line ./go/vt/sqlparser/sql.y:327
 		{
 			yyVAL.selStmt = &ParenSelect{Select: yyDollar[2].selStmt}
 		}
 	case 23:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:333
+		//line ./go/vt/sqlparser/sql.y:333
 		{
 			yyVAL.selStmt = yyDollar[1].selStmt
 		}
 	case 24:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:337
+		//line ./go/vt/sqlparser/sql.y:337
 		{
 			yyVAL.selStmt = &ParenSelect{Select: yyDollar[2].selStmt}
 		}
 	case 25:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:344
+		//line ./go/vt/sqlparser/sql.y:344
 		{
 			// insert_data returns a *Insert pre-filled with Columns & Values
 			ins := yyDollar[5].ins
@@ -2184,7 +2189,7 @@ yydefault:
 		}
 	case 26:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:355
+		//line ./go/vt/sqlparser/sql.y:355
 		{
 			cols := make(Columns, 0, len(yyDollar[6].updateExprs))
 			vals := make(ValTuple, 0, len(yyDollar[7].updateExprs))
@@ -2196,130 +2201,142 @@ yydefault:
 		}
 	case 27:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:367
+		//line ./go/vt/sqlparser/sql.y:367
 		{
 			yyVAL.str = InsertStr
 		}
 	case 28:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:371
+		//line ./go/vt/sqlparser/sql.y:371
 		{
 			yyVAL.str = ReplaceStr
 		}
 	case 29:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line sql.y:377
+		//line ./go/vt/sqlparser/sql.y:377
 		{
 			yyVAL.statement = &Update{Comments: Comments(yyDollar[2].bytes2), TableExprs: yyDollar[3].tableExprs, Exprs: yyDollar[5].updateExprs, Where: NewWhere(WhereStr, yyDollar[6].expr), OrderBy: yyDollar[7].orderBy, Limit: yyDollar[8].limit}
 		}
 	case 30:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:383
+		//line ./go/vt/sqlparser/sql.y:383
 		{
 			yyVAL.statement = &Delete{Comments: Comments(yyDollar[2].bytes2), TableExprs: TableExprs{&AliasedTableExpr{Expr: yyDollar[4].tableName}}, Where: NewWhere(WhereStr, yyDollar[5].expr), OrderBy: yyDollar[6].orderBy, Limit: yyDollar[7].limit}
 		}
 	case 31:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:387
+		//line ./go/vt/sqlparser/sql.y:387
 		{
 			yyVAL.statement = &Delete{Comments: Comments(yyDollar[2].bytes2), Targets: yyDollar[3].tableNames, TableExprs: yyDollar[5].tableExprs, Where: NewWhere(WhereStr, yyDollar[6].expr)}
 		}
 	case 32:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:392
+		//line ./go/vt/sqlparser/sql.y:392
 		{
 		}
 	case 33:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:393
+		//line ./go/vt/sqlparser/sql.y:393
 		{
 		}
 	case 34:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:397
+		//line ./go/vt/sqlparser/sql.y:397
 		{
 			yyVAL.tableNames = TableNames{yyDollar[1].tableName}
 		}
 	case 35:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:401
+		//line ./go/vt/sqlparser/sql.y:401
 		{
 			yyVAL.tableNames = append(yyVAL.tableNames, yyDollar[3].tableName)
 		}
 	case 36:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:407
+		//line ./go/vt/sqlparser/sql.y:407
 		{
 			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Charset: yyDollar[4].colIdent}
 		}
 	case 37:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:411
+		//line ./go/vt/sqlparser/sql.y:411
 		{
 			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Exprs: yyDollar[3].updateExprs}
 		}
 	case 41:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:422
+		{
+			yyVAL.colIdent = yyDollar[1].colIdent
+		}
+	case 42:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:426
+		{
+			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
+		}
+	case 43:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:423
+		//line ./go/vt/sqlparser/sql.y:432
 		{
 			yyDollar[1].ddl.TableSpec = yyDollar[2].TableSpec
 			yyVAL.statement = yyDollar[1].ddl
 		}
-	case 42:
+	case 44:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line sql.y:428
+		//line ./go/vt/sqlparser/sql.y:437
 		{
 			// Change this to an alter statement
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[7].tableName, NewName: yyDollar[7].tableName}
 		}
-	case 43:
+	case 45:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:433
+		//line ./go/vt/sqlparser/sql.y:442
 		{
 			yyVAL.statement = &DDL{Action: CreateStr, NewName: yyDollar[3].tableName.ToViewName()}
 		}
-	case 44:
+	case 46:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:437
+		//line ./go/vt/sqlparser/sql.y:446
 		{
 			yyVAL.statement = &DDL{Action: CreateStr, NewName: yyDollar[5].tableName.ToViewName()}
 		}
-	case 45:
+	case 47:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:443
+		//line ./go/vt/sqlparser/sql.y:452
 		{
 			yyVAL.ddl = &DDL{Action: CreateStr, NewName: yyDollar[4].tableName}
 			setDDL(yylex, yyVAL.ddl)
 		}
-	case 46:
+	case 48:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:450
+		//line ./go/vt/sqlparser/sql.y:459
 		{
 			yyVAL.TableSpec = yyDollar[2].TableSpec
 			yyVAL.TableSpec.Options = yyDollar[4].str
 		}
-	case 47:
+	case 49:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:457
+		//line ./go/vt/sqlparser/sql.y:466
 		{
 			yyVAL.TableSpec = &TableSpec{}
 			yyVAL.TableSpec.AddColumn(yyDollar[1].columnDefinition)
 		}
-	case 48:
+	case 50:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:462
+		//line ./go/vt/sqlparser/sql.y:471
 		{
 			yyVAL.TableSpec.AddColumn(yyDollar[3].columnDefinition)
 		}
-	case 49:
+	case 51:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:466
+		//line ./go/vt/sqlparser/sql.y:475
 		{
 			yyVAL.TableSpec.AddIndex(yyDollar[3].indexDefinition)
 		}
-	case 50:
+	case 52:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:472
+		//line ./go/vt/sqlparser/sql.y:481
 		{
 			yyDollar[2].columnType.NotNull = yyDollar[3].boolVal
 			yyDollar[2].columnType.Default = yyDollar[4].optVal
@@ -2328,627 +2345,627 @@ yydefault:
 			yyDollar[2].columnType.Comment = yyDollar[7].optVal
 			yyVAL.columnDefinition = &ColumnDefinition{Name: NewColIdent(string(yyDollar[1].bytes)), Type: yyDollar[2].columnType}
 		}
-	case 51:
+	case 53:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:482
+		//line ./go/vt/sqlparser/sql.y:491
 		{
 			yyVAL.columnType = yyDollar[1].columnType
 			yyVAL.columnType.Unsigned = yyDollar[2].boolVal
 			yyVAL.columnType.Zerofill = yyDollar[3].boolVal
 		}
-	case 54:
+	case 56:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:492
+		//line ./go/vt/sqlparser/sql.y:501
 		{
 			yyVAL.columnType = yyDollar[1].columnType
 			yyVAL.columnType.Length = yyDollar[2].optVal
 		}
-	case 55:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:497
-		{
-			yyVAL.columnType = yyDollar[1].columnType
-		}
-	case 56:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:503
-		{
-			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
-		}
 	case 57:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:507
+		//line ./go/vt/sqlparser/sql.y:506
 		{
-			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
+			yyVAL.columnType = yyDollar[1].columnType
 		}
 	case 58:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:511
+		//line ./go/vt/sqlparser/sql.y:512
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
 	case 59:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:515
+		//line ./go/vt/sqlparser/sql.y:516
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
 	case 60:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:519
+		//line ./go/vt/sqlparser/sql.y:520
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
 	case 61:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:523
+		//line ./go/vt/sqlparser/sql.y:524
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
 	case 62:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:527
+		//line ./go/vt/sqlparser/sql.y:528
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
 	case 63:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:532
+		{
+			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
+		}
+	case 64:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:536
+		{
+			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
+		}
+	case 65:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:533
+		//line ./go/vt/sqlparser/sql.y:542
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
-	case 64:
+	case 66:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:539
+		//line ./go/vt/sqlparser/sql.y:548
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
-	case 65:
+	case 67:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:545
+		//line ./go/vt/sqlparser/sql.y:554
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
-	case 66:
+	case 68:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:551
+		//line ./go/vt/sqlparser/sql.y:560
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
-	case 67:
+	case 69:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:557
+		//line ./go/vt/sqlparser/sql.y:566
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
-	case 68:
+	case 70:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:565
+		//line ./go/vt/sqlparser/sql.y:574
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
-	case 69:
+	case 71:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:569
+		//line ./go/vt/sqlparser/sql.y:578
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 70:
+	case 72:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:573
+		//line ./go/vt/sqlparser/sql.y:582
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 71:
+	case 73:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:577
+		//line ./go/vt/sqlparser/sql.y:586
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 72:
+	case 74:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:581
+		//line ./go/vt/sqlparser/sql.y:590
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
-	case 73:
+	case 75:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:587
+		//line ./go/vt/sqlparser/sql.y:596
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Collate: yyDollar[4].str}
 		}
-	case 74:
+	case 76:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:591
+		//line ./go/vt/sqlparser/sql.y:600
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Collate: yyDollar[4].str}
 		}
-	case 75:
+	case 77:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:595
+		//line ./go/vt/sqlparser/sql.y:604
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 76:
+	case 78:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:599
+		//line ./go/vt/sqlparser/sql.y:608
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 77:
+	case 79:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:603
+		//line ./go/vt/sqlparser/sql.y:612
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Charset: yyDollar[2].str, Collate: yyDollar[3].str}
 		}
-	case 78:
+	case 80:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:607
+		//line ./go/vt/sqlparser/sql.y:616
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Charset: yyDollar[2].str, Collate: yyDollar[3].str}
 		}
-	case 79:
+	case 81:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:611
+		//line ./go/vt/sqlparser/sql.y:620
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Charset: yyDollar[2].str, Collate: yyDollar[3].str}
 		}
-	case 80:
+	case 82:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:615
+		//line ./go/vt/sqlparser/sql.y:624
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Charset: yyDollar[2].str, Collate: yyDollar[3].str}
 		}
-	case 81:
+	case 83:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:619
+		//line ./go/vt/sqlparser/sql.y:628
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
-	case 82:
+	case 84:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:623
+		//line ./go/vt/sqlparser/sql.y:632
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
-	case 83:
+	case 85:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:627
+		//line ./go/vt/sqlparser/sql.y:636
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
-	case 84:
+	case 86:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:631
+		//line ./go/vt/sqlparser/sql.y:640
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
-	case 85:
+	case 87:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:635
+		//line ./go/vt/sqlparser/sql.y:644
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
-	case 86:
+	case 88:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:639
+		//line ./go/vt/sqlparser/sql.y:648
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), EnumValues: yyDollar[3].strs}
 		}
-	case 87:
+	case 89:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:645
+		//line ./go/vt/sqlparser/sql.y:654
 		{
 			yyVAL.strs = make([]string, 0, 4)
 			yyVAL.strs = append(yyVAL.strs, "'"+string(yyDollar[1].bytes)+"'")
 		}
-	case 88:
+	case 90:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:650
+		//line ./go/vt/sqlparser/sql.y:659
 		{
 			yyVAL.strs = append(yyDollar[1].strs, "'"+string(yyDollar[3].bytes)+"'")
 		}
-	case 89:
+	case 91:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:655
+		//line ./go/vt/sqlparser/sql.y:664
 		{
 			yyVAL.optVal = nil
 		}
-	case 90:
+	case 92:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:659
+		//line ./go/vt/sqlparser/sql.y:668
 		{
 			yyVAL.optVal = NewIntVal(yyDollar[2].bytes)
 		}
-	case 91:
+	case 93:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:664
+		//line ./go/vt/sqlparser/sql.y:673
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{}
 		}
-	case 92:
+	case 94:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:668
+		//line ./go/vt/sqlparser/sql.y:677
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: NewIntVal(yyDollar[2].bytes),
 				Scale:  NewIntVal(yyDollar[4].bytes),
 			}
 		}
-	case 93:
+	case 95:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:676
+		//line ./go/vt/sqlparser/sql.y:685
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{}
 		}
-	case 94:
+	case 96:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:680
+		//line ./go/vt/sqlparser/sql.y:689
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: NewIntVal(yyDollar[2].bytes),
 			}
 		}
-	case 95:
+	case 97:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:686
+		//line ./go/vt/sqlparser/sql.y:695
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: NewIntVal(yyDollar[2].bytes),
 				Scale:  NewIntVal(yyDollar[4].bytes),
 			}
 		}
-	case 96:
+	case 98:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:694
+		//line ./go/vt/sqlparser/sql.y:703
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 97:
+	case 99:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:698
+		//line ./go/vt/sqlparser/sql.y:707
 		{
 			yyVAL.boolVal = BoolVal(true)
 		}
-	case 98:
+	case 100:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:703
+		//line ./go/vt/sqlparser/sql.y:712
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 99:
+	case 101:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:707
+		//line ./go/vt/sqlparser/sql.y:716
 		{
 			yyVAL.boolVal = BoolVal(true)
 		}
-	case 100:
+	case 102:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:713
+		//line ./go/vt/sqlparser/sql.y:722
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 101:
+	case 103:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:717
+		//line ./go/vt/sqlparser/sql.y:726
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 102:
+	case 104:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:721
+		//line ./go/vt/sqlparser/sql.y:730
 		{
 			yyVAL.boolVal = BoolVal(true)
 		}
-	case 103:
+	case 105:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:726
+		//line ./go/vt/sqlparser/sql.y:735
 		{
 			yyVAL.optVal = nil
 		}
-	case 104:
+	case 106:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:730
+		//line ./go/vt/sqlparser/sql.y:739
 		{
 			yyVAL.optVal = NewStrVal(yyDollar[2].bytes)
 		}
-	case 105:
+	case 107:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:734
+		//line ./go/vt/sqlparser/sql.y:743
 		{
 			yyVAL.optVal = NewIntVal(yyDollar[2].bytes)
 		}
-	case 106:
+	case 108:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:738
+		//line ./go/vt/sqlparser/sql.y:747
 		{
 			yyVAL.optVal = NewFloatVal(yyDollar[2].bytes)
 		}
-	case 107:
+	case 109:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:742
+		//line ./go/vt/sqlparser/sql.y:751
 		{
 			yyVAL.optVal = NewValArg(yyDollar[2].bytes)
 		}
-	case 108:
+	case 110:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:747
+		//line ./go/vt/sqlparser/sql.y:756
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 109:
+	case 111:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:751
+		//line ./go/vt/sqlparser/sql.y:760
 		{
 			yyVAL.boolVal = BoolVal(true)
 		}
-	case 110:
+	case 112:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:756
+		//line ./go/vt/sqlparser/sql.y:765
 		{
 			yyVAL.str = ""
 		}
-	case 111:
+	case 113:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:760
+		//line ./go/vt/sqlparser/sql.y:769
 		{
 			yyVAL.str = string(yyDollar[3].bytes)
 		}
-	case 112:
+	case 114:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:764
+		//line ./go/vt/sqlparser/sql.y:773
 		{
 			yyVAL.str = string(yyDollar[3].bytes)
 		}
-	case 113:
+	case 115:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:769
+		//line ./go/vt/sqlparser/sql.y:778
 		{
 			yyVAL.str = ""
 		}
-	case 114:
+	case 116:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:773
+		//line ./go/vt/sqlparser/sql.y:782
 		{
 			yyVAL.str = string(yyDollar[2].bytes)
 		}
-	case 115:
+	case 117:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:778
+		//line ./go/vt/sqlparser/sql.y:787
 		{
 			yyVAL.colKeyOpt = colKeyNone
 		}
-	case 116:
+	case 118:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:782
+		//line ./go/vt/sqlparser/sql.y:791
 		{
 			yyVAL.colKeyOpt = colKeyPrimary
 		}
-	case 117:
+	case 119:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:786
+		//line ./go/vt/sqlparser/sql.y:795
 		{
 			yyVAL.colKeyOpt = colKey
 		}
-	case 118:
+	case 120:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:790
+		//line ./go/vt/sqlparser/sql.y:799
 		{
 			yyVAL.colKeyOpt = colKeyUniqueKey
 		}
-	case 119:
+	case 121:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:794
+		//line ./go/vt/sqlparser/sql.y:803
 		{
 			yyVAL.colKeyOpt = colKeyUnique
 		}
-	case 120:
+	case 122:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:799
+		//line ./go/vt/sqlparser/sql.y:808
 		{
 			yyVAL.optVal = nil
 		}
-	case 121:
+	case 123:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:803
+		//line ./go/vt/sqlparser/sql.y:812
 		{
 			yyVAL.optVal = NewStrVal(yyDollar[2].bytes)
 		}
-	case 122:
+	case 124:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:809
+		//line ./go/vt/sqlparser/sql.y:818
 		{
 			yyVAL.indexDefinition = &IndexDefinition{Info: yyDollar[1].indexInfo, Columns: yyDollar[3].indexColumns}
 		}
-	case 123:
+	case 125:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:815
+		//line ./go/vt/sqlparser/sql.y:824
 		{
 			yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].bytes), Name: NewColIdent("PRIMARY"), Primary: true, Unique: true}
 		}
-	case 124:
+	case 126:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:819
+		//line ./go/vt/sqlparser/sql.y:828
 		{
 			yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].str), Name: NewColIdent(string(yyDollar[3].bytes)), Unique: true}
 		}
-	case 125:
+	case 127:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:823
+		//line ./go/vt/sqlparser/sql.y:832
 		{
 			yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: true}
 		}
-	case 126:
+	case 128:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:827
+		//line ./go/vt/sqlparser/sql.y:836
 		{
 			yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].str), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: false}
 		}
-	case 127:
+	case 129:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:833
+		//line ./go/vt/sqlparser/sql.y:842
 		{
 			yyVAL.str = string(yyDollar[1].bytes)
 		}
-	case 128:
+	case 130:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:837
+		//line ./go/vt/sqlparser/sql.y:846
 		{
 			yyVAL.str = string(yyDollar[1].bytes)
 		}
-	case 129:
+	case 131:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:843
+		//line ./go/vt/sqlparser/sql.y:852
 		{
 			yyVAL.indexColumns = []*IndexColumn{yyDollar[1].indexColumn}
 		}
-	case 130:
+	case 132:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:847
+		//line ./go/vt/sqlparser/sql.y:856
 		{
 			yyVAL.indexColumns = append(yyVAL.indexColumns, yyDollar[3].indexColumn)
 		}
-	case 131:
+	case 133:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:853
+		//line ./go/vt/sqlparser/sql.y:862
 		{
 			yyVAL.indexColumn = &IndexColumn{Column: yyDollar[1].colIdent, Length: yyDollar[2].optVal}
 		}
-	case 132:
+	case 134:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:858
+		//line ./go/vt/sqlparser/sql.y:867
 		{
 			yyVAL.str = ""
 		}
-	case 133:
+	case 135:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:862
+		//line ./go/vt/sqlparser/sql.y:871
 		{
 			yyVAL.str = " " + string(yyDollar[1].str)
 		}
-	case 134:
+	case 136:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:866
+		//line ./go/vt/sqlparser/sql.y:875
 		{
 			yyVAL.str = string(yyDollar[1].str) + ", " + string(yyDollar[3].str)
 		}
-	case 135:
+	case 137:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:874
+		//line ./go/vt/sqlparser/sql.y:883
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 136:
+	case 138:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:878
+		//line ./go/vt/sqlparser/sql.y:887
 		{
 			yyVAL.str = yyDollar[1].str + " " + yyDollar[2].str
 		}
-	case 137:
+	case 139:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:882
+		//line ./go/vt/sqlparser/sql.y:891
 		{
 			yyVAL.str = yyDollar[1].str + "=" + yyDollar[3].str
 		}
-	case 138:
+	case 140:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:888
+		//line ./go/vt/sqlparser/sql.y:897
 		{
 			yyVAL.str = yyDollar[1].colIdent.String()
 		}
-	case 139:
+	case 141:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:892
+		//line ./go/vt/sqlparser/sql.y:901
 		{
 			yyVAL.str = "'" + string(yyDollar[1].bytes) + "'"
 		}
-	case 140:
+	case 142:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:896
+		//line ./go/vt/sqlparser/sql.y:905
 		{
 			yyVAL.str = string(yyDollar[1].bytes)
 		}
-	case 141:
+	case 143:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:902
+		//line ./go/vt/sqlparser/sql.y:911
 		{
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName}
 		}
-	case 142:
+	case 144:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:906
+		//line ./go/vt/sqlparser/sql.y:915
 		{
 			// Change this to a rename statement
 			yyVAL.statement = &DDL{Action: RenameStr, Table: yyDollar[4].tableName, NewName: yyDollar[7].tableName}
 		}
-	case 143:
+	case 145:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:911
+		//line ./go/vt/sqlparser/sql.y:920
 		{
 			// Rename an index can just be an alter
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName}
 		}
-	case 144:
+	case 146:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:916
+		//line ./go/vt/sqlparser/sql.y:925
 		{
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[3].tableName.ToViewName(), NewName: yyDollar[3].tableName.ToViewName()}
 		}
-	case 145:
+	case 147:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:920
+		//line ./go/vt/sqlparser/sql.y:929
 		{
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, PartitionSpec: yyDollar[5].partSpec}
 		}
-	case 146:
+	case 148:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:926
+		//line ./go/vt/sqlparser/sql.y:935
 		{
 			yyVAL.partSpec = &PartitionSpec{Action: ReorganizeStr, Name: yyDollar[3].colIdent, Definitions: yyDollar[6].partDefs}
 		}
-	case 147:
+	case 149:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:932
+		//line ./go/vt/sqlparser/sql.y:941
 		{
 			yyVAL.partDefs = []*PartitionDefinition{yyDollar[1].partDef}
 		}
-	case 148:
+	case 150:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:936
+		//line ./go/vt/sqlparser/sql.y:945
 		{
 			yyVAL.partDefs = append(yyDollar[1].partDefs, yyDollar[3].partDef)
 		}
-	case 149:
+	case 151:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line sql.y:942
+		//line ./go/vt/sqlparser/sql.y:951
 		{
 			yyVAL.partDef = &PartitionDefinition{Name: yyDollar[2].colIdent, Limit: yyDollar[7].expr}
 		}
-	case 150:
+	case 152:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line sql.y:946
+		//line ./go/vt/sqlparser/sql.y:955
 		{
 			yyVAL.partDef = &PartitionDefinition{Name: yyDollar[2].colIdent, Maxvalue: true}
 		}
-	case 151:
+	case 153:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:952
+		//line ./go/vt/sqlparser/sql.y:961
 		{
 			yyVAL.statement = &DDL{Action: RenameStr, Table: yyDollar[3].tableName, NewName: yyDollar[5].tableName}
 		}
-	case 152:
+	case 154:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:958
+		//line ./go/vt/sqlparser/sql.y:967
 		{
 			var exists bool
 			if yyDollar[3].byt != 0 {
@@ -2956,16 +2973,16 @@ yydefault:
 			}
 			yyVAL.statement = &DDL{Action: DropStr, Table: yyDollar[4].tableName, IfExists: exists}
 		}
-	case 153:
+	case 155:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:966
+		//line ./go/vt/sqlparser/sql.y:975
 		{
 			// Change this to an alter statement
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[5].tableName, NewName: yyDollar[5].tableName}
 		}
-	case 154:
+	case 156:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:971
+		//line ./go/vt/sqlparser/sql.y:980
 		{
 			var exists bool
 			if yyDollar[3].byt != 0 {
@@ -2973,21 +2990,21 @@ yydefault:
 			}
 			yyVAL.statement = &DDL{Action: DropStr, Table: yyDollar[4].tableName.ToViewName(), IfExists: exists}
 		}
-	case 155:
+	case 157:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:981
+		//line ./go/vt/sqlparser/sql.y:990
 		{
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[3].tableName, NewName: yyDollar[3].tableName}
 		}
-	case 156:
+	case 158:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:987
+		//line ./go/vt/sqlparser/sql.y:996
 		{
 			yyVAL.str = ShowUnsupportedStr
 		}
-	case 157:
+	case 159:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:991
+		//line ./go/vt/sqlparser/sql.y:1000
 		{
 			switch v := string(yyDollar[1].bytes); v {
 			case ShowDatabasesStr, ShowTablesStr:
@@ -2996,9 +3013,9 @@ yydefault:
 				yyVAL.str = ShowUnsupportedStr
 			}
 		}
-	case 158:
+	case 160:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1000
+		//line ./go/vt/sqlparser/sql.y:1009
 		{
 			switch v := string(yyDollar[1].bytes); v {
 			case ShowKeyspacesStr, ShowShardsStr, ShowVSchemaTablesStr:
@@ -3007,376 +3024,376 @@ yydefault:
 				yyVAL.str = ShowUnsupportedStr
 			}
 		}
-	case 159:
+	case 161:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1011
+		//line ./go/vt/sqlparser/sql.y:1020
 		{
 			yyVAL.statement = &Show{Type: yyDollar[2].str}
 		}
-	case 160:
+	case 162:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1017
+		//line ./go/vt/sqlparser/sql.y:1026
 		{
 			yyVAL.statement = &Use{DBName: yyDollar[2].tableIdent}
 		}
-	case 161:
+	case 163:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1023
+		//line ./go/vt/sqlparser/sql.y:1032
 		{
 			yyVAL.statement = &OtherRead{}
 		}
-	case 162:
+	case 164:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1027
+		//line ./go/vt/sqlparser/sql.y:1036
 		{
 			yyVAL.statement = &OtherRead{}
 		}
-	case 163:
+	case 165:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1031
+		//line ./go/vt/sqlparser/sql.y:1040
 		{
 			yyVAL.statement = &OtherRead{}
 		}
-	case 164:
+	case 166:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1035
+		//line ./go/vt/sqlparser/sql.y:1044
 		{
 			yyVAL.statement = &OtherAdmin{}
 		}
-	case 165:
+	case 167:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1039
+		//line ./go/vt/sqlparser/sql.y:1048
 		{
 			yyVAL.statement = &OtherAdmin{}
 		}
-	case 166:
+	case 168:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1043
+		//line ./go/vt/sqlparser/sql.y:1052
 		{
 			yyVAL.statement = &OtherAdmin{}
 		}
-	case 167:
+	case 169:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1048
+		//line ./go/vt/sqlparser/sql.y:1057
 		{
 			setAllowComments(yylex, true)
 		}
-	case 168:
+	case 170:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1052
+		//line ./go/vt/sqlparser/sql.y:1061
 		{
 			yyVAL.bytes2 = yyDollar[2].bytes2
 			setAllowComments(yylex, false)
 		}
-	case 169:
+	case 171:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1058
+		//line ./go/vt/sqlparser/sql.y:1067
 		{
 			yyVAL.bytes2 = nil
 		}
-	case 170:
+	case 172:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1062
+		//line ./go/vt/sqlparser/sql.y:1071
 		{
 			yyVAL.bytes2 = append(yyDollar[1].bytes2, yyDollar[2].bytes)
 		}
-	case 171:
+	case 173:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1068
+		//line ./go/vt/sqlparser/sql.y:1077
 		{
 			yyVAL.str = UnionStr
 		}
-	case 172:
+	case 174:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1072
+		//line ./go/vt/sqlparser/sql.y:1081
 		{
 			yyVAL.str = UnionAllStr
 		}
-	case 173:
+	case 175:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1076
+		//line ./go/vt/sqlparser/sql.y:1085
 		{
 			yyVAL.str = UnionDistinctStr
 		}
-	case 174:
+	case 176:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1081
+		//line ./go/vt/sqlparser/sql.y:1090
 		{
 			yyVAL.str = ""
 		}
-	case 175:
+	case 177:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1085
+		//line ./go/vt/sqlparser/sql.y:1094
 		{
 			yyVAL.str = SQLNoCacheStr
 		}
-	case 176:
+	case 178:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1089
+		//line ./go/vt/sqlparser/sql.y:1098
 		{
 			yyVAL.str = SQLCacheStr
 		}
-	case 177:
+	case 179:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1094
+		//line ./go/vt/sqlparser/sql.y:1103
 		{
 			yyVAL.str = ""
 		}
-	case 178:
+	case 180:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1098
+		//line ./go/vt/sqlparser/sql.y:1107
 		{
 			yyVAL.str = DistinctStr
 		}
-	case 179:
+	case 181:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1103
+		//line ./go/vt/sqlparser/sql.y:1112
 		{
 			yyVAL.str = ""
 		}
-	case 180:
+	case 182:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1107
+		//line ./go/vt/sqlparser/sql.y:1116
 		{
 			yyVAL.str = StraightJoinHint
 		}
-	case 181:
+	case 183:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1112
+		//line ./go/vt/sqlparser/sql.y:1121
 		{
 			yyVAL.selectExprs = nil
 		}
-	case 182:
+	case 184:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1116
+		//line ./go/vt/sqlparser/sql.y:1125
 		{
 			yyVAL.selectExprs = yyDollar[1].selectExprs
 		}
-	case 183:
+	case 185:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1122
+		//line ./go/vt/sqlparser/sql.y:1131
 		{
 			yyVAL.selectExprs = SelectExprs{yyDollar[1].selectExpr}
 		}
-	case 184:
+	case 186:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1126
+		//line ./go/vt/sqlparser/sql.y:1135
 		{
 			yyVAL.selectExprs = append(yyVAL.selectExprs, yyDollar[3].selectExpr)
 		}
-	case 185:
+	case 187:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1132
+		//line ./go/vt/sqlparser/sql.y:1141
 		{
 			yyVAL.selectExpr = &StarExpr{}
 		}
-	case 186:
+	case 188:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1136
+		//line ./go/vt/sqlparser/sql.y:1145
 		{
 			yyVAL.selectExpr = &AliasedExpr{Expr: yyDollar[1].expr, As: yyDollar[2].colIdent}
 		}
-	case 187:
+	case 189:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1140
+		//line ./go/vt/sqlparser/sql.y:1149
 		{
 			yyVAL.selectExpr = &StarExpr{TableName: TableName{Name: yyDollar[1].tableIdent}}
 		}
-	case 188:
+	case 190:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1144
+		//line ./go/vt/sqlparser/sql.y:1153
 		{
 			yyVAL.selectExpr = &StarExpr{TableName: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}}
 		}
-	case 189:
+	case 191:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1149
+		//line ./go/vt/sqlparser/sql.y:1158
 		{
 			yyVAL.colIdent = ColIdent{}
 		}
-	case 190:
+	case 192:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1153
+		//line ./go/vt/sqlparser/sql.y:1162
 		{
 			yyVAL.colIdent = yyDollar[1].colIdent
 		}
-	case 191:
+	case 193:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1157
+		//line ./go/vt/sqlparser/sql.y:1166
 		{
 			yyVAL.colIdent = yyDollar[2].colIdent
 		}
-	case 193:
+	case 195:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1164
+		//line ./go/vt/sqlparser/sql.y:1173
 		{
 			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
-	case 194:
+	case 196:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1169
+		//line ./go/vt/sqlparser/sql.y:1178
 		{
 			yyVAL.tableExprs = TableExprs{&AliasedTableExpr{Expr: TableName{Name: NewTableIdent("dual")}}}
 		}
-	case 195:
+	case 197:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1173
+		//line ./go/vt/sqlparser/sql.y:1182
 		{
 			yyVAL.tableExprs = yyDollar[2].tableExprs
 		}
-	case 196:
+	case 198:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1179
+		//line ./go/vt/sqlparser/sql.y:1188
 		{
 			yyVAL.tableExprs = TableExprs{yyDollar[1].tableExpr}
 		}
-	case 197:
+	case 199:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1183
+		//line ./go/vt/sqlparser/sql.y:1192
 		{
 			yyVAL.tableExprs = append(yyVAL.tableExprs, yyDollar[3].tableExpr)
 		}
-	case 200:
+	case 202:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1193
+		//line ./go/vt/sqlparser/sql.y:1202
 		{
 			yyVAL.tableExpr = yyDollar[1].aliasedTableName
 		}
-	case 201:
+	case 203:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1197
+		//line ./go/vt/sqlparser/sql.y:1206
 		{
 			yyVAL.tableExpr = &AliasedTableExpr{Expr: yyDollar[1].subquery, As: yyDollar[3].tableIdent}
 		}
-	case 202:
+	case 204:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1201
+		//line ./go/vt/sqlparser/sql.y:1210
 		{
 			yyVAL.tableExpr = &ParenTableExpr{Exprs: yyDollar[2].tableExprs}
 		}
-	case 203:
+	case 205:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1207
+		//line ./go/vt/sqlparser/sql.y:1216
 		{
 			yyVAL.aliasedTableName = &AliasedTableExpr{Expr: yyDollar[1].tableName, As: yyDollar[2].tableIdent, Hints: yyDollar[3].indexHints}
 		}
-	case 204:
+	case 206:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1220
+		//line ./go/vt/sqlparser/sql.y:1229
 		{
 			yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr}
 		}
-	case 205:
+	case 207:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1224
+		//line ./go/vt/sqlparser/sql.y:1233
 		{
 			yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, On: yyDollar[5].expr}
 		}
-	case 206:
+	case 208:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1228
+		//line ./go/vt/sqlparser/sql.y:1237
 		{
 			yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, On: yyDollar[5].expr}
 		}
-	case 207:
+	case 209:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1232
+		//line ./go/vt/sqlparser/sql.y:1241
 		{
 			yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr}
 		}
-	case 208:
+	case 210:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1237
+		//line ./go/vt/sqlparser/sql.y:1246
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 209:
+	case 211:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1239
+		//line ./go/vt/sqlparser/sql.y:1248
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 210:
+	case 212:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1242
+		//line ./go/vt/sqlparser/sql.y:1251
 		{
 			yyVAL.tableIdent = NewTableIdent("")
 		}
-	case 211:
+	case 213:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1246
+		//line ./go/vt/sqlparser/sql.y:1255
 		{
 			yyVAL.tableIdent = yyDollar[1].tableIdent
 		}
-	case 212:
+	case 214:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1250
+		//line ./go/vt/sqlparser/sql.y:1259
 		{
 			yyVAL.tableIdent = yyDollar[2].tableIdent
 		}
-	case 214:
+	case 216:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1257
+		//line ./go/vt/sqlparser/sql.y:1266
 		{
 			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
 		}
-	case 215:
+	case 217:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1263
+		//line ./go/vt/sqlparser/sql.y:1272
 		{
 			yyVAL.str = JoinStr
 		}
-	case 216:
+	case 218:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1267
+		//line ./go/vt/sqlparser/sql.y:1276
 		{
 			yyVAL.str = JoinStr
 		}
-	case 217:
+	case 219:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1271
+		//line ./go/vt/sqlparser/sql.y:1280
 		{
 			yyVAL.str = JoinStr
 		}
-	case 218:
+	case 220:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1275
+		//line ./go/vt/sqlparser/sql.y:1284
 		{
 			yyVAL.str = StraightJoinStr
 		}
-	case 219:
+	case 221:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1281
+		//line ./go/vt/sqlparser/sql.y:1290
 		{
 			yyVAL.str = LeftJoinStr
 		}
-	case 220:
+	case 222:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1285
+		//line ./go/vt/sqlparser/sql.y:1294
 		{
 			yyVAL.str = LeftJoinStr
 		}
-	case 221:
+	case 223:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1289
+		//line ./go/vt/sqlparser/sql.y:1298
 		{
 			yyVAL.str = RightJoinStr
 		}
-	case 222:
+	case 224:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1293
+		//line ./go/vt/sqlparser/sql.y:1302
 		{
 			yyVAL.str = RightJoinStr
 		}
-	case 223:
+	case 225:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1299
+		//line ./go/vt/sqlparser/sql.y:1308
 		{
 			yyVAL.str = NaturalJoinStr
 		}
-	case 224:
+	case 226:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1303
+		//line ./go/vt/sqlparser/sql.y:1312
 		{
 			if yyDollar[2].str == LeftJoinStr {
 				yyVAL.str = NaturalLeftJoinStr
@@ -3384,459 +3401,459 @@ yydefault:
 				yyVAL.str = NaturalRightJoinStr
 			}
 		}
-	case 225:
+	case 227:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1313
+		//line ./go/vt/sqlparser/sql.y:1322
 		{
 			yyVAL.tableName = yyDollar[2].tableName
 		}
-	case 226:
+	case 228:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1317
+		//line ./go/vt/sqlparser/sql.y:1326
 		{
 			yyVAL.tableName = yyDollar[1].tableName
 		}
-	case 227:
+	case 229:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1323
+		//line ./go/vt/sqlparser/sql.y:1332
 		{
 			yyVAL.tableName = TableName{Name: yyDollar[1].tableIdent}
 		}
-	case 228:
+	case 230:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1327
+		//line ./go/vt/sqlparser/sql.y:1336
 		{
 			yyVAL.tableName = TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}
 		}
-	case 229:
+	case 231:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1332
+		//line ./go/vt/sqlparser/sql.y:1341
 		{
 			yyVAL.indexHints = nil
 		}
-	case 230:
+	case 232:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1336
+		//line ./go/vt/sqlparser/sql.y:1345
 		{
 			yyVAL.indexHints = &IndexHints{Type: UseStr, Indexes: yyDollar[4].colIdents}
 		}
-	case 231:
+	case 233:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1340
+		//line ./go/vt/sqlparser/sql.y:1349
 		{
 			yyVAL.indexHints = &IndexHints{Type: IgnoreStr, Indexes: yyDollar[4].colIdents}
 		}
-	case 232:
+	case 234:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1344
+		//line ./go/vt/sqlparser/sql.y:1353
 		{
 			yyVAL.indexHints = &IndexHints{Type: ForceStr, Indexes: yyDollar[4].colIdents}
 		}
-	case 233:
+	case 235:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1350
+		//line ./go/vt/sqlparser/sql.y:1359
 		{
 			yyVAL.colIdents = []ColIdent{yyDollar[1].colIdent}
 		}
-	case 234:
+	case 236:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1354
+		//line ./go/vt/sqlparser/sql.y:1363
 		{
 			yyVAL.colIdents = append(yyDollar[1].colIdents, yyDollar[3].colIdent)
 		}
-	case 235:
+	case 237:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1359
+		//line ./go/vt/sqlparser/sql.y:1368
 		{
 			yyVAL.expr = nil
 		}
-	case 236:
+	case 238:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1363
+		//line ./go/vt/sqlparser/sql.y:1372
 		{
 			yyVAL.expr = yyDollar[2].expr
 		}
-	case 237:
+	case 239:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1369
+		//line ./go/vt/sqlparser/sql.y:1378
 		{
 			yyVAL.expr = yyDollar[1].expr
 		}
-	case 238:
+	case 240:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1373
+		//line ./go/vt/sqlparser/sql.y:1382
 		{
 			yyVAL.expr = &AndExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr}
 		}
-	case 239:
+	case 241:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1377
+		//line ./go/vt/sqlparser/sql.y:1386
 		{
 			yyVAL.expr = &OrExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr}
 		}
-	case 240:
+	case 242:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1381
+		//line ./go/vt/sqlparser/sql.y:1390
 		{
 			yyVAL.expr = &NotExpr{Expr: yyDollar[2].expr}
 		}
-	case 241:
+	case 243:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1385
+		//line ./go/vt/sqlparser/sql.y:1394
 		{
 			yyVAL.expr = &IsExpr{Operator: yyDollar[3].str, Expr: yyDollar[1].expr}
 		}
-	case 242:
+	case 244:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1389
+		//line ./go/vt/sqlparser/sql.y:1398
 		{
 			yyVAL.expr = yyDollar[1].expr
 		}
-	case 243:
+	case 245:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1393
+		//line ./go/vt/sqlparser/sql.y:1402
 		{
 			yyVAL.expr = &Default{ColName: yyDollar[2].str}
 		}
-	case 244:
+	case 246:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1399
+		//line ./go/vt/sqlparser/sql.y:1408
 		{
 			yyVAL.str = ""
 		}
-	case 245:
+	case 247:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1403
+		//line ./go/vt/sqlparser/sql.y:1412
 		{
 			yyVAL.str = string(yyDollar[2].bytes)
 		}
-	case 246:
+	case 248:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1409
+		//line ./go/vt/sqlparser/sql.y:1418
 		{
 			yyVAL.boolVal = BoolVal(true)
 		}
-	case 247:
+	case 249:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1413
+		//line ./go/vt/sqlparser/sql.y:1422
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 248:
+	case 250:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1419
+		//line ./go/vt/sqlparser/sql.y:1428
 		{
 			yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: yyDollar[2].str, Right: yyDollar[3].expr}
 		}
-	case 249:
+	case 251:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1423
+		//line ./go/vt/sqlparser/sql.y:1432
 		{
 			yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: InStr, Right: yyDollar[3].colTuple}
 		}
-	case 250:
+	case 252:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1427
+		//line ./go/vt/sqlparser/sql.y:1436
 		{
 			yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotInStr, Right: yyDollar[4].colTuple}
 		}
-	case 251:
+	case 253:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1431
+		//line ./go/vt/sqlparser/sql.y:1440
 		{
 			yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: LikeStr, Right: yyDollar[3].expr, Escape: yyDollar[4].expr}
 		}
-	case 252:
+	case 254:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1435
+		//line ./go/vt/sqlparser/sql.y:1444
 		{
 			yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotLikeStr, Right: yyDollar[4].expr, Escape: yyDollar[5].expr}
 		}
-	case 253:
+	case 255:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1439
+		//line ./go/vt/sqlparser/sql.y:1448
 		{
 			yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: RegexpStr, Right: yyDollar[3].expr}
 		}
-	case 254:
+	case 256:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1443
+		//line ./go/vt/sqlparser/sql.y:1452
 		{
 			yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotRegexpStr, Right: yyDollar[4].expr}
 		}
-	case 255:
+	case 257:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1447
+		//line ./go/vt/sqlparser/sql.y:1456
 		{
 			yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: BetweenStr, From: yyDollar[3].expr, To: yyDollar[5].expr}
 		}
-	case 256:
+	case 258:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:1451
+		//line ./go/vt/sqlparser/sql.y:1460
 		{
 			yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: NotBetweenStr, From: yyDollar[4].expr, To: yyDollar[6].expr}
 		}
-	case 257:
+	case 259:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1455
+		//line ./go/vt/sqlparser/sql.y:1464
 		{
 			yyVAL.expr = &ExistsExpr{Subquery: yyDollar[2].subquery}
 		}
-	case 258:
+	case 260:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1461
+		//line ./go/vt/sqlparser/sql.y:1470
 		{
 			yyVAL.str = IsNullStr
 		}
-	case 259:
+	case 261:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1465
+		//line ./go/vt/sqlparser/sql.y:1474
 		{
 			yyVAL.str = IsNotNullStr
 		}
-	case 260:
+	case 262:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1469
+		//line ./go/vt/sqlparser/sql.y:1478
 		{
 			yyVAL.str = IsTrueStr
 		}
-	case 261:
+	case 263:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1473
+		//line ./go/vt/sqlparser/sql.y:1482
 		{
 			yyVAL.str = IsNotTrueStr
 		}
-	case 262:
+	case 264:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1477
+		//line ./go/vt/sqlparser/sql.y:1486
 		{
 			yyVAL.str = IsFalseStr
 		}
-	case 263:
+	case 265:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1481
+		//line ./go/vt/sqlparser/sql.y:1490
 		{
 			yyVAL.str = IsNotFalseStr
 		}
-	case 264:
+	case 266:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1487
+		//line ./go/vt/sqlparser/sql.y:1496
 		{
 			yyVAL.str = EqualStr
 		}
-	case 265:
+	case 267:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1491
+		//line ./go/vt/sqlparser/sql.y:1500
 		{
 			yyVAL.str = LessThanStr
 		}
-	case 266:
+	case 268:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1495
+		//line ./go/vt/sqlparser/sql.y:1504
 		{
 			yyVAL.str = GreaterThanStr
 		}
-	case 267:
+	case 269:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1499
+		//line ./go/vt/sqlparser/sql.y:1508
 		{
 			yyVAL.str = LessEqualStr
 		}
-	case 268:
+	case 270:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1503
+		//line ./go/vt/sqlparser/sql.y:1512
 		{
 			yyVAL.str = GreaterEqualStr
 		}
-	case 269:
+	case 271:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1507
+		//line ./go/vt/sqlparser/sql.y:1516
 		{
 			yyVAL.str = NotEqualStr
 		}
-	case 270:
+	case 272:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1511
+		//line ./go/vt/sqlparser/sql.y:1520
 		{
 			yyVAL.str = NullSafeEqualStr
 		}
-	case 271:
+	case 273:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1516
+		//line ./go/vt/sqlparser/sql.y:1525
 		{
 			yyVAL.expr = nil
 		}
-	case 272:
+	case 274:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1520
+		//line ./go/vt/sqlparser/sql.y:1529
 		{
 			yyVAL.expr = yyDollar[2].expr
 		}
-	case 273:
+	case 275:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1526
+		//line ./go/vt/sqlparser/sql.y:1535
 		{
 			yyVAL.colTuple = yyDollar[1].valTuple
 		}
-	case 274:
+	case 276:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1530
+		//line ./go/vt/sqlparser/sql.y:1539
 		{
 			yyVAL.colTuple = yyDollar[1].subquery
 		}
-	case 275:
+	case 277:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1534
+		//line ./go/vt/sqlparser/sql.y:1543
 		{
 			yyVAL.colTuple = ListArg(yyDollar[1].bytes)
 		}
-	case 276:
+	case 278:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1540
+		//line ./go/vt/sqlparser/sql.y:1549
 		{
 			yyVAL.subquery = &Subquery{yyDollar[2].selStmt}
 		}
-	case 277:
+	case 279:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1546
+		//line ./go/vt/sqlparser/sql.y:1555
 		{
 			yyVAL.exprs = Exprs{yyDollar[1].expr}
 		}
-	case 278:
+	case 280:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1550
+		//line ./go/vt/sqlparser/sql.y:1559
 		{
 			yyVAL.exprs = append(yyDollar[1].exprs, yyDollar[3].expr)
 		}
-	case 279:
+	case 281:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1556
+		//line ./go/vt/sqlparser/sql.y:1565
 		{
 			yyVAL.expr = yyDollar[1].expr
 		}
-	case 280:
+	case 282:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1560
+		//line ./go/vt/sqlparser/sql.y:1569
 		{
 			yyVAL.expr = yyDollar[1].boolVal
 		}
-	case 281:
+	case 283:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1564
+		//line ./go/vt/sqlparser/sql.y:1573
 		{
 			yyVAL.expr = yyDollar[1].colName
 		}
-	case 282:
+	case 284:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1568
+		//line ./go/vt/sqlparser/sql.y:1577
 		{
 			yyVAL.expr = yyDollar[1].expr
 		}
-	case 283:
+	case 285:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1572
+		//line ./go/vt/sqlparser/sql.y:1581
 		{
 			yyVAL.expr = yyDollar[1].subquery
 		}
-	case 284:
+	case 286:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1576
+		//line ./go/vt/sqlparser/sql.y:1585
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitAndStr, Right: yyDollar[3].expr}
 		}
-	case 285:
+	case 287:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1580
+		//line ./go/vt/sqlparser/sql.y:1589
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitOrStr, Right: yyDollar[3].expr}
 		}
-	case 286:
+	case 288:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1584
+		//line ./go/vt/sqlparser/sql.y:1593
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitXorStr, Right: yyDollar[3].expr}
 		}
-	case 287:
+	case 289:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1588
+		//line ./go/vt/sqlparser/sql.y:1597
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: PlusStr, Right: yyDollar[3].expr}
 		}
-	case 288:
+	case 290:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1592
+		//line ./go/vt/sqlparser/sql.y:1601
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MinusStr, Right: yyDollar[3].expr}
 		}
-	case 289:
+	case 291:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1596
+		//line ./go/vt/sqlparser/sql.y:1605
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MultStr, Right: yyDollar[3].expr}
 		}
-	case 290:
+	case 292:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1600
+		//line ./go/vt/sqlparser/sql.y:1609
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: DivStr, Right: yyDollar[3].expr}
 		}
-	case 291:
+	case 293:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1604
+		//line ./go/vt/sqlparser/sql.y:1613
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: IntDivStr, Right: yyDollar[3].expr}
 		}
-	case 292:
+	case 294:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1608
+		//line ./go/vt/sqlparser/sql.y:1617
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ModStr, Right: yyDollar[3].expr}
 		}
-	case 293:
+	case 295:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1612
+		//line ./go/vt/sqlparser/sql.y:1621
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ModStr, Right: yyDollar[3].expr}
 		}
-	case 294:
+	case 296:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1616
+		//line ./go/vt/sqlparser/sql.y:1625
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftLeftStr, Right: yyDollar[3].expr}
 		}
-	case 295:
+	case 297:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1620
+		//line ./go/vt/sqlparser/sql.y:1629
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftRightStr, Right: yyDollar[3].expr}
 		}
-	case 296:
+	case 298:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1624
+		//line ./go/vt/sqlparser/sql.y:1633
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].colName, Operator: JSONExtractOp, Right: yyDollar[3].expr}
 		}
-	case 297:
+	case 299:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1628
+		//line ./go/vt/sqlparser/sql.y:1637
 		{
 			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].colName, Operator: JSONUnquoteExtractOp, Right: yyDollar[3].expr}
 		}
-	case 298:
+	case 300:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1632
+		//line ./go/vt/sqlparser/sql.y:1641
 		{
 			yyVAL.expr = &CollateExpr{Expr: yyDollar[1].expr, Charset: yyDollar[3].str}
 		}
-	case 299:
+	case 301:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1636
+		//line ./go/vt/sqlparser/sql.y:1645
 		{
 			yyVAL.expr = &UnaryExpr{Operator: BinaryStr, Expr: yyDollar[2].expr}
 		}
-	case 300:
+	case 302:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1640
+		//line ./go/vt/sqlparser/sql.y:1649
 		{
 			if num, ok := yyDollar[2].expr.(*SQLVal); ok && num.Type == IntVal {
 				yyVAL.expr = num
@@ -3844,9 +3861,9 @@ yydefault:
 				yyVAL.expr = &UnaryExpr{Operator: UPlusStr, Expr: yyDollar[2].expr}
 			}
 		}
-	case 301:
+	case 303:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1648
+		//line ./go/vt/sqlparser/sql.y:1657
 		{
 			if num, ok := yyDollar[2].expr.(*SQLVal); ok && num.Type == IntVal {
 				// Handle double negative
@@ -3860,21 +3877,21 @@ yydefault:
 				yyVAL.expr = &UnaryExpr{Operator: UMinusStr, Expr: yyDollar[2].expr}
 			}
 		}
-	case 302:
+	case 304:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1662
+		//line ./go/vt/sqlparser/sql.y:1671
 		{
 			yyVAL.expr = &UnaryExpr{Operator: TildaStr, Expr: yyDollar[2].expr}
 		}
-	case 303:
+	case 305:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1666
+		//line ./go/vt/sqlparser/sql.y:1675
 		{
 			yyVAL.expr = &UnaryExpr{Operator: BangStr, Expr: yyDollar[2].expr}
 		}
-	case 304:
+	case 306:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1670
+		//line ./go/vt/sqlparser/sql.y:1679
 		{
 			// This rule prevents the usage of INTERVAL
 			// as a function. If support is needed for that,
@@ -3882,395 +3899,395 @@ yydefault:
 			// will be non-trivial because of grammar conflicts.
 			yyVAL.expr = &IntervalExpr{Expr: yyDollar[2].expr, Unit: yyDollar[3].colIdent}
 		}
-	case 309:
+	case 311:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1688
+		//line ./go/vt/sqlparser/sql.y:1697
 		{
 			yyVAL.expr = &FuncExpr{Name: yyDollar[1].colIdent, Exprs: yyDollar[3].selectExprs}
 		}
-	case 310:
+	case 312:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1692
+		//line ./go/vt/sqlparser/sql.y:1701
 		{
 			yyVAL.expr = &FuncExpr{Name: yyDollar[1].colIdent, Distinct: true, Exprs: yyDollar[4].selectExprs}
 		}
-	case 311:
+	case 313:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:1696
+		//line ./go/vt/sqlparser/sql.y:1705
 		{
 			yyVAL.expr = &FuncExpr{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].colIdent, Exprs: yyDollar[5].selectExprs}
 		}
-	case 312:
+	case 314:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1706
+		//line ./go/vt/sqlparser/sql.y:1715
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("left"), Exprs: yyDollar[3].selectExprs}
 		}
-	case 313:
+	case 315:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1710
+		//line ./go/vt/sqlparser/sql.y:1719
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("right"), Exprs: yyDollar[3].selectExprs}
 		}
-	case 314:
+	case 316:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:1714
+		//line ./go/vt/sqlparser/sql.y:1723
 		{
 			yyVAL.expr = &ConvertExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].convertType}
 		}
-	case 315:
+	case 317:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:1718
+		//line ./go/vt/sqlparser/sql.y:1727
 		{
 			yyVAL.expr = &ConvertExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].convertType}
 		}
-	case 316:
+	case 318:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:1722
+		//line ./go/vt/sqlparser/sql.y:1731
 		{
 			yyVAL.expr = &ConvertUsingExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].str}
 		}
-	case 317:
+	case 319:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line sql.y:1726
+		//line ./go/vt/sqlparser/sql.y:1735
 		{
 			yyVAL.expr = &MatchExpr{Columns: yyDollar[3].selectExprs, Expr: yyDollar[7].expr, Option: yyDollar[8].str}
 		}
-	case 318:
+	case 320:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:1730
+		//line ./go/vt/sqlparser/sql.y:1739
 		{
 			yyVAL.expr = &GroupConcatExpr{Distinct: yyDollar[3].str, Exprs: yyDollar[4].selectExprs, OrderBy: yyDollar[5].orderBy, Separator: yyDollar[6].str}
 		}
-	case 319:
+	case 321:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1734
+		//line ./go/vt/sqlparser/sql.y:1743
 		{
 			yyVAL.expr = &CaseExpr{Expr: yyDollar[2].expr, Whens: yyDollar[3].whens, Else: yyDollar[4].expr}
 		}
-	case 320:
+	case 322:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1738
+		//line ./go/vt/sqlparser/sql.y:1747
 		{
 			yyVAL.expr = &ValuesFuncExpr{Name: yyDollar[3].colIdent}
 		}
-	case 321:
+	case 323:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1748
+		//line ./go/vt/sqlparser/sql.y:1757
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_timestamp")}
 		}
-	case 322:
+	case 324:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1752
+		//line ./go/vt/sqlparser/sql.y:1761
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_timestamp")}
 		}
-	case 323:
+	case 325:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1756
+		//line ./go/vt/sqlparser/sql.y:1765
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_time")}
 		}
-	case 324:
+	case 326:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1760
+		//line ./go/vt/sqlparser/sql.y:1769
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_date")}
 		}
-	case 325:
+	case 327:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1765
+		//line ./go/vt/sqlparser/sql.y:1774
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("localtime")}
 		}
-	case 326:
+	case 328:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1770
+		//line ./go/vt/sqlparser/sql.y:1779
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("localtimestamp")}
 		}
-	case 327:
+	case 329:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1775
+		//line ./go/vt/sqlparser/sql.y:1784
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_date")}
 		}
-	case 328:
+	case 330:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1780
+		//line ./go/vt/sqlparser/sql.y:1789
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_time")}
 		}
-	case 331:
+	case 333:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1794
+		//line ./go/vt/sqlparser/sql.y:1803
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("if"), Exprs: yyDollar[3].selectExprs}
 		}
-	case 332:
+	case 334:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1798
+		//line ./go/vt/sqlparser/sql.y:1807
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("database"), Exprs: yyDollar[3].selectExprs}
 		}
-	case 333:
+	case 335:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1802
+		//line ./go/vt/sqlparser/sql.y:1811
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("mod"), Exprs: yyDollar[3].selectExprs}
 		}
-	case 334:
+	case 336:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1806
+		//line ./go/vt/sqlparser/sql.y:1815
 		{
 			yyVAL.expr = &FuncExpr{Name: NewColIdent("replace"), Exprs: yyDollar[3].selectExprs}
 		}
-	case 335:
+	case 337:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1812
+		//line ./go/vt/sqlparser/sql.y:1821
 		{
 			yyVAL.str = ""
 		}
-	case 336:
+	case 338:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1816
+		//line ./go/vt/sqlparser/sql.y:1825
 		{
 			yyVAL.str = BooleanModeStr
 		}
-	case 337:
+	case 339:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1820
+		//line ./go/vt/sqlparser/sql.y:1829
 		{
 			yyVAL.str = NaturalLanguageModeStr
 		}
-	case 338:
+	case 340:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:1824
+		//line ./go/vt/sqlparser/sql.y:1833
 		{
 			yyVAL.str = NaturalLanguageModeWithQueryExpansionStr
 		}
-	case 339:
+	case 341:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1828
+		//line ./go/vt/sqlparser/sql.y:1837
 		{
 			yyVAL.str = QueryExpansionStr
 		}
-	case 340:
+	case 342:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1834
+		//line ./go/vt/sqlparser/sql.y:1843
 		{
 			yyVAL.str = string(yyDollar[1].bytes)
 		}
-	case 341:
+	case 343:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1838
+		//line ./go/vt/sqlparser/sql.y:1847
 		{
 			yyVAL.str = string(yyDollar[1].bytes)
 		}
-	case 342:
+	case 344:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1844
+		//line ./go/vt/sqlparser/sql.y:1853
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 343:
+	case 345:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1848
+		//line ./go/vt/sqlparser/sql.y:1857
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Operator: CharacterSetStr}
 		}
-	case 344:
+	case 346:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1852
+		//line ./go/vt/sqlparser/sql.y:1861
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: string(yyDollar[3].bytes)}
 		}
-	case 345:
+	case 347:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1856
+		//line ./go/vt/sqlparser/sql.y:1865
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
-	case 346:
+	case 348:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1860
+		//line ./go/vt/sqlparser/sql.y:1869
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 347:
+	case 349:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1864
+		//line ./go/vt/sqlparser/sql.y:1873
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 			yyVAL.convertType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.convertType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
-	case 348:
+	case 350:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1870
+		//line ./go/vt/sqlparser/sql.y:1879
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
-	case 349:
+	case 351:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1874
+		//line ./go/vt/sqlparser/sql.y:1883
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 350:
+	case 352:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1878
+		//line ./go/vt/sqlparser/sql.y:1887
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
-	case 351:
+	case 353:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1882
+		//line ./go/vt/sqlparser/sql.y:1891
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
-	case 352:
+	case 354:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1886
+		//line ./go/vt/sqlparser/sql.y:1895
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
-	case 353:
+	case 355:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1890
+		//line ./go/vt/sqlparser/sql.y:1899
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
-	case 354:
+	case 356:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1894
+		//line ./go/vt/sqlparser/sql.y:1903
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
-	case 355:
+	case 357:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1899
+		//line ./go/vt/sqlparser/sql.y:1908
 		{
 			yyVAL.expr = nil
 		}
-	case 356:
+	case 358:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1903
+		//line ./go/vt/sqlparser/sql.y:1912
 		{
 			yyVAL.expr = yyDollar[1].expr
 		}
-	case 357:
+	case 359:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1908
+		//line ./go/vt/sqlparser/sql.y:1917
 		{
 			yyVAL.str = string("")
 		}
-	case 358:
+	case 360:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1912
+		//line ./go/vt/sqlparser/sql.y:1921
 		{
 			yyVAL.str = " separator '" + string(yyDollar[2].bytes) + "'"
 		}
-	case 359:
+	case 361:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1918
+		//line ./go/vt/sqlparser/sql.y:1927
 		{
 			yyVAL.whens = []*When{yyDollar[1].when}
 		}
-	case 360:
+	case 362:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1922
+		//line ./go/vt/sqlparser/sql.y:1931
 		{
 			yyVAL.whens = append(yyDollar[1].whens, yyDollar[2].when)
 		}
-	case 361:
+	case 363:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1928
+		//line ./go/vt/sqlparser/sql.y:1937
 		{
 			yyVAL.when = &When{Cond: yyDollar[2].expr, Val: yyDollar[4].expr}
 		}
-	case 362:
+	case 364:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1933
+		//line ./go/vt/sqlparser/sql.y:1942
 		{
 			yyVAL.expr = nil
 		}
-	case 363:
+	case 365:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1937
+		//line ./go/vt/sqlparser/sql.y:1946
 		{
 			yyVAL.expr = yyDollar[2].expr
 		}
-	case 364:
+	case 366:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1943
+		//line ./go/vt/sqlparser/sql.y:1952
 		{
 			yyVAL.colName = &ColName{Name: yyDollar[1].colIdent}
 		}
-	case 365:
+	case 367:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1947
+		//line ./go/vt/sqlparser/sql.y:1956
 		{
 			yyVAL.colName = &ColName{Qualifier: TableName{Name: yyDollar[1].tableIdent}, Name: yyDollar[3].colIdent}
 		}
-	case 366:
+	case 368:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1951
+		//line ./go/vt/sqlparser/sql.y:1960
 		{
 			yyVAL.colName = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}, Name: yyDollar[5].colIdent}
 		}
-	case 367:
+	case 369:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1957
+		//line ./go/vt/sqlparser/sql.y:1966
 		{
 			yyVAL.expr = NewStrVal(yyDollar[1].bytes)
 		}
-	case 368:
+	case 370:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1961
+		//line ./go/vt/sqlparser/sql.y:1970
 		{
 			yyVAL.expr = NewHexVal(yyDollar[1].bytes)
 		}
-	case 369:
+	case 371:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1965
+		//line ./go/vt/sqlparser/sql.y:1974
 		{
 			yyVAL.expr = NewBitVal(yyDollar[1].bytes)
 		}
-	case 370:
+	case 372:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1969
+		//line ./go/vt/sqlparser/sql.y:1978
 		{
 			yyVAL.expr = NewIntVal(yyDollar[1].bytes)
 		}
-	case 371:
+	case 373:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1973
+		//line ./go/vt/sqlparser/sql.y:1982
 		{
 			yyVAL.expr = NewFloatVal(yyDollar[1].bytes)
 		}
-	case 372:
+	case 374:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1977
+		//line ./go/vt/sqlparser/sql.y:1986
 		{
 			yyVAL.expr = NewHexNum(yyDollar[1].bytes)
 		}
-	case 373:
+	case 375:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1981
+		//line ./go/vt/sqlparser/sql.y:1990
 		{
 			yyVAL.expr = NewValArg(yyDollar[1].bytes)
 		}
-	case 374:
+	case 376:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1985
+		//line ./go/vt/sqlparser/sql.y:1994
 		{
 			yyVAL.expr = &NullVal{}
 		}
-	case 375:
+	case 377:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1991
+		//line ./go/vt/sqlparser/sql.y:2000
 		{
 			// TODO(sougou): Deprecate this construct.
 			if yyDollar[1].colIdent.Lowered() != "value" {
@@ -4279,239 +4296,239 @@ yydefault:
 			}
 			yyVAL.expr = NewIntVal([]byte("1"))
 		}
-	case 376:
+	case 378:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2000
+		//line ./go/vt/sqlparser/sql.y:2009
 		{
 			yyVAL.expr = NewIntVal(yyDollar[1].bytes)
 		}
-	case 377:
+	case 379:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2004
+		//line ./go/vt/sqlparser/sql.y:2013
 		{
 			yyVAL.expr = NewValArg(yyDollar[1].bytes)
 		}
-	case 378:
+	case 380:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2009
+		//line ./go/vt/sqlparser/sql.y:2018
 		{
 			yyVAL.exprs = nil
 		}
-	case 379:
+	case 381:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2013
+		//line ./go/vt/sqlparser/sql.y:2022
 		{
 			yyVAL.exprs = yyDollar[3].exprs
 		}
-	case 380:
+	case 382:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2018
+		//line ./go/vt/sqlparser/sql.y:2027
 		{
 			yyVAL.expr = nil
 		}
-	case 381:
+	case 383:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2022
+		//line ./go/vt/sqlparser/sql.y:2031
 		{
 			yyVAL.expr = yyDollar[2].expr
 		}
-	case 382:
+	case 384:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2027
+		//line ./go/vt/sqlparser/sql.y:2036
 		{
 			yyVAL.orderBy = nil
 		}
-	case 383:
+	case 385:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2031
+		//line ./go/vt/sqlparser/sql.y:2040
 		{
 			yyVAL.orderBy = yyDollar[3].orderBy
 		}
-	case 384:
+	case 386:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2037
+		//line ./go/vt/sqlparser/sql.y:2046
 		{
 			yyVAL.orderBy = OrderBy{yyDollar[1].order}
 		}
-	case 385:
+	case 387:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2041
+		//line ./go/vt/sqlparser/sql.y:2050
 		{
 			yyVAL.orderBy = append(yyDollar[1].orderBy, yyDollar[3].order)
 		}
-	case 386:
+	case 388:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2047
+		//line ./go/vt/sqlparser/sql.y:2056
 		{
 			yyVAL.order = &Order{Expr: yyDollar[1].expr, Direction: yyDollar[2].str}
 		}
-	case 387:
+	case 389:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2052
+		//line ./go/vt/sqlparser/sql.y:2061
 		{
 			yyVAL.str = AscScr
 		}
-	case 388:
+	case 390:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2056
+		//line ./go/vt/sqlparser/sql.y:2065
 		{
 			yyVAL.str = AscScr
 		}
-	case 389:
+	case 391:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2060
+		//line ./go/vt/sqlparser/sql.y:2069
 		{
 			yyVAL.str = DescScr
 		}
-	case 390:
+	case 392:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2065
+		//line ./go/vt/sqlparser/sql.y:2074
 		{
 			yyVAL.limit = nil
 		}
-	case 391:
+	case 393:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2069
+		//line ./go/vt/sqlparser/sql.y:2078
 		{
 			yyVAL.limit = &Limit{Rowcount: yyDollar[2].expr}
 		}
-	case 392:
+	case 394:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2073
+		//line ./go/vt/sqlparser/sql.y:2082
 		{
 			yyVAL.limit = &Limit{Offset: yyDollar[2].expr, Rowcount: yyDollar[4].expr}
 		}
-	case 393:
+	case 395:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2077
+		//line ./go/vt/sqlparser/sql.y:2086
 		{
 			yyVAL.limit = &Limit{Offset: yyDollar[4].expr, Rowcount: yyDollar[2].expr}
 		}
-	case 394:
+	case 396:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2082
+		//line ./go/vt/sqlparser/sql.y:2091
 		{
 			yyVAL.str = ""
 		}
-	case 395:
+	case 397:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2086
+		//line ./go/vt/sqlparser/sql.y:2095
 		{
 			yyVAL.str = ForUpdateStr
 		}
-	case 396:
+	case 398:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2090
+		//line ./go/vt/sqlparser/sql.y:2099
 		{
 			yyVAL.str = ShareModeStr
 		}
-	case 397:
+	case 399:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2103
+		//line ./go/vt/sqlparser/sql.y:2112
 		{
 			yyVAL.ins = &Insert{Rows: yyDollar[2].values}
 		}
-	case 398:
+	case 400:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2107
+		//line ./go/vt/sqlparser/sql.y:2116
 		{
 			yyVAL.ins = &Insert{Rows: yyDollar[1].selStmt}
 		}
-	case 399:
+	case 401:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2111
+		//line ./go/vt/sqlparser/sql.y:2120
 		{
 			// Drop the redundant parenthesis.
 			yyVAL.ins = &Insert{Rows: yyDollar[2].selStmt}
 		}
-	case 400:
+	case 402:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:2116
+		//line ./go/vt/sqlparser/sql.y:2125
 		{
 			yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].values}
 		}
-	case 401:
+	case 403:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2120
+		//line ./go/vt/sqlparser/sql.y:2129
 		{
 			yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[4].selStmt}
 		}
-	case 402:
+	case 404:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:2124
+		//line ./go/vt/sqlparser/sql.y:2133
 		{
 			// Drop the redundant parenthesis.
 			yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].selStmt}
 		}
-	case 403:
+	case 405:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2131
+		//line ./go/vt/sqlparser/sql.y:2140
 		{
 			yyVAL.columns = Columns{yyDollar[1].colIdent}
 		}
-	case 404:
+	case 406:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2135
+		//line ./go/vt/sqlparser/sql.y:2144
 		{
 			yyVAL.columns = Columns{yyDollar[3].colIdent}
 		}
-	case 405:
+	case 407:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2139
+		//line ./go/vt/sqlparser/sql.y:2148
 		{
 			yyVAL.columns = append(yyVAL.columns, yyDollar[3].colIdent)
 		}
-	case 406:
+	case 408:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:2143
+		//line ./go/vt/sqlparser/sql.y:2152
 		{
 			yyVAL.columns = append(yyVAL.columns, yyDollar[5].colIdent)
 		}
-	case 407:
+	case 409:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2148
+		//line ./go/vt/sqlparser/sql.y:2157
 		{
 			yyVAL.updateExprs = nil
 		}
-	case 408:
+	case 410:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:2152
+		//line ./go/vt/sqlparser/sql.y:2161
 		{
 			yyVAL.updateExprs = yyDollar[5].updateExprs
 		}
-	case 409:
+	case 411:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2158
+		//line ./go/vt/sqlparser/sql.y:2167
 		{
 			yyVAL.values = Values{yyDollar[1].valTuple}
 		}
-	case 410:
+	case 412:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2162
+		//line ./go/vt/sqlparser/sql.y:2171
 		{
 			yyVAL.values = append(yyDollar[1].values, yyDollar[3].valTuple)
 		}
-	case 411:
+	case 413:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2168
+		//line ./go/vt/sqlparser/sql.y:2177
 		{
 			yyVAL.valTuple = yyDollar[1].valTuple
 		}
-	case 412:
+	case 414:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2172
+		//line ./go/vt/sqlparser/sql.y:2181
 		{
 			yyVAL.valTuple = ValTuple{}
 		}
-	case 413:
+	case 415:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2178
+		//line ./go/vt/sqlparser/sql.y:2187
 		{
 			yyVAL.valTuple = ValTuple(yyDollar[2].exprs)
 		}
-	case 414:
+	case 416:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2184
+		//line ./go/vt/sqlparser/sql.y:2193
 		{
 			if len(yyDollar[1].valTuple) == 1 {
 				yyVAL.expr = &ParenExpr{yyDollar[1].valTuple[0]}
@@ -4519,258 +4536,258 @@ yydefault:
 				yyVAL.expr = yyDollar[1].valTuple
 			}
 		}
-	case 415:
+	case 417:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2194
+		//line ./go/vt/sqlparser/sql.y:2203
 		{
 			yyVAL.updateExprs = UpdateExprs{yyDollar[1].updateExpr}
 		}
-	case 416:
+	case 418:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2198
+		//line ./go/vt/sqlparser/sql.y:2207
 		{
 			yyVAL.updateExprs = append(yyDollar[1].updateExprs, yyDollar[3].updateExpr)
 		}
-	case 417:
+	case 419:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2204
+		//line ./go/vt/sqlparser/sql.y:2213
 		{
 			yyVAL.updateExpr = &UpdateExpr{Name: yyDollar[1].colName, Expr: yyDollar[3].expr}
 		}
-	case 420:
+	case 422:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2213
+		//line ./go/vt/sqlparser/sql.y:2222
 		{
 			yyVAL.byt = 0
 		}
-	case 421:
+	case 423:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2215
+		//line ./go/vt/sqlparser/sql.y:2224
 		{
 			yyVAL.byt = 1
 		}
-	case 422:
+	case 424:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2218
+		//line ./go/vt/sqlparser/sql.y:2227
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 423:
+	case 425:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2220
+		//line ./go/vt/sqlparser/sql.y:2229
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 424:
+	case 426:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2223
+		//line ./go/vt/sqlparser/sql.y:2232
 		{
 			yyVAL.str = ""
 		}
-	case 425:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2225
-		{
-			yyVAL.str = IgnoreStr
-		}
-	case 426:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2229
-		{
-			yyVAL.empty = struct{}{}
-		}
 	case 427:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2231
+		//line ./go/vt/sqlparser/sql.y:2234
 		{
-			yyVAL.empty = struct{}{}
+			yyVAL.str = IgnoreStr
 		}
 	case 428:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2233
+		//line ./go/vt/sqlparser/sql.y:2238
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 429:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2235
+		//line ./go/vt/sqlparser/sql.y:2240
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 430:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2237
+		//line ./go/vt/sqlparser/sql.y:2242
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 431:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2239
+		//line ./go/vt/sqlparser/sql.y:2244
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 432:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2241
+		//line ./go/vt/sqlparser/sql.y:2246
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 433:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2243
+		//line ./go/vt/sqlparser/sql.y:2248
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 434:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2245
+		//line ./go/vt/sqlparser/sql.y:2250
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 435:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2247
+		//line ./go/vt/sqlparser/sql.y:2252
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 436:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2249
+		//line ./go/vt/sqlparser/sql.y:2254
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 437:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2252
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2256
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 438:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2254
+		//line ./go/vt/sqlparser/sql.y:2258
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 439:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2256
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2261
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 440:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2260
+		//line ./go/vt/sqlparser/sql.y:2263
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 441:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2262
+		//line ./go/vt/sqlparser/sql.y:2265
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 442:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2265
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2269
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 443:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2267
+		//line ./go/vt/sqlparser/sql.y:2271
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 444:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2269
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2274
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 445:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2272
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2276
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 446:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2274
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2278
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 447:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2278
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2281
 		{
-			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
+			yyVAL.empty = struct{}{}
 		}
 	case 448:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2283
+		{
+			yyVAL.empty = struct{}{}
+		}
+	case 449:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2282
+		//line ./go/vt/sqlparser/sql.y:2287
 		{
 			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
 	case 450:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2289
+		//line ./go/vt/sqlparser/sql.y:2291
 		{
 			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
-	case 451:
+	case 452:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2295
+		//line ./go/vt/sqlparser/sql.y:2298
 		{
-			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
+			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
-	case 452:
+	case 453:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2299
+		//line ./go/vt/sqlparser/sql.y:2304
 		{
 			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
 		}
 	case 454:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2306
+		//line ./go/vt/sqlparser/sql.y:2308
+		{
+			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
+		}
+	case 456:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line ./go/vt/sqlparser/sql.y:2315
 		{
 			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
 		}
-	case 605:
+	case 607:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2482
+		//line ./go/vt/sqlparser/sql.y:2491
 		{
 			if incNesting(yylex) {
 				yylex.Error("max nesting level reached")
 				return 1
 			}
 		}
-	case 606:
+	case 608:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2491
+		//line ./go/vt/sqlparser/sql.y:2500
 		{
 			decNesting(yylex)
 		}
-	case 607:
+	case 609:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2496
+		//line ./go/vt/sqlparser/sql.y:2505
 		{
 			forceEOF(yylex)
 		}
-	case 608:
+	case 610:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2501
+		//line ./go/vt/sqlparser/sql.y:2510
 		{
 			forceEOF(yylex)
 		}
-	case 609:
+	case 611:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2505
+		//line ./go/vt/sqlparser/sql.y:2514
 		{
 			forceEOF(yylex)
 		}
-	case 610:
+	case 612:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2509
+		//line ./go/vt/sqlparser/sql.y:2518
 		{
 			forceEOF(yylex)
 		}
diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y
index f19648f80f5..801fb16016f 100644
--- a/go/vt/sqlparser/sql.y
+++ b/go/vt/sqlparser/sql.y
@@ -233,7 +233,7 @@ func forceEOF(yylex interface{}) {
 %type <byt> exists_opt
 %type <empty> not_exists_opt non_rename_operation to_opt index_opt constraint_opt using_opt
 %type <bytes> reserved_keyword non_reserved_keyword
-%type <colIdent> sql_id reserved_sql_id col_alias as_ci_opt
+%type <colIdent> sql_id reserved_sql_id col_alias as_ci_opt charset_value
 %type <tableIdent> table_id reserved_table_id table_alias as_opt_id
 %type <empty> as_opt
 %type <empty> force_eof ddl_force_eof
@@ -403,7 +403,7 @@ table_name_list:
   }
 
 set_statement:
-  SET comment_opt charset_or_character_set reserved_sql_id force_eof
+  SET comment_opt charset_or_character_set charset_value force_eof
   {
     $$ = &Set{Comments: Comments($2), Charset: $4}
   }
@@ -417,6 +417,15 @@ charset_or_character_set:
 | CHARACTER SET
 | NAMES
 
+charset_value:
+  reserved_sql_id
+  {
+    $$ = $1
+  }
+| STRING
+  {
+    $$ = NewColIdent(string($1))
+  }
 
 create_statement:
   create_table_prefix table_spec
@@ -1017,6 +1026,10 @@ use_statement:
   {
     $$ = &Use{DBName: $2}
   }
+| USE
+  {
+    $$ = &Use{DBName:TableIdent{v:""}}
+  }
 
 other_statement:
   DESC force_eof
diff --git a/go/vt/tableacl/acl/acl.go b/go/vt/tableacl/acl/acl.go
index 4c66e14f04a..0b5c531a2c0 100644
--- a/go/vt/tableacl/acl/acl.go
+++ b/go/vt/tableacl/acl/acl.go
@@ -35,7 +35,7 @@ type Factory interface {
 // DenyAllACL implements ACL interface and alway deny access request.
 type DenyAllACL struct{}
 
-// IsMember implements ACL.IsMember and always return fasle.
+// IsMember implements ACL.IsMember and always return false.
 func (acl DenyAllACL) IsMember(principal *querypb.VTGateCallerID) bool {
 	return false
 }
diff --git a/go/vt/throttler/grpcthrottlerclient/grpcthrottlerclient_test.go b/go/vt/throttler/grpcthrottlerclient/grpcthrottlerclient_test.go
index 2ff70db095d..d2cc5810848 100644
--- a/go/vt/throttler/grpcthrottlerclient/grpcthrottlerclient_test.go
+++ b/go/vt/throttler/grpcthrottlerclient/grpcthrottlerclient_test.go
@@ -30,9 +30,8 @@ import (
 // TestThrottlerServer tests the gRPC implementation using a throttler client
 // and server.
 func TestThrottlerServer(t *testing.T) {
-	s, port := startGRPCServer(t)
 	// Use the global manager which is a singleton.
-	grpcthrottlerserver.StartServer(s, throttler.GlobalManager)
+	port := startGRPCServer(t, throttler.GlobalManager)
 
 	// Create a ThrottlerClient gRPC client to talk to the throttler.
 	client, err := factory(fmt.Sprintf("localhost:%v", port))
@@ -47,9 +46,8 @@ func TestThrottlerServer(t *testing.T) {
 // TestThrottlerServerPanics tests the panic handling of the gRPC throttler
 // server implementation.
 func TestThrottlerServerPanics(t *testing.T) {
-	s, port := startGRPCServer(t)
 	// For testing the panic handling, use a fake Manager instead.
-	grpcthrottlerserver.StartServer(s, &throttlerclienttest.FakeManager{})
+	port := startGRPCServer(t, &throttlerclienttest.FakeManager{})
 
 	// Create a ThrottlerClient gRPC client to talk to the throttler.
 	client, err := factory(fmt.Sprintf("localhost:%v", port))
@@ -61,15 +59,17 @@ func TestThrottlerServerPanics(t *testing.T) {
 	throttlerclienttest.TestSuitePanics(t, client)
 }
 
-func startGRPCServer(t *testing.T) (*grpc.Server, int) {
+func startGRPCServer(t *testing.T, m throttler.Manager) int {
 	// Listen on a random port.
 	listener, err := net.Listen("tcp", ":0")
 	if err != nil {
 		t.Fatalf("Cannot listen: %v", err)
 	}
 
-	// Create a gRPC server and listen on the port.
 	s := grpc.NewServer()
+	grpcthrottlerserver.RegisterServer(s, m)
+	// Call Serve() after our service has been registered. Otherwise, the test
+	// will fail with the error "grpc: Server.RegisterService after Server.Serve".
 	go s.Serve(listener)
-	return s, listener.Addr().(*net.TCPAddr).Port
+	return listener.Addr().(*net.TCPAddr).Port
 }
diff --git a/go/vt/throttler/grpcthrottlerserver/grpcthrottlerserver.go b/go/vt/throttler/grpcthrottlerserver/grpcthrottlerserver.go
index 81c71547112..d6cebc0b69c 100644
--- a/go/vt/throttler/grpcthrottlerserver/grpcthrottlerserver.go
+++ b/go/vt/throttler/grpcthrottlerserver/grpcthrottlerserver.go
@@ -100,15 +100,15 @@ func (s *Server) ResetConfiguration(_ context.Context, request *throttlerdata.Re
 	}, nil
 }
 
-// StartServer registers the Server instance with the gRPC server.
-func StartServer(s *grpc.Server, m throttler.Manager) {
+// RegisterServer registers a new throttler server instance with the gRPC server.
+func RegisterServer(s *grpc.Server, m throttler.Manager) {
 	throttlerservice.RegisterThrottlerServer(s, NewServer(m))
 }
 
 func init() {
 	servenv.OnRun(func() {
 		if servenv.GRPCCheckServiceMap("throttler") {
-			StartServer(servenv.GRPCServer, throttler.GlobalManager)
+			RegisterServer(servenv.GRPCServer, throttler.GlobalManager)
 		}
 	})
 }
diff --git a/go/vt/topo/topoproto/tablet.go b/go/vt/topo/topoproto/tablet.go
index f73dd782536..5a9f0133d88 100644
--- a/go/vt/topo/topoproto/tablet.go
+++ b/go/vt/topo/topoproto/tablet.go
@@ -75,7 +75,7 @@ func TabletAliasUIDStr(ta *topodatapb.TabletAlias) string {
 func ParseTabletAlias(aliasStr string) (*topodatapb.TabletAlias, error) {
 	nameParts := strings.Split(aliasStr, "-")
 	if len(nameParts) != 2 {
-		return nil, fmt.Errorf("invalid tablet alias: %v", aliasStr)
+		return nil, fmt.Errorf("invalid tablet alias: %q, expecting format: %q", aliasStr, "<cell>-<uid>")
 	}
 	uid, err := ParseUID(nameParts[1])
 	if err != nil {
diff --git a/go/vt/topotools/tablet.go b/go/vt/topotools/tablet.go
index 252eec76ab9..5f45e7a11bf 100644
--- a/go/vt/topotools/tablet.go
+++ b/go/vt/topotools/tablet.go
@@ -44,6 +44,7 @@ import (
 	"github.com/youtube/vitess/go/vt/topo"
 	"github.com/youtube/vitess/go/vt/topo/topoproto"
 
+	querypb "github.com/youtube/vitess/go/vt/proto/query"
 	topodatapb "github.com/youtube/vitess/go/vt/proto/topodata"
 )
 
@@ -113,3 +114,8 @@ func TabletIdent(tablet *topodatapb.Tablet) string {
 
 	return fmt.Sprintf("%s-%d (%s%s)", tablet.Alias.Cell, tablet.Alias.Uid, tablet.Hostname, tagStr)
 }
+
+// TargetIdent returns a concise string representation of a query target
+func TargetIdent(target *querypb.Target) string {
+	return fmt.Sprintf("%s/%s (%s)", target.Keyspace, target.Shard, target.TabletType)
+}
diff --git a/go/vt/vitessdriver/convert.go b/go/vt/vitessdriver/convert.go
new file mode 100644
index 00000000000..792c02a4bfb
--- /dev/null
+++ b/go/vt/vitessdriver/convert.go
@@ -0,0 +1,118 @@
+/*
+Copyright 2017 GitHub Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreedto in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package vitessdriver
+
+import (
+	"database/sql/driver"
+	"fmt"
+	"time"
+
+	"github.com/youtube/vitess/go/sqltypes"
+	querypb "github.com/youtube/vitess/go/vt/proto/query"
+)
+
+type converter struct {
+	location *time.Location
+}
+
+func (cv *converter) ToNative(v sqltypes.Value) (interface{}, error) {
+	switch v.Type() {
+	case sqltypes.Datetime:
+		return DatetimeToNative(v, cv.location)
+	case sqltypes.Date:
+		return DateToNative(v, cv.location)
+	}
+	return sqltypes.ToNative(v)
+}
+
+func (cv *converter) BuildBindVariable(v interface{}) (*querypb.BindVariable, error) {
+	if t, ok := v.(time.Time); ok {
+		return sqltypes.ValueBindVariable(NewDatetime(t, cv.location)), nil
+	}
+	return sqltypes.BuildBindVariable(v)
+}
+
+// populateRow populates a row of data using the table's field descriptions.
+// The returned types for "dest" include the list from the interface
+// specification at https://golang.org/pkg/database/sql/driver/#Value
+// and in addition the type "uint64" for unsigned BIGINT MySQL records.
+func (cv *converter) populateRow(dest []driver.Value, row []sqltypes.Value) (err error) {
+	for i := range dest {
+		dest[i], err = cv.ToNative(row[i])
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+func (cv *converter) buildBindVars(args []driver.Value) (map[string]*querypb.BindVariable, error) {
+	bindVars := make(map[string]*querypb.BindVariable, len(args))
+	for i, v := range args {
+		bv, err := cv.BuildBindVariable(v)
+		if err != nil {
+			return nil, err
+		}
+		bindVars[fmt.Sprintf("v%d", i+1)] = bv
+	}
+	return bindVars, nil
+}
+
+func (cv *converter) bindVarsFromNamedValues(args []driver.NamedValue) (map[string]*querypb.BindVariable, error) {
+	bindVars := make(map[string]*querypb.BindVariable, len(args))
+	nameUsed := false
+	for i, v := range args {
+		bv, err := cv.BuildBindVariable(v.Value)
+		if err != nil {
+			return nil, err
+		}
+		if i == 0 {
+			// Determine if args are based on names or ordinals.
+			if v.Name != "" {
+				nameUsed = true
+			}
+		} else {
+			// Verify that there's no intermixing.
+			if nameUsed && v.Name == "" {
+				return nil, errNoIntermixing
+			}
+			if !nameUsed && v.Name != "" {
+				return nil, errNoIntermixing
+			}
+		}
+		if v.Name == "" {
+			bindVars[fmt.Sprintf("v%d", i+1)] = bv
+		} else {
+			if v.Name[0] == ':' || v.Name[0] == '@' {
+				bindVars[v.Name[1:]] = bv
+			} else {
+				bindVars[v.Name] = bv
+			}
+		}
+	}
+	return bindVars, nil
+}
+
+func newConverter(cfg *Configuration) (c *converter, err error) {
+	c = &converter{
+		location: time.UTC,
+	}
+	if cfg.DefaultLocation != "" {
+		c.location, err = time.LoadLocation(cfg.DefaultLocation)
+	}
+	return
+}
diff --git a/go/vt/vitessdriver/convert_test.go b/go/vt/vitessdriver/convert_test.go
new file mode 100644
index 00000000000..13b2600335a
--- /dev/null
+++ b/go/vt/vitessdriver/convert_test.go
@@ -0,0 +1,75 @@
+/*
+Copyright 2017 GitHub Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreedto in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package vitessdriver
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/youtube/vitess/go/sqltypes"
+)
+
+func TestToNative(t *testing.T) {
+	convertTimeLocal := &converter{
+		location: time.Local,
+	}
+
+	testcases := []struct {
+		convert *converter
+		in      sqltypes.Value
+		out     interface{}
+	}{{
+		convert: &converter{},
+		in:      sqltypes.TestValue(sqltypes.Int32, "1"),
+		out:     int64(1),
+	}, {
+		convert: &converter{},
+		in:      sqltypes.TestValue(sqltypes.Timestamp, "2012-02-24 23:19:43"),
+		out:     []byte("2012-02-24 23:19:43"), // TIMESTAMP is not handled
+	}, {
+		convert: &converter{},
+		in:      sqltypes.TestValue(sqltypes.Time, "23:19:43"),
+		out:     []byte("23:19:43"), // TIME is not handled
+	}, {
+		convert: &converter{},
+		in:      sqltypes.TestValue(sqltypes.Date, "2012-02-24"),
+		out:     time.Date(2012, 02, 24, 0, 0, 0, 0, time.UTC),
+	}, {
+		convert: &converter{},
+		in:      sqltypes.TestValue(sqltypes.Datetime, "2012-02-24 23:19:43"),
+		out:     time.Date(2012, 02, 24, 23, 19, 43, 0, time.UTC),
+	}, {
+		convert: convertTimeLocal,
+		in:      sqltypes.TestValue(sqltypes.Datetime, "2012-02-24 23:19:43"),
+		out:     time.Date(2012, 02, 24, 23, 19, 43, 0, time.Local),
+	}, {
+		convert: convertTimeLocal,
+		in:      sqltypes.TestValue(sqltypes.Date, "2012-02-24"),
+		out:     time.Date(2012, 02, 24, 0, 0, 0, 0, time.Local),
+	}}
+
+	for _, tcase := range testcases {
+		v, err := tcase.convert.ToNative(tcase.in)
+		if err != nil {
+			t.Error(err)
+		}
+		if !reflect.DeepEqual(v, tcase.out) {
+			t.Errorf("%v.ToNativeEx = %#v, want %#v", tcase.in, v, tcase.out)
+		}
+	}
+}
diff --git a/go/vt/vitessdriver/doc.go b/go/vt/vitessdriver/doc.go
index 276efc2164d..3224e519766 100644
--- a/go/vt/vitessdriver/doc.go
+++ b/go/vt/vitessdriver/doc.go
@@ -41,7 +41,7 @@ Using this SQL driver is as simple as:
 
 For a full example, please see: https://github.com/youtube/vitess/blob/master/examples/local/client.go
 
-The full example is based on our tutorial for running Vitess locally: http://vitess.io/getting-started/local-instance.html
+The full example is based on our tutorial for running Vitess locally: http://vitess.io/getting-started/local-instance/
 
 
 Vtgate
diff --git a/go/vt/vitessdriver/driver.go b/go/vt/vitessdriver/driver.go
index 12a19ea44fa..615fe58415c 100644
--- a/go/vt/vitessdriver/driver.go
+++ b/go/vt/vitessdriver/driver.go
@@ -21,13 +21,10 @@ import (
 	"database/sql/driver"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"time"
 
 	"golang.org/x/net/context"
 
-	"github.com/youtube/vitess/go/sqltypes"
-	querypb "github.com/youtube/vitess/go/vt/proto/query"
 	"github.com/youtube/vitess/go/vt/vtgate/vtgateconn"
 )
 
@@ -99,6 +96,9 @@ func (d drv) Open(name string) (driver.Conn, error) {
 	if err != nil {
 		return nil, err
 	}
+	if c.convert, err = newConverter(&c.Configuration); err != nil {
+		return nil, err
+	}
 	if err = c.dial(); err != nil {
 		return nil, err
 	}
@@ -131,6 +131,12 @@ type Configuration struct {
 	// Timeout after which a pending query will be aborted.
 	// TODO(sougou): deprecate once we switch to go1.8.
 	Timeout time.Duration
+
+	// DefaultLocation is the timezone string that will be used
+	// when converting DATETIME and DATE into time.Time.
+	// This setting has no effect if ConvertDatetime is not set.
+	// Default: UTC
+	DefaultLocation string
 }
 
 // toJSON converts Configuration to the JSON string which is required by the
@@ -153,6 +159,7 @@ func (c *Configuration) setDefaults() {
 
 type conn struct {
 	Configuration
+	convert *converter
 	conn    *vtgateconn.VTGateConn
 	session *vtgateconn.VTGateSession
 }
@@ -208,7 +215,7 @@ func (c *conn) Exec(query string, args []driver.Value) (driver.Result, error) {
 	if c.Streaming {
 		return nil, errors.New("Exec not allowed for streaming connections")
 	}
-	bindVars, err := buildBindVars(args)
+	bindVars, err := c.convert.buildBindVars(args)
 	if err != nil {
 		return nil, err
 	}
@@ -222,7 +229,7 @@ func (c *conn) Exec(query string, args []driver.Value) (driver.Result, error) {
 
 func (c *conn) Query(query string, args []driver.Value) (driver.Rows, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
-	bindVars, err := buildBindVars(args)
+	bindVars, err := c.convert.buildBindVars(args)
 	if err != nil {
 		return nil, err
 	}
@@ -233,7 +240,7 @@ func (c *conn) Query(query string, args []driver.Value) (driver.Rows, error) {
 			cancel()
 			return nil, err
 		}
-		return newStreamingRows(stream, cancel), nil
+		return newStreamingRows(stream, cancel, c.convert), nil
 	}
 	// Do not cancel in case of a streaming query.
 	// It will be called when streamingRows is closed later.
@@ -243,7 +250,7 @@ func (c *conn) Query(query string, args []driver.Value) (driver.Rows, error) {
 	if err != nil {
 		return nil, err
 	}
-	return newRows(qr), nil
+	return newRows(qr, c.convert), nil
 }
 
 type stmt struct {
@@ -268,18 +275,6 @@ func (s *stmt) Query(args []driver.Value) (driver.Rows, error) {
 	return s.c.Query(s.query, args)
 }
 
-func buildBindVars(args []driver.Value) (map[string]*querypb.BindVariable, error) {
-	bindVars := make(map[string]*querypb.BindVariable, len(args))
-	for i, v := range args {
-		bv, err := sqltypes.BuildBindVariable(v)
-		if err != nil {
-			return nil, err
-		}
-		bindVars[fmt.Sprintf("v%d", i+1)] = bv
-	}
-	return bindVars, nil
-}
-
 type result struct {
 	insertid, rowsaffected int64
 }
diff --git a/go/vt/vitessdriver/driver_go18.go b/go/vt/vitessdriver/driver_go18.go
index 497addee37c..fe1e2393183 100644
--- a/go/vt/vitessdriver/driver_go18.go
+++ b/go/vt/vitessdriver/driver_go18.go
@@ -25,10 +25,6 @@ import (
 	"context"
 	"database/sql/driver"
 	"errors"
-	"fmt"
-
-	"github.com/youtube/vitess/go/sqltypes"
-	querypb "github.com/youtube/vitess/go/vt/proto/query"
 )
 
 var (
@@ -58,7 +54,7 @@ func (c *conn) ExecContext(ctx context.Context, query string, args []driver.Name
 		return nil, errors.New("Exec not allowed for streaming connections")
 	}
 
-	bv, err := bindVarsFromNamedValues(args)
+	bv, err := c.convert.bindVarsFromNamedValues(args)
 	if err != nil {
 		return nil, err
 	}
@@ -70,7 +66,7 @@ func (c *conn) ExecContext(ctx context.Context, query string, args []driver.Name
 }
 
 func (c *conn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
-	bv, err := bindVarsFromNamedValues(args)
+	bv, err := c.convert.bindVarsFromNamedValues(args)
 	if err != nil {
 		return nil, err
 	}
@@ -80,14 +76,14 @@ func (c *conn) QueryContext(ctx context.Context, query string, args []driver.Nam
 		if err != nil {
 			return nil, err
 		}
-		return newStreamingRows(stream, nil), nil
+		return newStreamingRows(stream, nil, c.convert), nil
 	}
 
 	qr, err := c.session.Execute(ctx, query, bv)
 	if err != nil {
 		return nil, err
 	}
-	return newRows(qr), nil
+	return newRows(qr, c.convert), nil
 }
 
 func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
@@ -97,38 +93,3 @@ func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (drive
 func (s *stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
 	return s.c.QueryContext(ctx, s.query, args)
 }
-
-func bindVarsFromNamedValues(args []driver.NamedValue) (map[string]*querypb.BindVariable, error) {
-	bindVars := make(map[string]*querypb.BindVariable, len(args))
-	nameUsed := false
-	for i, v := range args {
-		bv, err := sqltypes.BuildBindVariable(v.Value)
-		if err != nil {
-			return nil, err
-		}
-		if i == 0 {
-			// Determine if args are based on names or ordinals.
-			if v.Name != "" {
-				nameUsed = true
-			}
-		} else {
-			// Verify that there's no intermixing.
-			if nameUsed && v.Name == "" {
-				return nil, errNoIntermixing
-			}
-			if !nameUsed && v.Name != "" {
-				return nil, errNoIntermixing
-			}
-		}
-		if v.Name == "" {
-			bindVars[fmt.Sprintf("v%d", i+1)] = bv
-		} else {
-			if v.Name[0] == ':' || v.Name[0] == '@' {
-				bindVars[v.Name[1:]] = bv
-			} else {
-				bindVars[v.Name] = bv
-			}
-		}
-	}
-	return bindVars, nil
-}
diff --git a/go/vt/vitessdriver/driver_go18_test.go b/go/vt/vitessdriver/driver_go18_test.go
index 4f37c423e71..9db382bd1a8 100644
--- a/go/vt/vitessdriver/driver_go18_test.go
+++ b/go/vt/vitessdriver/driver_go18_test.go
@@ -112,8 +112,11 @@ func TestBindVars(t *testing.T) {
 		}},
 		outErr: errNoIntermixing.Error(),
 	}}
+
+	converter := &converter{}
+
 	for _, tc := range testcases {
-		bv, err := bindVarsFromNamedValues(tc.in)
+		bv, err := converter.bindVarsFromNamedValues(tc.in)
 		if bv != nil {
 			if !reflect.DeepEqual(bv, tc.out) {
 				t.Errorf("%s: %v, want %v", tc.desc, bv, tc.out)
diff --git a/go/vt/vitessdriver/driver_test.go b/go/vt/vitessdriver/driver_test.go
index c345e3e219b..c802c566ea3 100644
--- a/go/vt/vitessdriver/driver_test.go
+++ b/go/vt/vitessdriver/driver_test.go
@@ -58,6 +58,11 @@ func TestMain(m *testing.M) {
 }
 
 func TestOpen(t *testing.T) {
+	locationPST, err := time.LoadLocation("America/Los_Angeles")
+	if err != nil {
+		panic(err)
+	}
+
 	var testcases = []struct {
 		desc    string
 		connStr string
@@ -71,6 +76,9 @@ func TestOpen(t *testing.T) {
 					Target:  "@replica",
 					Timeout: 30 * time.Second,
 				},
+				convert: &converter{
+					location: time.UTC,
+				},
 			},
 		},
 		{
@@ -80,6 +88,9 @@ func TestOpen(t *testing.T) {
 				Configuration: Configuration{
 					Timeout: 30 * time.Second,
 				},
+				convert: &converter{
+					location: time.UTC,
+				},
 			},
 		},
 		{
@@ -91,6 +102,24 @@ func TestOpen(t *testing.T) {
 					Target:   "ks:0@replica",
 					Timeout:  30 * time.Second,
 				},
+				convert: &converter{
+					location: time.UTC,
+				},
+			},
+		},
+		{
+			desc: "Open() with custom timezone",
+			connStr: fmt.Sprintf(
+				`{"address": "%s", "timeout": %d, "defaultlocation": "America/Los_Angeles"}`,
+				testAddress, int64(30*time.Second)),
+			conn: &conn{
+				Configuration: Configuration{
+					Timeout:         30 * time.Second,
+					DefaultLocation: "America/Los_Angeles",
+				},
+				convert: &converter{
+					location: locationPST,
+				},
 			},
 		},
 	}
@@ -173,12 +202,13 @@ func TestExec(t *testing.T) {
 
 func TestConfigurationToJSON(t *testing.T) {
 	config := Configuration{
-		Protocol:  "some-invalid-protocol",
-		Target:    "ks2",
-		Streaming: true,
-		Timeout:   1 * time.Second,
+		Protocol:        "some-invalid-protocol",
+		Target:          "ks2",
+		Streaming:       true,
+		Timeout:         1 * time.Second,
+		DefaultLocation: "Local",
 	}
-	want := `{"Protocol":"some-invalid-protocol","Address":"","Target":"ks2","Streaming":true,"Timeout":1000000000}`
+	want := `{"Protocol":"some-invalid-protocol","Address":"","Target":"ks2","Streaming":true,"Timeout":1000000000,"DefaultLocation":"Local"}`
 
 	json, err := config.toJSON()
 	if err != nil {
@@ -312,6 +342,119 @@ func TestQuery(t *testing.T) {
 	}
 }
 
+func TestDatetimeQuery(t *testing.T) {
+	var testcases = []struct {
+		desc        string
+		config      Configuration
+		requestName string
+	}{
+		{
+			desc: "datetime & date, vtgate",
+			config: Configuration{
+				Protocol: "grpc",
+				Address:  testAddress,
+				Target:   "@rdonly",
+				Timeout:  30 * time.Second,
+			},
+			requestName: "requestDates",
+		},
+		{
+			desc: "datetime & date (local timezone), vtgate",
+			config: Configuration{
+				Protocol:        "grpc",
+				Address:         testAddress,
+				Target:          "@rdonly",
+				Timeout:         30 * time.Second,
+				DefaultLocation: "Local",
+			},
+			requestName: "requestDates",
+		},
+		{
+			desc: "datetime & date, streaming, vtgate",
+			config: Configuration{
+				Protocol:  "grpc",
+				Address:   testAddress,
+				Target:    "@rdonly",
+				Timeout:   30 * time.Second,
+				Streaming: true,
+			},
+			requestName: "requestDates",
+		},
+	}
+
+	for _, tc := range testcases {
+		db, err := OpenWithConfiguration(tc.config)
+		if err != nil {
+			t.Errorf("%v: %v", tc.desc, err)
+		}
+		defer db.Close()
+
+		s, err := db.Prepare(tc.requestName)
+		if err != nil {
+			t.Errorf("%v: %v", tc.desc, err)
+		}
+		defer s.Close()
+
+		r, err := s.Query(0)
+		if err != nil {
+			t.Errorf("%v: %v", tc.desc, err)
+		}
+		defer r.Close()
+
+		cols, err := r.Columns()
+		if err != nil {
+			t.Errorf("%v: %v", tc.desc, err)
+		}
+		wantCols := []string{
+			"fieldDatetime",
+			"fieldDate",
+		}
+		if !reflect.DeepEqual(cols, wantCols) {
+			t.Errorf("%v: cols: %v, want %v", tc.desc, cols, wantCols)
+		}
+
+		location := time.UTC
+		if tc.config.DefaultLocation != "" {
+			location, err = time.LoadLocation(tc.config.DefaultLocation)
+			if err != nil {
+				t.Errorf("%v: %v", tc.desc, err)
+			}
+		}
+
+		count := 0
+		wantValues := []struct {
+			fieldDatetime time.Time
+			fieldDate     time.Time
+		}{{
+			time.Date(2009, 3, 29, 17, 22, 11, 0, location),
+			time.Date(2006, 7, 2, 0, 0, 0, 0, location),
+		}, {
+			time.Time{},
+			time.Time{},
+		}}
+
+		for r.Next() {
+			var fieldDatetime time.Time
+			var fieldDate time.Time
+			err := r.Scan(&fieldDatetime, &fieldDate)
+			if err != nil {
+				t.Errorf("%v: %v", tc.desc, err)
+			}
+			if want := wantValues[count].fieldDatetime; fieldDatetime != want {
+				t.Errorf("%v: wrong value for fieldDatetime: got: %v want: %v", tc.desc, fieldDatetime, want)
+			}
+			if want := wantValues[count].fieldDate; fieldDate != want {
+				t.Errorf("%v: wrong value for fieldDate: got: %v want: %v", tc.desc, fieldDate, want)
+			}
+			count++
+		}
+
+		if count != len(wantValues) {
+			t.Errorf("%v: count: %d, want %d", tc.desc, count, len(wantValues))
+		}
+	}
+}
+
 func TestTx(t *testing.T) {
 	c := Configuration{
 		Protocol: "grpc",
diff --git a/go/vt/vitessdriver/fakeserver_test.go b/go/vt/vitessdriver/fakeserver_test.go
index 233210aee6b..7d1a180b2c7 100644
--- a/go/vt/vitessdriver/fakeserver_test.go
+++ b/go/vt/vitessdriver/fakeserver_test.go
@@ -271,6 +271,19 @@ var execMap = map[string]struct {
 		result:  &result1,
 		session: nil,
 	},
+	"requestDates": {
+		execQuery: &queryExecute{
+			SQL: "requestDates",
+			BindVariables: map[string]*querypb.BindVariable{
+				"v1": sqltypes.Int64BindVariable(0),
+			},
+			Session: &vtgatepb.Session{
+				TargetString: "@rdonly",
+			},
+		},
+		result:  &result2,
+		session: nil,
+	},
 	"txRequest": {
 		execQuery: &queryExecute{
 			SQL: "txRequest",
@@ -339,6 +352,31 @@ var result1 = sqltypes.Result{
 	},
 }
 
+var result2 = sqltypes.Result{
+	Fields: []*querypb.Field{
+		{
+			Name: "fieldDatetime",
+			Type: sqltypes.Datetime,
+		},
+		{
+			Name: "fieldDate",
+			Type: sqltypes.Date,
+		},
+	},
+	RowsAffected: 42,
+	InsertID:     73,
+	Rows: [][]sqltypes.Value{
+		{
+			sqltypes.NewVarBinary("2009-03-29 17:22:11"),
+			sqltypes.NewVarBinary("2006-07-02"),
+		},
+		{
+			sqltypes.NewVarBinary("0000-00-00 00:00:00"),
+			sqltypes.NewVarBinary("0000-00-00"),
+		},
+	},
+}
+
 var session1 = &vtgatepb.Session{
 	InTransaction: true,
 	TargetString:  "@rdonly",
diff --git a/go/vt/vitessdriver/rows.go b/go/vt/vitessdriver/rows.go
index 4c0bdc0e2c7..60b57be02db 100644
--- a/go/vt/vitessdriver/rows.go
+++ b/go/vt/vitessdriver/rows.go
@@ -26,13 +26,14 @@ import (
 // rows creates a database/sql/driver compliant Row iterator
 // for a non-streaming QueryResult.
 type rows struct {
-	qr    *sqltypes.Result
-	index int
+	convert *converter
+	qr      *sqltypes.Result
+	index   int
 }
 
 // newRows creates a new rows from qr.
-func newRows(qr *sqltypes.Result) driver.Rows {
-	return &rows{qr: qr}
+func newRows(qr *sqltypes.Result, c *converter) driver.Rows {
+	return &rows{qr: qr, convert: c}
 }
 
 func (ri *rows) Columns() []string {
@@ -51,17 +52,9 @@ func (ri *rows) Next(dest []driver.Value) error {
 	if ri.index == len(ri.qr.Rows) {
 		return io.EOF
 	}
-	populateRow(dest, ri.qr.Rows[ri.index])
+	if err := ri.convert.populateRow(dest, ri.qr.Rows[ri.index]); err != nil {
+		return err
+	}
 	ri.index++
 	return nil
 }
-
-// populateRow populates a row of data using the table's field descriptions.
-// The returned types for "dest" include the list from the interface
-// specification at https://golang.org/pkg/database/sql/driver/#Value
-// and in addition the type "uint64" for unsigned BIGINT MySQL records.
-func populateRow(dest []driver.Value, row []sqltypes.Value) {
-	for i := range dest {
-		dest[i], _ = sqltypes.ToNative(row[i])
-	}
-}
diff --git a/go/vt/vitessdriver/rows_test.go b/go/vt/vitessdriver/rows_test.go
index e5537a4a6e3..214f830befd 100644
--- a/go/vt/vitessdriver/rows_test.go
+++ b/go/vt/vitessdriver/rows_test.go
@@ -84,7 +84,7 @@ func logMismatchedTypes(t *testing.T, gotRow, wantRow []driver.Value) {
 }
 
 func TestRows(t *testing.T) {
-	ri := newRows(&rowsResult1)
+	ri := newRows(&rowsResult1, &converter{})
 	wantCols := []string{
 		"field1",
 		"field2",
diff --git a/go/vt/vitessdriver/streaming_rows.go b/go/vt/vitessdriver/streaming_rows.go
index 6011caa8557..79c9de539e5 100644
--- a/go/vt/vitessdriver/streaming_rows.go
+++ b/go/vt/vitessdriver/streaming_rows.go
@@ -29,19 +29,21 @@ import (
 // streamingRows creates a database/sql/driver compliant Row iterator
 // for a streaming query.
 type streamingRows struct {
-	stream sqltypes.ResultStream
-	failed error
-	fields []*querypb.Field
-	qr     *sqltypes.Result
-	index  int
-	cancel context.CancelFunc
+	stream  sqltypes.ResultStream
+	failed  error
+	fields  []*querypb.Field
+	qr      *sqltypes.Result
+	index   int
+	cancel  context.CancelFunc
+	convert *converter
 }
 
 // newStreamingRows creates a new streamingRows from stream.
-func newStreamingRows(stream sqltypes.ResultStream, cancel context.CancelFunc) driver.Rows {
+func newStreamingRows(stream sqltypes.ResultStream, cancel context.CancelFunc, conv *converter) driver.Rows {
 	return &streamingRows{
-		stream: stream,
-		cancel: cancel,
+		stream:  stream,
+		cancel:  cancel,
+		convert: conv,
 	}
 }
 
@@ -84,7 +86,9 @@ func (ri *streamingRows) Next(dest []driver.Value) error {
 		ri.qr = qr
 		ri.index = 0
 	}
-	populateRow(dest, ri.qr.Rows[ri.index])
+	if err := ri.convert.populateRow(dest, ri.qr.Rows[ri.index]); err != nil {
+		return err
+	}
 	ri.index++
 	return nil
 }
diff --git a/go/vt/vitessdriver/streaming_rows_test.go b/go/vt/vitessdriver/streaming_rows_test.go
index 5e11909440d..a5456fbee14 100644
--- a/go/vt/vitessdriver/streaming_rows_test.go
+++ b/go/vt/vitessdriver/streaming_rows_test.go
@@ -84,7 +84,7 @@ func TestStreamingRows(t *testing.T) {
 	c <- &packet2
 	c <- &packet3
 	close(c)
-	ri := newStreamingRows(&adapter{c: c, err: io.EOF}, nil)
+	ri := newStreamingRows(&adapter{c: c, err: io.EOF}, nil, &converter{})
 	wantCols := []string{
 		"field1",
 		"field2",
@@ -136,7 +136,7 @@ func TestStreamingRowsReversed(t *testing.T) {
 	c <- &packet2
 	c <- &packet3
 	close(c)
-	ri := newStreamingRows(&adapter{c: c, err: io.EOF}, nil)
+	ri := newStreamingRows(&adapter{c: c, err: io.EOF}, nil, &converter{})
 	defer ri.Close()
 
 	wantRow := []driver.Value{
@@ -169,7 +169,7 @@ func TestStreamingRowsReversed(t *testing.T) {
 func TestStreamingRowsError(t *testing.T) {
 	c := make(chan *sqltypes.Result)
 	close(c)
-	ri := newStreamingRows(&adapter{c: c, err: errors.New("error before fields")}, nil)
+	ri := newStreamingRows(&adapter{c: c, err: errors.New("error before fields")}, nil, &converter{})
 
 	gotCols := ri.Columns()
 	if gotCols != nil {
@@ -186,7 +186,7 @@ func TestStreamingRowsError(t *testing.T) {
 	c = make(chan *sqltypes.Result, 1)
 	c <- &packet1
 	close(c)
-	ri = newStreamingRows(&adapter{c: c, err: errors.New("error after fields")}, nil)
+	ri = newStreamingRows(&adapter{c: c, err: errors.New("error after fields")}, nil, &converter{})
 	wantCols := []string{
 		"field1",
 		"field2",
@@ -213,7 +213,7 @@ func TestStreamingRowsError(t *testing.T) {
 	c <- &packet1
 	c <- &packet2
 	close(c)
-	ri = newStreamingRows(&adapter{c: c, err: errors.New("error after rows")}, nil)
+	ri = newStreamingRows(&adapter{c: c, err: errors.New("error after rows")}, nil, &converter{})
 	gotRow = make([]driver.Value, 3)
 	err = ri.Next(gotRow)
 	if err != nil {
@@ -229,7 +229,7 @@ func TestStreamingRowsError(t *testing.T) {
 	c = make(chan *sqltypes.Result, 1)
 	c <- &packet2
 	close(c)
-	ri = newStreamingRows(&adapter{c: c, err: io.EOF}, nil)
+	ri = newStreamingRows(&adapter{c: c, err: io.EOF}, nil, &converter{})
 	gotRow = make([]driver.Value, 3)
 	err = ri.Next(gotRow)
 	wantErr = "first packet did not return fields"
diff --git a/go/vt/vitessdriver/time.go b/go/vt/vitessdriver/time.go
new file mode 100644
index 00000000000..fc2d2915958
--- /dev/null
+++ b/go/vt/vitessdriver/time.go
@@ -0,0 +1,113 @@
+/*
+Copyright 2017 GitHub Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreedto in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package vitessdriver
+
+import (
+	"errors"
+	"time"
+
+	"github.com/youtube/vitess/go/sqltypes"
+)
+
+// ErrInvalidTime is returned when we fail to parse a datetime
+// string from MySQL. This should never happen unless things are
+// seriously messed up.
+var ErrInvalidTime = errors.New("invalid MySQL time string")
+
+var isoTimeFormat = "2006-01-02 15:04:05.999999"
+var isoNullTime = "0000-00-00 00:00:00.000000"
+var isoTimeLength = len(isoTimeFormat)
+
+// parseISOTime pases a time string in MySQL's textual datetime format.
+// This is very similar to ISO8601, with some differences:
+//
+// - There is no T separator between the date and time sections;
+//   a space is used instead.
+// - There is never a timezone section in the string, as these datetimes
+//   are not timezone-aware. There isn't a Z value for UTC times for
+//   the same reason.
+//
+// Note that this function can handle both DATE (which should _always_ have
+// a length of 10) and DATETIME strings (which have a variable length, 18+
+// depending on the number of decimal sub-second places).
+//
+// Also note that this function handles the case where MySQL returns a NULL
+// time (with a string where all sections are zeroes) by returning a zeroed
+// out time.Time object. NULL time strings are not considered a parsing error.
+//
+// See: isoTimeFormat
+func parseISOTime(tstr string, loc *time.Location, minLen, maxLen int) (t time.Time, err error) {
+	tlen := len(tstr)
+	if tlen < minLen || tlen > maxLen {
+		err = ErrInvalidTime
+		return
+	}
+
+	if tstr == isoNullTime[:tlen] {
+		// This is what MySQL would send when the date is NULL,
+		// so return an empty time.Time instead.
+		// This is not a parsing error
+		return
+	}
+
+	if loc == nil {
+		loc = time.UTC
+	}
+
+	// Since the time format returned from MySQL never has a Timezone
+	// section, ParseInLocation will initialize the time.Time struct
+	// with the default `loc` we're passing here.
+	return time.ParseInLocation(isoTimeFormat[:tlen], tstr, loc)
+}
+
+func checkTimeFormat(t string) (err error) {
+	// Valid format string offsets for any ISO time from MySQL:
+	//  |DATETIME |10      |19+
+	//  |---------|--------|
+	// "2006-01-02 15:04:05.999999"
+	_, err = parseISOTime(t, time.UTC, 10, isoTimeLength)
+	return
+}
+
+// DatetimeToNative converts a Datetime Value into a time.Time
+func DatetimeToNative(v sqltypes.Value, loc *time.Location) (time.Time, error) {
+	// Valid format string offsets for a DATETIME
+	//  |DATETIME          |19+
+	//  |------------------|------|
+	// "2006-01-02 15:04:05.999999"
+	return parseISOTime(v.ToString(), loc, 19, isoTimeLength)
+}
+
+// DateToNative converts a Date Value into a time.Time.
+// Note that there's no specific type in the Go stdlib to represent
+// dates without time components, so the returned Time will have
+// their hours/mins/seconds zeroed out.
+func DateToNative(v sqltypes.Value, loc *time.Location) (time.Time, error) {
+	// Valid format string offsets for a DATE
+	//  |DATE     |10
+	//  |---------|
+	// "2006-01-02 00:00:00.000000"
+	return parseISOTime(v.ToString(), loc, 10, 10)
+}
+
+// NewDatetime builds a Datetime Value
+func NewDatetime(t time.Time, defaultLoc *time.Location) sqltypes.Value {
+	if t.Location() != defaultLoc {
+		t = t.In(defaultLoc)
+	}
+	return sqltypes.MakeTrusted(sqltypes.Datetime, []byte(t.Format(isoTimeFormat)))
+}
diff --git a/go/vt/vitessdriver/time_test.go b/go/vt/vitessdriver/time_test.go
new file mode 100644
index 00000000000..8c567a32aed
--- /dev/null
+++ b/go/vt/vitessdriver/time_test.go
@@ -0,0 +1,175 @@
+/*
+Copyright 2017 GitHub Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreedto in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package vitessdriver
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/youtube/vitess/go/sqltypes"
+)
+
+var randomLocation = time.FixedZone("Nowhere", 3*60*60)
+
+func DatetimeValue(str string) sqltypes.Value {
+	return sqltypes.TestValue(sqltypes.Datetime, str)
+}
+
+func DateValue(str string) sqltypes.Value {
+	return sqltypes.TestValue(sqltypes.Date, str)
+}
+
+func TestDatetimeToNative(t *testing.T) {
+
+	tcases := []struct {
+		val sqltypes.Value
+		loc *time.Location
+		out time.Time
+		err bool
+	}{{
+		val: DatetimeValue("1899-08-24 17:20:00"),
+		out: time.Date(1899, 8, 24, 17, 20, 0, 0, time.UTC),
+	}, {
+		val: DatetimeValue("1952-03-11 01:02:03"),
+		loc: time.Local,
+		out: time.Date(1952, 3, 11, 1, 2, 3, 0, time.Local),
+	}, {
+		val: DatetimeValue("1952-03-11 01:02:03"),
+		loc: randomLocation,
+		out: time.Date(1952, 3, 11, 1, 2, 3, 0, randomLocation),
+	}, {
+		val: DatetimeValue("1952-03-11 01:02:03"),
+		loc: time.UTC,
+		out: time.Date(1952, 3, 11, 1, 2, 3, 0, time.UTC),
+	}, {
+		val: DatetimeValue("1899-08-24 17:20:00.000000"),
+		out: time.Date(1899, 8, 24, 17, 20, 0, 0, time.UTC),
+	}, {
+		val: DatetimeValue("1899-08-24 17:20:00.000001"),
+		out: time.Date(1899, 8, 24, 17, 20, 0, int(1*time.Microsecond), time.UTC),
+	}, {
+		val: DatetimeValue("1899-08-24 17:20:00.123456"),
+		out: time.Date(1899, 8, 24, 17, 20, 0, int(123456*time.Microsecond), time.UTC),
+	}, {
+		val: DatetimeValue("1899-08-24 17:20:00.222"),
+		out: time.Date(1899, 8, 24, 17, 20, 0, int(222*time.Millisecond), time.UTC),
+	}, {
+		val: DatetimeValue("1899-08-24 17:20:00.1234567"),
+		err: true,
+	}, {
+		val: DatetimeValue("1899-08-24 17:20:00.1"),
+		out: time.Date(1899, 8, 24, 17, 20, 0, int(100*time.Millisecond), time.UTC),
+	}, {
+		val: DatetimeValue("0000-00-00 00:00:00"),
+		out: time.Time{},
+	}, {
+		val: DatetimeValue("0000-00-00 00:00:00.0"),
+		out: time.Time{},
+	}, {
+		val: DatetimeValue("0000-00-00 00:00:00.000"),
+		out: time.Time{},
+	}, {
+		val: DatetimeValue("0000-00-00 00:00:00.000000"),
+		out: time.Time{},
+	}, {
+		val: DatetimeValue("0000-00-00 00:00:00.0000000"),
+		err: true,
+	}, {
+		val: DatetimeValue("1899-08-24T17:20:00.000000"),
+		err: true,
+	}, {
+		val: DatetimeValue("1899-02-31 17:20:00.000000"),
+		err: true,
+	}, {
+		val: DatetimeValue("1899-08-24 17:20:00."),
+		out: time.Date(1899, 8, 24, 17, 20, 0, 0, time.UTC),
+	}, {
+		val: DatetimeValue("0000-00-00 00:00:00.000001"),
+		err: true,
+	}, {
+		val: DatetimeValue("1899-08-24 17:20:00 +02:00"),
+		err: true,
+	}, {
+		val: DatetimeValue("1899-08-24"),
+		err: true,
+	}, {
+		val: DatetimeValue("This is not a valid timestamp"),
+		err: true,
+	}}
+
+	for _, tcase := range tcases {
+		got, err := DatetimeToNative(tcase.val, tcase.loc)
+		if tcase.err && err == nil {
+			t.Errorf("DatetimeToNative(%v, %#v) succeeded; expected error", tcase.val, tcase.loc)
+		}
+		if !tcase.err && err != nil {
+			t.Errorf("DatetimeToNative(%v, %#v) failed: %v", tcase.val, tcase.loc, err)
+		}
+		if !reflect.DeepEqual(got, tcase.out) {
+			t.Errorf("DatetimeToNative(%v, %#v): %v, want %v", tcase.val, tcase.loc, got, tcase.out)
+		}
+	}
+}
+
+func TestDateToNative(t *testing.T) {
+	tcases := []struct {
+		val sqltypes.Value
+		loc *time.Location
+		out time.Time
+		err bool
+	}{{
+		val: DateValue("1899-08-24"),
+		out: time.Date(1899, 8, 24, 0, 0, 0, 0, time.UTC),
+	}, {
+		val: DateValue("1952-03-11"),
+		loc: time.Local,
+		out: time.Date(1952, 3, 11, 0, 0, 0, 0, time.Local),
+	}, {
+		val: DateValue("1952-03-11"),
+		loc: randomLocation,
+		out: time.Date(1952, 3, 11, 0, 0, 0, 0, randomLocation),
+	}, {
+		val: DateValue("0000-00-00"),
+		out: time.Time{},
+	}, {
+		val: DateValue("1899-02-31"),
+		err: true,
+	}, {
+		val: DateValue("1899-08-24 17:20:00"),
+		err: true,
+	}, {
+		val: DateValue("0000-00-00 00:00:00"),
+		err: true,
+	}, {
+		val: DateValue("This is not a valid timestamp"),
+		err: true,
+	}}
+
+	for _, tcase := range tcases {
+		got, err := DateToNative(tcase.val, tcase.loc)
+		if tcase.err && err == nil {
+			t.Errorf("DateToNative(%v, %#v) succeeded; expected error", tcase.val, tcase.loc)
+		}
+		if !tcase.err && err != nil {
+			t.Errorf("DateToNative(%v, %#v) failed: %v", tcase.val, tcase.loc, err)
+		}
+		if !reflect.DeepEqual(got, tcase.out) {
+			t.Errorf("DateToNative(%v, %#v): %v, want %v", tcase.val, tcase.loc, got, tcase.out)
+		}
+	}
+}
diff --git a/go/vt/vtctl/grpcvtctlclient/client.go b/go/vt/vtctl/grpcvtctlclient/client.go
index dea1e5558a8..df9a618cc66 100644
--- a/go/vt/vtctl/grpcvtctlclient/client.go
+++ b/go/vt/vtctl/grpcvtctlclient/client.go
@@ -18,9 +18,11 @@ limitations under the License.
 package grpcvtctlclient
 
 import (
+	"flag"
 	"time"
 
 	"github.com/youtube/vitess/go/vt/logutil"
+	"github.com/youtube/vitess/go/vt/servenv/grpcutils"
 	"github.com/youtube/vitess/go/vt/vtctl/vtctlclient"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -30,14 +32,25 @@ import (
 	vtctlservicepb "github.com/youtube/vitess/go/vt/proto/vtctlservice"
 )
 
+var (
+	cert = flag.String("vtctld_grpc_cert", "", "the cert to use to connect")
+	key  = flag.String("vtctld_grpc_key", "", "the key to use to connect")
+	ca   = flag.String("vtctld_grpc_ca", "", "the server ca to use to validate servers when connecting")
+	name = flag.String("vtctld_grpc_server_name", "", "the server name to use to validate server certificate")
+)
+
 type gRPCVtctlClient struct {
 	cc *grpc.ClientConn
 	c  vtctlservicepb.VtctlClient
 }
 
 func gRPCVtctlClientFactory(addr string, dialTimeout time.Duration) (vtctlclient.VtctlClient, error) {
+	opt, err := grpcutils.ClientSecureDialOption(*cert, *key, *ca, *name)
+	if err != nil {
+		return nil, err
+	}
 	// create the RPC client
-	cc, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithBlock(), grpc.WithTimeout(dialTimeout))
+	cc, err := grpc.Dial(addr, opt, grpc.WithBlock(), grpc.WithTimeout(dialTimeout))
 	if err != nil {
 		return nil, err
 	}
diff --git a/go/vt/vtctld/api.go b/go/vt/vtctld/api.go
index 5e730018d0f..cddbd4eaf7f 100644
--- a/go/vt/vtctld/api.go
+++ b/go/vt/vtctld/api.go
@@ -121,15 +121,6 @@ func unmarshalRequest(r *http.Request, v interface{}) error {
 	return json.Unmarshal(data, v)
 }
 
-func addSrvkeyspace(ctx context.Context, ts topo.Server, cell, keyspace string, srvKeyspaces map[string]interface{}) error {
-	srvKeyspace, err := ts.GetSrvKeyspace(ctx, cell, keyspace)
-	if err != nil {
-		return fmt.Errorf("invalid keyspace name: %q ", keyspace)
-	}
-	srvKeyspaces[keyspace] = srvKeyspace
-	return nil
-}
-
 func initAPI(ctx context.Context, ts topo.Server, actions *ActionRepository, realtimeStats *realtimeStats) {
 	tabletHealthCache := newTabletHealthCache(ts)
 	tmClient := tmclient.NewTabletManagerClient()
@@ -249,10 +240,16 @@ func initAPI(ctx context.Context, ts topo.Server, actions *ActionRepository, rea
 			return nil, fmt.Errorf("can't get list of SrvKeyspaceNames for cell %q: GetSrvKeyspaceNames returned: %v", cell, err)
 		}
 		for _, keyspaceName := range keyspaceNamesList {
-			err := addSrvkeyspace(ctx, ts, cell, keyspaceName, srvKeyspaces)
+			srvKeyspace, err := ts.GetSrvKeyspace(ctx, cell, keyspaceName)
 			if err != nil {
-				return nil, err
+				// If a keyspace is in the process of being set up, it exists
+				// in the list of keyspaces but GetSrvKeyspace fails.
+				//
+				// Instead of returning this error, simply skip it in the
+				// loop so we still return the other valid keyspaces.
+				continue
 			}
+			srvKeyspaces[keyspaceName] = srvKeyspace
 		}
 		return srvKeyspaces, nil
 
diff --git a/go/vt/vterrors/vterrors.go b/go/vt/vterrors/vterrors.go
index 1e94570a9d0..713a6d376b2 100644
--- a/go/vt/vterrors/vterrors.go
+++ b/go/vt/vterrors/vterrors.go
@@ -83,3 +83,25 @@ func Code(err error) vtrpcpb.Code {
 	}
 	return vtrpcpb.Code_UNKNOWN
 }
+
+// Equals returns true iff the error message and the code returned by Code()
+// is equal.
+func Equals(a, b error) bool {
+	if a == nil && b == nil {
+		// Both are nil.
+		return true
+	}
+
+	if a == nil && b != nil || a != nil && b == nil {
+		// One of the two is nil.
+		return false
+	}
+
+	return a.Error() == b.Error() && Code(a) == Code(b)
+}
+
+// Print is meant to print the vtError object in test failures.
+// For comparing two vterrors, use Equals() instead.
+func Print(err error) string {
+	return fmt.Sprintf("%v: %v", Code(err), err.Error())
+}
diff --git a/go/vt/vtexplain/vtexplain.go b/go/vt/vtexplain/vtexplain.go
index ff0cbb8ff58..55dfc510cf8 100644
--- a/go/vt/vtexplain/vtexplain.go
+++ b/go/vt/vtexplain/vtexplain.go
@@ -21,12 +21,13 @@ package vtexplain
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
+	"sort"
 	"strings"
 
 	log "github.com/golang/glog"
 
+	"github.com/youtube/vitess/go/jsonutil"
 	"github.com/youtube/vitess/go/vt/sqlparser"
 	"github.com/youtube/vitess/go/vt/vtgate/engine"
 
@@ -54,9 +55,6 @@ type TabletQuery struct {
 
 	// BindVars sent with the command
 	BindVars map[string]*querypb.BindVariable
-
-	// The actual queries executed by mysql
-	MysqlQueries []string
 }
 
 // MarshalJSON renders the json structure
@@ -69,20 +67,27 @@ func (tq *TabletQuery) MarshalJSON() ([]byte, error) {
 		bindVars[k] = b.String()
 	}
 
-	return json.Marshal(&struct {
-		SQL          string
-		BindVars     map[string]string
-		MysqlQueries []string
+	return jsonutil.MarshalNoEscape(&struct {
+		SQL      string
+		BindVars map[string]string
 	}{
-		SQL:          tq.SQL,
-		BindVars:     bindVars,
-		MysqlQueries: tq.MysqlQueries,
+		SQL:      tq.SQL,
+		BindVars: bindVars,
 	})
 }
 
-// Plan defines how vitess will execute a given sql query, including the vtgate
+// TabletActions contains the set of operations done by a given tablet
+type TabletActions struct {
+	// Queries sent from vtgate to the tablet
+	TabletQueries []*TabletQuery
+
+	// Queries that were run on mysql
+	MysqlQueries []string
+}
+
+// Explain defines how vitess will execute a given sql query, including the vtgate
 // query plans and all queries run on each tablet.
-type Plan struct {
+type Explain struct {
 	// original sql statement
 	SQL string
 
@@ -90,7 +95,7 @@ type Plan struct {
 	Plans []*engine.Plan
 
 	// list of queries / bind vars sent to each tablet
-	TabletQueries map[string][]*TabletQuery
+	TabletActions map[string]*TabletActions
 }
 
 const (
@@ -104,11 +109,6 @@ func Init(vSchemaStr, sqlSchema string, opts *Options) error {
 		return fmt.Errorf("invalid replication mode \"%s\"", opts.ReplicationMode)
 	}
 
-	err := initVtgateExecutor(vSchemaStr, opts)
-	if err != nil {
-		return fmt.Errorf("initVtgateExecutor: %v", err)
-	}
-
 	parsedDDLs, err := parseSchema(sqlSchema)
 	if err != nil {
 		return fmt.Errorf("parseSchema: %v", err)
@@ -119,6 +119,11 @@ func Init(vSchemaStr, sqlSchema string, opts *Options) error {
 		return fmt.Errorf("initTabletEnvironment: %v", err)
 	}
 
+	err = initVtgateExecutor(vSchemaStr, opts)
+	if err != nil {
+		return fmt.Errorf("initVtgateExecutor: %v", err)
+	}
+
 	return nil
 }
 
@@ -156,42 +161,83 @@ func parseSchema(sqlSchema string) ([]*sqlparser.DDL, error) {
 }
 
 // Run the explain analysis on the given queries
-func Run(sqlStr string) ([]*Plan, error) {
-	plans := make([]*Plan, 0, 16)
+func Run(sql string) ([]*Explain, error) {
+	explains := make([]*Explain, 0, 16)
+
+	for {
+		// Need to strip comments in a loop to handle multiple comments
+		// in a row.
+		for {
+			s := sqlparser.StripLeadingComments(sql)
+			if s == sql {
+				break
+			}
+			sql = s
+		}
+		rem := ""
+		idx := strings.Index(sql, ";")
+		if idx != -1 {
+			rem = sql[idx+1:]
+			sql = sql[:idx]
+		}
 
-	for _, sql := range strings.Split(sqlStr, ";") {
-		s := strings.TrimSpace(sql)
-		if s != "" {
-			plan, err := getPlan(s)
+		if sql != "" {
+			e, err := explain(sql)
 			if err != nil {
 				return nil, err
 			}
-			plans = append(plans, plan)
+			explains = append(explains, e)
+		}
+
+		sql = rem
+		if sql == "" {
+			break
 		}
 	}
 
-	return plans, nil
+	return explains, nil
 }
 
-func getPlan(sql string) (*Plan, error) {
-	plans, tabletQueries, err := vtgateExecute(sql)
+func explain(sql string) (*Explain, error) {
+	plans, tabletActions, err := vtgateExecute(sql)
 	if err != nil {
 		return nil, err
 	}
-	for _, tqs := range tabletQueries {
-		for _, tq := range tqs {
-			mqs, err := fakeTabletExecute(tq.SQL, tq.BindVars)
-			if err != nil {
-				return nil, fmt.Errorf("fakeTabletExecute: %v", err)
-			}
-			tq.MysqlQueries = mqs
-		}
-
-	}
 
-	return &Plan{
+	return &Explain{
 		SQL:           sql,
 		Plans:         plans,
-		TabletQueries: tabletQueries,
+		TabletActions: tabletActions,
 	}, nil
 }
+
+// ExplainsAsText returns a text representation of the explains
+func ExplainsAsText(explains []*Explain) string {
+	var b bytes.Buffer
+	for _, explain := range explains {
+		fmt.Fprintf(&b, "----------------------------------------------------------------------\n")
+		fmt.Fprintf(&b, "%s\n\n", explain.SQL)
+
+		tablets := make([]string, 0, len(explain.TabletActions))
+		for tablet := range explain.TabletActions {
+			tablets = append(tablets, tablet)
+		}
+		sort.Strings(tablets)
+		for _, tablet := range tablets {
+			fmt.Fprintf(&b, "[%s]:\n", tablet)
+			tc := explain.TabletActions[tablet]
+			for _, sql := range tc.MysqlQueries {
+				fmt.Fprintf(&b, "%s\n", sql)
+			}
+			fmt.Fprintf(&b, "\n")
+		}
+	}
+	fmt.Fprintf(&b, "----------------------------------------------------------------------\n")
+	return string(b.Bytes())
+}
+
+// ExplainsAsJSON returns a json representation of the explains
+func ExplainsAsJSON(explains []*Explain) string {
+	explainJSON, _ := jsonutil.MarshalIndentNoEscape(explains, "", "    ")
+	return string(explainJSON)
+}
diff --git a/go/vt/vtexplain/vtexplain_test.go b/go/vt/vtexplain/vtexplain_test.go
index 42b5bfb96d1..518f414cb68 100644
--- a/go/vt/vtexplain/vtexplain_test.go
+++ b/go/vt/vtexplain/vtexplain_test.go
@@ -17,1018 +17,128 @@ limitations under the License.
 package vtexplain
 
 import (
-	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"os/exec"
+	"strings"
 	"testing"
 
-	jsondiff "github.com/yudai/gojsondiff"
-	"github.com/yudai/gojsondiff/formatter"
+	"github.com/youtube/vitess/go/testfiles"
 )
 
 func defaultTestOpts() *Options {
 	return &Options{
 		ReplicationMode: "ROW",
 		NumShards:       2,
-		Normalize:       false,
+		Normalize:       true,
 	}
 }
 
-func testExplain(sqlStr, expected string, opts *Options, t *testing.T) {
-	err := Init(testVSchemaStr, testSchemaStr, opts)
+func initTest(opts *Options, t *testing.T) {
+	schema, err := ioutil.ReadFile(testfiles.Locate("vtexplain/test-schema.sql"))
 	if err != nil {
-		t.Fatalf("vtexplain Init error: %v", err)
+		t.Fatalf("error: %v", err)
 	}
 
-	plans, err := Run(sqlStr)
+	vSchema, err := ioutil.ReadFile(testfiles.Locate("vtexplain/test-vschema.json"))
 	if err != nil {
-		t.Fatalf("vtexplain error: %v", err)
-	}
-	if plans == nil {
-		t.Fatalf("vtexplain error running %s: no plan", sqlStr)
+		t.Fatalf("error: %v", err)
 	}
 
-	planJSON, err := json.MarshalIndent(plans, "", "    ")
+	err = Init(string(vSchema), string(schema), opts)
 	if err != nil {
-		t.Error(err)
+		t.Fatalf("vtexplain Init error: %v", err)
 	}
 
-	var gotArray, wantArray []interface{}
-	err = json.Unmarshal(planJSON, &gotArray)
-	if err != nil {
-		t.Fatalf("json unmarshal: %v", err)
-	}
+}
 
-	err = json.Unmarshal([]byte(expected), &wantArray)
-	if err != nil {
-		t.Fatalf("json unmarshal: %v", err)
-	}
+func testExplain(testcase string, opts *Options, t *testing.T) {
+	initTest(opts, t)
 
-	d := jsondiff.New().CompareArrays(gotArray, wantArray)
+	sqlFile := testfiles.Locate(fmt.Sprintf("vtexplain/%s-queries.sql", testcase))
+	sql, err := ioutil.ReadFile(sqlFile)
 
-	if d.Modified() {
-		config := formatter.AsciiFormatterConfig{}
-		formatter := formatter.NewAsciiFormatter(wantArray, config)
-		diffString, _ := formatter.Format(d)
-		t.Logf("ERROR: got %s...", string(planJSON))
-		t.Errorf("json diff: %s", diffString)
-	}
-}
+	jsonOutFile := testfiles.Locate(fmt.Sprintf("vtexplain/%s-output.json", testcase))
+	jsonOut, err := ioutil.ReadFile(jsonOutFile)
 
-var testVSchemaStr = `
-{
-	"ks_unsharded": {
-		"Sharded": false,
-		"Tables": {
-			"t1": {},
-			"table_not_in_schema": {}
-		}
-	},
-	"ks_sharded": {
-		"Sharded": true,
-		"vindexes": {
-			"music_user_map": {
-				"type": "lookup_hash_unique",
-				"owner": "music",
-				"params": {
-					"table": "music_user_map",
-					"from": "music_id",
-					"to": "user_id"
-				}
-			},
-			"name_user_map": {
-				"type": "lookup_hash",
-				"owner": "user",
-				"params": {
-					"table": "name_user_map",
-					"from": "name",
-					"to": "user_id"
-				}
-			},
-			"hash": {
-				"type": "hash"
-			},
-			"md5": {
-				"type": "unicode_loose_md5"
-			}
-		},
-		"tables": {
-			"user": {
-				"column_vindexes": [
-					{
-						"column": "id",
-						"name": "hash"
-					},
-					{
-						"column": "name",
-						"name": "name_user_map"
-					}
-				]
-			},
-			"music": {
-				"column_vindexes": [
-					{
-						"column": "user_id",
-						"name": "hash"
-					},
-					{
-						"column": "id",
-						"name": "music_user_map"
-					}
-				]
-			},
-			"name_user_map": {
-				"column_vindexes": [
-					{
-						"column": "name",
-						"name": "md5"
-					}
-				]
-			}
-		}
+	textOutFile := testfiles.Locate(fmt.Sprintf("vtexplain/%s-output.txt", testcase))
+	textOut, err := ioutil.ReadFile(textOutFile)
+
+	explains, err := Run(string(sql))
+	if err != nil {
+		t.Fatalf("vtexplain error: %v", err)
+	}
+	if explains == nil {
+		t.Fatalf("vtexplain error running %s: no explain", string(sql))
 	}
-}
-`
 
-var testSchemaStr = `
-create table t1 (
-	id bigint(20) unsigned not null,
-	val bigint(20) unsigned not null default 0,
-	primary key (id)
-);
+	explainJSON := ExplainsAsJSON(explains)
+	if strings.TrimSpace(string(explainJSON)) != strings.TrimSpace(string(jsonOut)) {
+		// Print the json that was actually returned and also dump to a
+		// temp file to be able to diff the results.
+		t.Errorf("json output did not match")
+		t.Logf("got:\n%s\n", string(explainJSON))
 
-create table user (
-	id bigint,
-	name varchar(64),
-	email varchar(64),
-	primary key (id)
-) Engine=InnoDB;
+		tempDir, err := ioutil.TempDir("", "vtexplain_output")
+		if err != nil {
+			t.Fatalf("error getting tempdir: %v", err)
+		}
+		gotFile := fmt.Sprintf("%s/%s-output.json", tempDir, testcase)
+		ioutil.WriteFile(gotFile, []byte(explainJSON), 0644)
+
+		command := exec.Command("diff", "-u", jsonOutFile, gotFile)
+		out, _ := command.CombinedOutput()
+		t.Logf("diff:\n%s\n", out)
+	}
 
-create table name_user_map (
-	name varchar(64),
-	user_id bigint,
-	primary key (name, user_id)
-) Engine=InnoDB;
+	explainText := ExplainsAsText(explains)
+	if strings.TrimSpace(string(explainText)) != strings.TrimSpace(string(textOut)) {
+		// Print the Text that was actually returned and also dump to a
+		// temp file to be able to diff the results.
+		t.Errorf("Text output did not match")
+		t.Logf("got:\n%s\n", string(explainText))
 
-create table music (
-	user_id bigint,
-	id bigint,
-	song varchar(64),
-	primary key (user_id, id)
-) Engine=InnoDB;
+		tempDir, err := ioutil.TempDir("", "vtexplain_output")
+		if err != nil {
+			t.Fatalf("error getting tempdir: %v", err)
+		}
+		gotFile := fmt.Sprintf("%s/%s-output.txt", tempDir, testcase)
+		ioutil.WriteFile(gotFile, []byte(explainText), 0644)
 
-create table table_not_in_vschema (
-	id bigint,
-	primary key (id)
-) Engine=InnoDB;
-`
+		command := exec.Command("diff", "-u", textOutFile, gotFile)
+		out, _ := command.CombinedOutput()
+		t.Logf("diff:\n%s\n", out)
+	}
+}
 
 func TestUnsharded(t *testing.T) {
-	sqlStr := `
-select * from t1;
-insert into t1 (id,val) values (1,2);
-update t1 set val = 10;
-delete from t1 where id = 100;
-insert into t1 (id,val) values (1,2) on duplicate key update val=3;
-`
-	expected := `[
-    {
-        "SQL": "select * from t1",
-        "Plans": [
-            {
-                "Original": "select * from t1",
-                "Instructions": {
-                    "Opcode": "SelectUnsharded",
-                    "Keyspace": {
-                        "Name": "ks_unsharded",
-                        "Sharded": false
-                    },
-                    "Query": "select * from t1",
-                    "FieldQuery": "select * from t1 where 1 != 1"
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_unsharded/-": [
-                {
-                    "SQL": "select * from t1",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "select * from t1 limit 10001"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "insert into t1 (id,val) values (1,2)",
-        "Plans": [
-            {
-                "Original": "insert into t1 (id,val) values (1,2)",
-                "Instructions": {
-                    "Opcode": "InsertUnsharded",
-                    "Keyspace": {
-                        "Name": "ks_unsharded",
-                        "Sharded": false
-                    },
-                    "Query": "insert into t1(id, val) values (1, 2)",
-                    "Table": "t1"
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_unsharded/-": [
-                {
-                    "SQL": "insert into t1(id, val) values (1, 2)",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert into t1(id, val) values (1, 2)",
-                        "commit"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "update t1 set val = 10",
-        "Plans": [
-            {
-                "Original": "update t1 set val = 10",
-                "Instructions": {
-                    "Opcode": "UpdateUnsharded",
-                    "Keyspace": {
-                        "Name": "ks_unsharded",
-                        "Sharded": false
-                    },
-                    "Query": "update t1 set val = 10"
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_unsharded/-": [
-                {
-                    "SQL": "update t1 set val = 10",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "select id from t1 limit 10001 for update",
-                        "commit"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "delete from t1 where id = 100",
-        "Plans": [
-            {
-                "Original": "delete from t1 where id = 100",
-                "Instructions": {
-                    "Opcode": "DeleteUnsharded",
-                    "Keyspace": {
-                        "Name": "ks_unsharded",
-                        "Sharded": false
-                    },
-                    "Query": "delete from t1 where id = 100"
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_unsharded/-": [
-                {
-                    "SQL": "delete from t1 where id = 100",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "delete from t1 where id in (100)",
-                        "commit"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "insert into t1 (id,val) values (1,2) on duplicate key update val=3",
-        "Plans": [
-            {
-                "Original": "insert into t1 (id,val) values (1,2) on duplicate key update val=3",
-                "Instructions": {
-                    "Opcode": "InsertUnsharded",
-                    "Keyspace": {
-                        "Name": "ks_unsharded",
-                        "Sharded": false
-                    },
-                    "Query": "insert into t1(id, val) values (1, 2) on duplicate key update val = 3",
-                    "Table": "t1"
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_unsharded/-": [
-                {
-                    "SQL": "insert into t1(id, val) values (1, 2) on duplicate key update val = 3",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert into t1(id, val) values (1, 2) on duplicate key update val = 3",
-                        "commit"
-                    ]
-                }
-            ]
-        }
-    }
-]`
-	testExplain(sqlStr, expected, defaultTestOpts(), t)
+	testExplain("unsharded", defaultTestOpts(), t)
 }
 
 func TestSelectSharded(t *testing.T) {
-	sqlStr := `
-select * from user /* scatter */;
-select * from user where id = 1 /* equal unique */;
-select * from user where name = 'bob'/* vindex lookup */;
-`
-	expected := `
-[
-    {
-        "SQL": "select * from user /* scatter */",
-        "Plans": [
-            {
-                "Original": "select * from user",
-                "Instructions": {
-                    "Opcode": "SelectScatter",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "select * from user",
-                    "FieldQuery": "select * from user where 1 != 1"
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-80": [
-                {
-                    "SQL": "select * from user /* scatter */",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "select * from user limit 10001"
-                    ]
-                }
-            ],
-            "ks_sharded/80-": [
-                {
-                    "SQL": "select * from user /* scatter */",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "select * from user limit 10001"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "select * from user where id = 1 /* equal unique */",
-        "Plans": [
-            {
-                "Original": "select * from user where id = 1",
-                "Instructions": {
-                    "Opcode": "SelectEqualUnique",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "select * from user where id = 1",
-                    "FieldQuery": "select * from user where 1 != 1",
-                    "Vindex": "hash",
-                    "Values": [
-                        1
-                    ]
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-80": [
-                {
-                    "SQL": "select * from user where id = 1 /* equal unique */",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where id = 1 limit 10001"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "select * from user where name = 'bob'/* vindex lookup */",
-        "Plans": [
-            {
-                "Original": "select user_id from name_user_map where name = :name",
-                "Instructions": {
-                    "Opcode": "SelectEqualUnique",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "select user_id from name_user_map where name = :name",
-                    "FieldQuery": "select user_id from name_user_map where 1 != 1",
-                    "Vindex": "md5",
-                    "Values": [
-                        ":name"
-                    ]
-                }
-            },
-            {
-                "Original": "select * from user where name = 'bob'",
-                "Instructions": {
-                    "Opcode": "SelectEqual",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "select * from user where name = 'bob'",
-                    "FieldQuery": "select * from user where 1 != 1",
-                    "Vindex": "name_user_map",
-                    "Values": [
-                        "bob"
-                    ]
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-80": [
-                {
-                    "SQL": "select * from user where name = 'bob'/* vindex lookup */",
-                    "BindVars": {
-                        "#maxLimit": "10001"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where name = 'bob' limit 10001"
-                    ]
-                }
-            ],
-            "ks_sharded/80-": [
-                {
-                    "SQL": "select user_id from name_user_map where name = :name/* vindex lookup */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "name": "'bob'"
-                    },
-                    "MysqlQueries": [
-                        "select user_id from name_user_map where name = 'bob' limit 10001"
-                    ]
-                }
-            ]
-        }
-    }
-]
-`
-
-	testExplain(sqlStr, expected, defaultTestOpts(), t)
+	testExplain("selectsharded", defaultTestOpts(), t)
 }
 
 func TestInsertSharded(t *testing.T) {
-	sqlStr := `
-insert into user (id, name) values(1, "alice");
-insert into user (id, name) values(2, "bob");
-insert ignore into user (id, name) values(2, "bob");
-`
-
-	expected := `
-[
-    {
-        "SQL": "insert into user (id, name) values(1, \"alice\")",
-        "Plans": [
-            {
-                "Original": "insert into name_user_map(name, user_id) values(:name0, :user_id0)",
-                "Instructions": {
-                    "Opcode": "InsertSharded",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "insert into name_user_map(name, user_id) values (:_name0, :user_id0)",
-                    "Values": [
-                        [
-                            ":name0"
-                        ]
-                    ],
-                    "Table": "name_user_map",
-                    "Prefix": "insert into name_user_map(name, user_id) values ",
-                    "Mid": [
-                        "(:_name0, :user_id0)"
-                    ]
-                }
-            },
-            {
-                "Original": "insert into user (id, name) values(1, \"alice\")",
-                "Instructions": {
-                    "Opcode": "InsertSharded",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "insert into user(id, name) values (:_id0, :_name0)",
-                    "Values": [
-                        [
-                            1
-                        ],
-                        [
-                            "alice"
-                        ]
-                    ],
-                    "Table": "user",
-                    "Prefix": "insert into user(id, name) values ",
-                    "Mid": [
-                        "(:_id0, :_name0)"
-                    ]
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-80": [
-                {
-                    "SQL": "insert into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:475e26c086f437f36bd72ecd883504a7 */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "_name0": "'alice'",
-                        "name0": "'alice'",
-                        "user_id0": "1"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert into name_user_map(name, user_id) values ('alice', 1)",
-                        "commit"
-                    ]
-                },
-                {
-                    "SQL": "insert into user(id, name) values (:_id0, :_name0) /* vtgate:: keyspace_id:166b40b44aba4bd6 */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "_id0": "1",
-                        "_name0": "'alice'"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert into user(id, name) values (1, 'alice')",
-                        "commit"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "insert into user (id, name) values(2, \"bob\")",
-        "Plans": [
-            {
-                "Original": "insert into name_user_map(name, user_id) values(:name0, :user_id0)",
-                "Instructions": {
-                    "Opcode": "InsertSharded",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "insert into name_user_map(name, user_id) values (:_name0, :user_id0)",
-                    "Values": [
-                        [
-                            ":name0"
-                        ]
-                    ],
-                    "Table": "name_user_map",
-                    "Prefix": "insert into name_user_map(name, user_id) values ",
-                    "Mid": [
-                        "(:_name0, :user_id0)"
-                    ]
-                }
-            },
-            {
-                "Original": "insert into user (id, name) values(2, \"bob\")",
-                "Instructions": {
-                    "Opcode": "InsertSharded",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "insert into user(id, name) values (:_id0, :_name0)",
-                    "Values": [
-                        [
-                            2
-                        ],
-                        [
-                            "bob"
-                        ]
-                    ],
-                    "Table": "user",
-                    "Prefix": "insert into user(id, name) values ",
-                    "Mid": [
-                        "(:_id0, :_name0)"
-                    ]
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-80": [
-                {
-                    "SQL": "insert into user(id, name) values (:_id0, :_name0) /* vtgate:: keyspace_id:06e7ea22ce92708f */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "_id0": "2",
-                        "_name0": "'bob'"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert into user(id, name) values (2, 'bob')",
-                        "commit"
-                    ]
-                }
-            ],
-            "ks_sharded/80-": [
-                {
-                    "SQL": "insert into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "_name0": "'bob'",
-                        "name0": "'bob'",
-                        "user_id0": "2"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert into name_user_map(name, user_id) values ('bob', 2)",
-                        "commit"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "insert ignore into user (id, name) values(2, \"bob\")",
-        "Plans": [
-            {
-                "Original": "select name from name_user_map where name = :name and user_id = :user_id",
-                "Instructions": {
-                    "Opcode": "SelectEqualUnique",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "select name from name_user_map where name = :name and user_id = :user_id",
-                    "FieldQuery": "select name from name_user_map where 1 != 1",
-                    "Vindex": "md5",
-                    "Values": [
-                        ":name"
-                    ]
-                }
-            },
-            {
-                "Original": "insert ignore into name_user_map(name, user_id) values(:name0, :user_id0)",
-                "Instructions": {
-                    "Opcode": "InsertShardedIgnore",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0)",
-                    "Values": [
-                        [
-                            ":name0"
-                        ]
-                    ],
-                    "Table": "name_user_map",
-                    "Prefix": "insert ignore into name_user_map(name, user_id) values ",
-                    "Mid": [
-                        "(:_name0, :user_id0)"
-                    ]
-                }
-            },
-            {
-                "Original": "insert ignore into user (id, name) values(2, \"bob\")",
-                "Instructions": {
-                    "Opcode": "InsertShardedIgnore",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "insert ignore into user(id, name) values (:_id0, :_name0)",
-                    "Values": [
-                        [
-                            2
-                        ],
-                        [
-                            "bob"
-                        ]
-                    ],
-                    "Table": "user",
-                    "Prefix": "insert ignore into user(id, name) values ",
-                    "Mid": [
-                        "(:_id0, :_name0)"
-                    ]
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-80": [
-                {
-                    "SQL": "insert ignore into user(id, name) values (:_id0, :_name0) /* vtgate:: keyspace_id:06e7ea22ce92708f */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "_id0": "2",
-                        "_name0": "'bob'"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert ignore into user(id, name) values (2, 'bob')",
-                        "commit"
-                    ]
-                }
-            ],
-            "ks_sharded/80-": [
-                {
-                    "SQL": "insert ignore into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "_name0": "'bob'",
-                        "name0": "'bob'",
-                        "user_id0": "2"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert ignore into name_user_map(name, user_id) values ('bob', 2)",
-                        "commit"
-                    ]
-                },
-                {
-                    "SQL": "select name from name_user_map where name = :name and user_id = :user_id",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "name": "'bob'",
-                        "user_id": "2"
-                    },
-                    "MysqlQueries": [
-                        "select name from name_user_map where name = 'bob' and user_id = 2 limit 10001"
-                    ]
-                }
-            ]
-        }
-    }
-]
-`
-	testExplain(sqlStr, expected, defaultTestOpts(), t)
+	testExplain("insertsharded", defaultTestOpts(), t)
 }
 
 func TestOptions(t *testing.T) {
-	sqlStr := `
-select * from user where email="null@void.com";
-select * from user where id in (1,2,3,4,5,6,7,8);
-insert into user (id, name) values(2, "bob");
-`
-
-	expected := `
-[
-    {
-        "SQL": "select * from user where email=\"null@void.com\"",
-        "Plans": [
-            {
-                "Original": "select * from user where email = :vtg1",
-                "Instructions": {
-                    "Opcode": "SelectScatter",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "select * from user where email = :vtg1",
-                    "FieldQuery": "select * from user where 1 != 1"
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-40": [
-                {
-                    "SQL": "select * from user where email = :vtg1",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "vtg1": "'null@void.com'"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where email = 'null@void.com' limit 10001"
-                    ]
-                }
-            ],
-            "ks_sharded/40-80": [
-                {
-                    "SQL": "select * from user where email = :vtg1",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "vtg1": "'null@void.com'"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where email = 'null@void.com' limit 10001"
-                    ]
-                }
-            ],
-            "ks_sharded/80-c0": [
-                {
-                    "SQL": "select * from user where email = :vtg1",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "vtg1": "'null@void.com'"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where email = 'null@void.com' limit 10001"
-                    ]
-                }
-            ],
-            "ks_sharded/c0-": [
-                {
-                    "SQL": "select * from user where email = :vtg1",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "vtg1": "'null@void.com'"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where email = 'null@void.com' limit 10001"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "select * from user where id in (1,2,3,4,5,6,7,8)",
-        "Plans": [
-            {
-                "Original": "select * from user where id in ::vtg1",
-                "Instructions": {
-                    "Opcode": "SelectIN",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "select * from user where id in ::__vals",
-                    "FieldQuery": "select * from user where 1 != 1",
-                    "Vindex": "hash",
-                    "Values": [
-                        "::vtg1"
-                    ]
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-40": [
-                {
-                    "SQL": "select * from user where id in ::__vals",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "__vals": "(1, 2)",
-                        "vtg1": "(1, 2, 3, 4, 5, 6, 7, 8)"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where id in (1, 2) limit 10001"
-                    ]
-                }
-            ],
-            "ks_sharded/40-80": [
-                {
-                    "SQL": "select * from user where id in ::__vals",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "__vals": "(3, 5)",
-                        "vtg1": "(1, 2, 3, 4, 5, 6, 7, 8)"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where id in (3, 5) limit 10001"
-                    ]
-                }
-            ],
-            "ks_sharded/c0-": [
-                {
-                    "SQL": "select * from user where id in ::__vals",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "__vals": "(4, 6, 7, 8)",
-                        "vtg1": "(1, 2, 3, 4, 5, 6, 7, 8)"
-                    },
-                    "MysqlQueries": [
-                        "select * from user where id in (4, 6, 7, 8) limit 10001"
-                    ]
-                }
-            ]
-        }
-    },
-    {
-        "SQL": "insert into user (id, name) values(2, \"bob\")",
-        "Plans": [
-            {
-                "Original": "insert into name_user_map(name, user_id) values (:name0, :user_id0)",
-                "Instructions": {
-                    "Opcode": "InsertSharded",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "insert into name_user_map(name, user_id) values (:_name0, :user_id0)",
-                    "Values": [
-                        [
-                            ":name0"
-                        ]
-                    ],
-                    "Table": "name_user_map",
-                    "Prefix": "insert into name_user_map(name, user_id) values ",
-                    "Mid": [
-                        "(:_name0, :user_id0)"
-                    ]
-                }
-            },
-            {
-                "Original": "insert into user(id, name) values (:vtg1, :vtg2)",
-                "Instructions": {
-                    "Opcode": "InsertSharded",
-                    "Keyspace": {
-                        "Name": "ks_sharded",
-                        "Sharded": true
-                    },
-                    "Query": "insert into user(id, name) values (:_id0, :_name0)",
-                    "Values": [
-                        [
-                            ":vtg1"
-                        ],
-                        [
-                            ":vtg2"
-                        ]
-                    ],
-                    "Table": "user",
-                    "Prefix": "insert into user(id, name) values ",
-                    "Mid": [
-                        "(:_id0, :_name0)"
-                    ]
-                }
-            }
-        ],
-        "TabletQueries": {
-            "ks_sharded/-40": [
-                {
-                    "SQL": "insert into user(id, name) values (:_id0, :_name0) /* vtgate:: keyspace_id:06e7ea22ce92708f */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "_id0": "2",
-                        "_name0": "'bob'",
-                        "vtg1": "2",
-                        "vtg2": "'bob'"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert into user(id, name) values (2, 'bob') /* _stream user (id ) (2 ); */",
-                        "commit"
-                    ]
-                }
-            ],
-            "ks_sharded/c0-": [
-                {
-                    "SQL": "insert into name_user_map(name, user_id) values (:_name0, :user_id0) /* vtgate:: keyspace_id:da8a82595aa28154c17717955ffeed8b */",
-                    "BindVars": {
-                        "#maxLimit": "10001",
-                        "_name0": "'bob'",
-                        "name0": "'bob'",
-                        "user_id0": "2"
-                    },
-                    "MysqlQueries": [
-                        "begin",
-                        "insert into name_user_map(name, user_id) values ('bob', 2) /* _stream name_user_map (name user_id ) ('Ym9i' 2 ); */",
-                        "commit"
-                    ]
-                }
-            ]
-        }
-    }
-]
-`
-
 	opts := &Options{
 		ReplicationMode: "STATEMENT",
 		NumShards:       4,
-		Normalize:       true,
+		Normalize:       false,
 	}
 
-	testExplain(sqlStr, expected, opts, t)
+	testExplain("options", opts, t)
+}
+
+func TestComments(t *testing.T) {
+	testExplain("comments", defaultTestOpts(), t)
 }
 
 func TestErrors(t *testing.T) {
-	err := Init(testVSchemaStr, testSchemaStr, defaultTestOpts())
-	if err != nil {
-		t.Fatalf("vtexplain Init error: %v", err)
-	}
+	initTest(defaultTestOpts(), t)
 
 	tests := []struct {
 		SQL string
@@ -1036,27 +146,27 @@ func TestErrors(t *testing.T) {
 	}{
 		{
 			SQL: "INVALID SQL",
-			Err: "vtgate Execute: unrecognized statement: INVALID SQL",
+			Err: "vtexplain execute error: unrecognized statement: INVALID SQL in INVALID SQL",
 		},
 
 		{
 			SQL: "SELECT * FROM THIS IS NOT SQL",
-			Err: "vtgate Execute: syntax error at position 22 near 'is'",
+			Err: "vtexplain execute error: syntax error at position 22 near 'is' in SELECT * FROM THIS IS NOT SQL",
 		},
 
 		{
 			SQL: "SELECT * FROM table_not_in_vschema",
-			Err: "vtgate Execute: table table_not_in_vschema not found",
+			Err: "vtexplain execute error: table table_not_in_vschema not found in SELECT * FROM table_not_in_vschema",
 		},
 
 		{
 			SQL: "SELECT * FROM table_not_in_schema",
-			Err: "fakeTabletExecute: table table_not_in_schema not found in schema",
+			Err: "vtexplain execute error: target: ks_unsharded.-.master, used tablet: explainCell-0 (ks_unsharded/-), table table_not_in_schema not found in schema in SELECT * FROM table_not_in_schema",
 		},
 	}
 
 	for _, test := range tests {
-		_, err = Run(test.SQL)
+		_, err := Run(test.SQL)
 		if err == nil || err.Error() != test.Err {
 			t.Errorf("Run(%s): %v, want %s", test.SQL, err, test.Err)
 		}
diff --git a/go/vt/vtexplain/vtexplain_vtgate.go b/go/vt/vtexplain/vtexplain_vtgate.go
index fc708383402..e903e2d4ec9 100644
--- a/go/vt/vtexplain/vtexplain_vtgate.go
+++ b/go/vt/vtexplain/vtexplain_vtgate.go
@@ -26,6 +26,7 @@ import (
 	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
+	"github.com/youtube/vitess/go/sqltypes"
 	"github.com/youtube/vitess/go/vt/discovery"
 	"github.com/youtube/vitess/go/vt/key"
 	"github.com/youtube/vitess/go/vt/topo"
@@ -62,7 +63,8 @@ func initVtgateExecutor(vSchemaStr string, opts *Options) error {
 	}
 
 	streamSize := 10
-	vtgateExecutor = vtgate.NewExecutor(context.Background(), explainTopo, vtexplainCell, "", resolver, opts.Normalize, streamSize)
+	queryCacheSize := int64(10)
+	vtgateExecutor = vtgate.NewExecutor(context.Background(), explainTopo, vtexplainCell, "", resolver, opts.Normalize, streamSize, queryCacheSize)
 
 	return nil
 }
@@ -100,6 +102,10 @@ func buildTopology(vschemaStr string, numShardsPerKeyspace int) error {
 			hostname := fmt.Sprintf("%s/%s", ks, shard)
 			log.Infof("registering test tablet %s for keyspace %s shard %s", hostname, ks, shard)
 			sc := healthCheck.AddTestTablet(vtexplainCell, hostname, 1, ks, shard, topodatapb.TabletType_MASTER, true, 1, nil)
+
+			tablet := newFakeTablet()
+			sc.Executor = tablet
+
 			explainTopo.TabletConns[hostname] = sc
 		}
 	}
@@ -107,10 +113,10 @@ func buildTopology(vschemaStr string, numShardsPerKeyspace int) error {
 	return err
 }
 
-func vtgateExecute(sql string) ([]*engine.Plan, map[string][]*TabletQuery, error) {
+func vtgateExecute(sql string) ([]*engine.Plan, map[string]*TabletActions, error) {
 	_, err := vtgateExecutor.Execute(context.Background(), vtgateSession, sql, nil)
 	if err != nil {
-		return nil, nil, fmt.Errorf("vtgate Execute: %v", err)
+		return nil, nil, fmt.Errorf("vtexplain execute error: %v in %s", err, sql)
 	}
 
 	// use the plan cache to get the set of plans used for this query, then
@@ -122,21 +128,31 @@ func vtgateExecute(sql string) ([]*engine.Plan, map[string][]*TabletQuery, error
 	}
 	planCache.Clear()
 
-	tabletQueries := make(map[string][]*TabletQuery)
-	for tablet, tc := range explainTopo.TabletConns {
+	tabletActions := make(map[string]*TabletActions)
+	for shard, tc := range explainTopo.TabletConns {
 		if len(tc.Queries) == 0 {
 			continue
 		}
 
-		queries := make([]*TabletQuery, 0, len(tc.Queries))
+		tablet := tc.Executor.(*fakeTablet)
+
+		tqs := make([]*TabletQuery, 0, len(tc.Queries))
 		for _, bq := range tc.Queries {
-			tq := &TabletQuery{SQL: bq.Sql, BindVars: bq.BindVariables}
-			queries = append(queries, tq)
+			tq := &TabletQuery{
+				SQL:      bq.Sql,
+				BindVars: sqltypes.CopyBindVariables(bq.BindVariables),
+			}
+			tqs = append(tqs, tq)
+		}
+
+		tabletActions[shard] = &TabletActions{
+			TabletQueries: tqs,
+			MysqlQueries:  tablet.queries,
 		}
-		tc.Queries = nil
 
-		tabletQueries[tablet] = queries
+		tc.Queries = nil
+		tablet.queries = nil
 	}
 
-	return plans, tabletQueries, nil
+	return plans, tabletActions, nil
 }
diff --git a/go/vt/vtexplain/vtexplain_vttablet.go b/go/vt/vtexplain/vtexplain_vttablet.go
index 508756f2ecf..d712fff4450 100644
--- a/go/vt/vtexplain/vtexplain_vttablet.go
+++ b/go/vt/vtexplain/vtexplain_vttablet.go
@@ -25,6 +25,7 @@ import (
 	"github.com/youtube/vitess/go/vt/dbconfigs"
 	"github.com/youtube/vitess/go/vt/mysqlctl"
 	"github.com/youtube/vitess/go/vt/sqlparser"
+	"github.com/youtube/vitess/go/vt/vttablet/sandboxconn"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/tabletenv"
 
@@ -36,7 +37,14 @@ var (
 	schemaQueries map[string]*sqltypes.Result
 )
 
-func startFakeTablet() (*fakesqldb.DB, *tabletserver.TabletServer) {
+type fakeTablet struct {
+	db  *fakesqldb.DB
+	tsv *tabletserver.TabletServer
+
+	queries []string
+}
+
+func newFakeTablet() *fakeTablet {
 	db := newFakeDB()
 
 	// XXX much of this is cloned from the tabletserver tests
@@ -59,35 +67,29 @@ func startFakeTablet() (*fakesqldb.DB, *tabletserver.TabletServer) {
 	target := querypb.Target{TabletType: topodatapb.TabletType_MASTER}
 	tsv.StartService(target, dbcfgs, mysqld)
 
-	return db, tsv
-}
-
-func fakeTabletExecute(sql string, bindVars map[string]*querypb.BindVariable) ([]string, error) {
-	db, tsv := startFakeTablet()
-	defer db.Close()
-	defer tsv.StopService()
-
-	ctx := context.Background()
-	logStats := tabletenv.NewLogStats(ctx, "FakeQueryExecutor")
-	plan, err := tsv.GetPlan(ctx, logStats, sql)
-	if err != nil {
-		return nil, err
+	tablet := fakeTablet{db: db, tsv: tsv}
+	db.QueryLogger = func(query string, result *sqltypes.Result, err error) {
+		tablet.queries = append(tablet.queries, query)
 	}
-	txID := int64(0)
-	qre := tabletserver.NewQueryExecutor(ctx, sql, bindVars, txID, nil, plan, logStats, tsv)
 
-	queries := make([]string, 0, 4)
+	return &tablet
+}
 
-	db.QueryLogger = func(query string, result *sqltypes.Result, err error) {
-		queries = append(queries, query)
-	}
+// Execute hook called by SandboxConn as part of running the query.
+func (tablet *fakeTablet) Execute(ctx context.Context, target *querypb.Target, query string, bindVars map[string]*querypb.BindVariable, transactionID int64, options *querypb.ExecuteOptions) (*sqltypes.Result, error) {
+	logStats := tabletenv.NewLogStats(ctx, "FakeQueryExecutor")
 
-	_, err = qre.Execute()
+	plan, err := tablet.tsv.GetPlan(ctx, logStats, query)
 	if err != nil {
 		return nil, err
 	}
 
-	return queries, nil
+	txID := int64(0)
+
+	// Since the query is simulated being "sent" over the wire we need to
+	// copy the bindVars into the executor to avoid a data race.
+	qre := tabletserver.NewQueryExecutor(ctx, query, sqltypes.CopyBindVariables(bindVars), txID, nil, plan, logStats, tablet.tsv)
+	return qre.Execute()
 }
 
 func initTabletEnvironment(ddls []*sqlparser.DDL, opts *Options) error {
@@ -214,11 +216,10 @@ func newFakeDB() *fakesqldb.DB {
 	db := fakesqldb.New(nil)
 
 	for q, r := range schemaQueries {
-		//		log.Infof("adding query %s %v", q, r)
 		db.AddQuery(q, r)
 	}
 
-	db.AddQueryPattern(".*", &sqltypes.Result{})
+	db.AddQueryPattern(".*", sandboxconn.SingleRowResult)
 
 	return db
 }
diff --git a/go/vt/vtexplain/vtexplain_vttablet_test.go b/go/vt/vtexplain/vtexplain_vttablet_test.go
index 25540a4e244..1a6ef65c4e2 100644
--- a/go/vt/vtexplain/vtexplain_vttablet_test.go
+++ b/go/vt/vtexplain/vtexplain_vttablet_test.go
@@ -40,11 +40,8 @@ create table t2 (
 	}
 	initTabletEnvironment(ddls, defaultTestOpts())
 
-	db, tsv := startFakeTablet()
-	defer db.Close()
-	defer tsv.StopService()
-
-	se := tsv.SchemaEngine()
+	tablet := newFakeTablet()
+	se := tablet.tsv.SchemaEngine()
 	tables := se.GetSchema()
 
 	t1 := tables["t1"]
diff --git a/go/vt/vtgate/buffer/flags.go b/go/vt/vtgate/buffer/flags.go
index 5712ad66f07..59cfe13df14 100644
--- a/go/vt/vtgate/buffer/flags.go
+++ b/go/vt/vtgate/buffer/flags.go
@@ -33,9 +33,9 @@ var (
 	window                  = flag.Duration("buffer_window", 10*time.Second, "Duration for how long a request should be buffered at most.")
 	size                    = flag.Int("buffer_size", 10, "Maximum number of buffered requests in flight (across all ongoing failovers).")
 	maxFailoverDuration     = flag.Duration("buffer_max_failover_duration", 20*time.Second, "Stop buffering completely if a failover takes longer than this duration.")
-	minTimeBetweenFailovers = flag.Duration("buffer_min_time_between_failovers", 1*time.Minute, "Minimum time between the end of a failover and the start of the next one. Faster consecutive failovers will not trigger buffering.")
+	minTimeBetweenFailovers = flag.Duration("buffer_min_time_between_failovers", 1*time.Minute, "Minimum time between the end of a failover and the start of the next one (tracked per shard). Faster consecutive failovers will not trigger buffering.")
 
-	drainConcurrency = flag.Int("buffer_drain_concurrency", 1, "Maximum number of requests retried simultaneously.")
+	drainConcurrency = flag.Int("buffer_drain_concurrency", 1, "Maximum number of requests retried simultaneously. More concurrency will increase the load on the MASTER vttablet when draining the buffer.")
 
 	shards = flag.String("buffer_keyspace_shards", "", "If not empty, limit buffering to these entries (comma separated). Entry format: keyspace or keyspace/shard. Requires --enable_buffer=true.")
 )
diff --git a/go/vt/vtgate/engine/route.go b/go/vt/vtgate/engine/route.go
index de234f1ff66..fb113ca585a 100644
--- a/go/vt/vtgate/engine/route.go
+++ b/go/vt/vtgate/engine/route.go
@@ -17,13 +17,13 @@ limitations under the License.
 package engine
 
 import (
-	"encoding/json"
 	"fmt"
 	"sort"
 
 	"strconv"
 	"strings"
 
+	"github.com/youtube/vitess/go/jsonutil"
 	"github.com/youtube/vitess/go/sqltypes"
 	"github.com/youtube/vitess/go/vt/sqlannotation"
 	"github.com/youtube/vitess/go/vt/vterrors"
@@ -140,7 +140,7 @@ func (route *Route) MarshalJSON() ([]byte, error) {
 		Mid:        route.Mid,
 		Suffix:     route.Suffix,
 	}
-	return json.Marshal(marshalRoute)
+	return jsonutil.MarshalNoEscape(marshalRoute)
 }
 
 // Generate represents the instruction to generate
diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go
index 2f4822777d3..e120a0cdc07 100644
--- a/go/vt/vtgate/executor.go
+++ b/go/vt/vtgate/executor.go
@@ -33,6 +33,7 @@ import (
 	"github.com/youtube/vitess/go/acl"
 	"github.com/youtube/vitess/go/cache"
 	"github.com/youtube/vitess/go/sqltypes"
+	"github.com/youtube/vitess/go/stats"
 	"github.com/youtube/vitess/go/vt/sqlannotation"
 	"github.com/youtube/vitess/go/vt/sqlparser"
 	"github.com/youtube/vitess/go/vt/topo"
@@ -78,19 +79,25 @@ type Executor struct {
 var executorOnce sync.Once
 
 // NewExecutor creates a new Executor.
-func NewExecutor(ctx context.Context, serv topo.SrvTopoServer, cell, statsName string, resolver *Resolver, normalize bool, streamSize int) *Executor {
+func NewExecutor(ctx context.Context, serv topo.SrvTopoServer, cell, statsName string, resolver *Resolver, normalize bool, streamSize int, queryCacheSize int64) *Executor {
 	e := &Executor{
 		serv:        serv,
 		cell:        cell,
 		resolver:    resolver,
 		scatterConn: resolver.scatterConn,
 		txConn:      resolver.scatterConn.txConn,
-		plans:       cache.NewLRUCache(10000),
+		plans:       cache.NewLRUCache(queryCacheSize),
 		normalize:   normalize,
 		streamSize:  streamSize,
 	}
 	e.watchSrvVSchema(ctx, cell)
 	executorOnce.Do(func() {
+		stats.Publish("QueryPlanCacheLength", stats.IntFunc(e.plans.Length))
+		stats.Publish("QueryPlanCacheSize", stats.IntFunc(e.plans.Size))
+		stats.Publish("QueryPlanCacheCapacity", stats.IntFunc(e.plans.Capacity))
+		stats.Publish("QueryPlanCacheOldest", stats.StringFunc(func() string {
+			return fmt.Sprintf("%v", e.plans.Oldest())
+		}))
 		http.Handle("/debug/query_plans", e)
 		http.Handle("/debug/vschema", e)
 	})
@@ -181,7 +188,11 @@ func (e *Executor) handleExec(ctx context.Context, session *vtgatepb.Session, sq
 	// V3 mode.
 	query, comments := sqlparser.SplitTrailingComments(sql)
 	vcursor := newVCursorImpl(ctx, session, target, comments, e)
-	plan, err := e.getPlan(vcursor, query, bindVars)
+	plan, err := e.getPlan(vcursor,
+		query,
+		bindVars,
+		skipQueryPlanCache(session),
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -280,6 +291,22 @@ func (e *Executor) handleSet(ctx context.Context, session *vtgatepb.Session, sql
 			default:
 				return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected value for client_found_rows: %d", val)
 			}
+		case "skip_query_plan_cache":
+			val, ok := v.(int64)
+			if !ok {
+				return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected value type for skip_query_plan_cache: %T", v)
+			}
+			if session.Options == nil {
+				session.Options = &querypb.ExecuteOptions{}
+			}
+			switch val {
+			case 0:
+				session.Options.SkipQueryPlanCache = false
+			case 1:
+				session.Options.SkipQueryPlanCache = true
+			default:
+				return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected value for skip_query_plan_cache: %d", val)
+			}
 		case "transaction_mode":
 			val, ok := v.(string)
 			if !ok {
@@ -328,7 +355,7 @@ func (e *Executor) handleSet(ctx context.Context, session *vtgatepb.Session, sql
 			default:
 				return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "disallowed value for character_set_results: %v", v)
 			}
-		case "net_write_timeout", "net_read_timeout":
+		case "net_write_timeout", "net_read_timeout", "lc_messages", "collation_connection":
 			log.Warningf("Ignored inapplicable SET %v = %v", k, v)
 			warnings.Add("IgnoredSet", 1)
 		default:
@@ -376,7 +403,9 @@ func (e *Executor) handleShow(ctx context.Context, session *vtgatepb.Session, sq
 		for _, keyspace := range keyspaces {
 			_, _, shards, err := getKeyspaceShards(ctx, e.serv, e.cell, keyspace, target.TabletType)
 			if err != nil {
-				return nil, err
+				// There might be a misconfigured keyspace or no shards in the keyspace.
+				// Skip any errors and move on.
+				continue
 			}
 
 			for _, shard := range shards {
@@ -395,7 +424,7 @@ func (e *Executor) handleShow(ctx context.Context, session *vtgatepb.Session, sq
 		}
 		ks, ok := e.VSchema().Keyspaces[target.Keyspace]
 		if !ok {
-			return nil, vterrors.Errorf(vtrpcpb.Code_NOT_FOUND, "keyspace %s not found in vschema", target.Keyspace)
+			return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "keyspace %s not found in vschema", target.Keyspace)
 		}
 
 		var tables []string
@@ -459,7 +488,12 @@ func (e *Executor) StreamExecute(ctx context.Context, session *vtgatepb.Session,
 	}
 	query, comments := sqlparser.SplitTrailingComments(sql)
 	vcursor := newVCursorImpl(ctx, session, target, comments, e)
-	plan, err := e.getPlan(vcursor, query, bindVars)
+	plan, err := e.getPlan(
+		vcursor,
+		query,
+		bindVars,
+		skipQueryPlanCache(session),
+	)
 	if err != nil {
 		return err
 	}
@@ -728,7 +762,7 @@ func (e *Executor) ParseTarget(targetString string) querypb.Target {
 
 // getPlan computes the plan for the given query. If one is in
 // the cache, it reuses it.
-func (e *Executor) getPlan(vcursor *vcursorImpl, sql string, bindVars map[string]*querypb.BindVariable) (*engine.Plan, error) {
+func (e *Executor) getPlan(vcursor *vcursorImpl, sql string, bindVars map[string]*querypb.BindVariable, skipQueryPlanCache bool) (*engine.Plan, error) {
 	if e.VSchema() == nil {
 		return nil, errors.New("vschema not initialized")
 	}
@@ -745,7 +779,9 @@ func (e *Executor) getPlan(vcursor *vcursorImpl, sql string, bindVars map[string
 		if err != nil {
 			return nil, err
 		}
-		e.plans.Set(key, plan)
+		if !skipQueryPlanCache {
+			e.plans.Set(key, plan)
+		}
 		return plan, nil
 	}
 	// Normalize and retry.
@@ -766,10 +802,20 @@ func (e *Executor) getPlan(vcursor *vcursorImpl, sql string, bindVars map[string
 	if err != nil {
 		return nil, err
 	}
-	e.plans.Set(normkey, plan)
+	if !skipQueryPlanCache {
+		e.plans.Set(normkey, plan)
+	}
 	return plan, nil
 }
 
+// skipQueryPlanCache extracts SkipQueryPlanCache from session
+func skipQueryPlanCache(session *vtgatepb.Session) bool {
+	if session == nil || session.Options == nil {
+		return false
+	}
+	return session.Options.SkipQueryPlanCache
+}
+
 // ServeHTTP shows the current plans in the query cache.
 func (e *Executor) ServeHTTP(response http.ResponseWriter, request *http.Request) {
 	if err := acl.CheckAccessHTTP(request, acl.DEBUGGING); err != nil {
diff --git a/go/vt/vtgate/executor_framework_test.go b/go/vt/vtgate/executor_framework_test.go
index 9cf968dcfd3..53d8f6415b4 100644
--- a/go/vt/vtgate/executor_framework_test.go
+++ b/go/vt/vtgate/executor_framework_test.go
@@ -202,6 +202,7 @@ var unshardedVSchema = `
 `
 
 const testBufferSize = 10
+const testCacheSize = int64(10)
 
 func createExecutorEnv() (executor *Executor, sbc1, sbc2, sbclookup *sandboxconn.SandboxConn) {
 	cell := "aa"
@@ -230,7 +231,7 @@ func createExecutorEnv() (executor *Executor, sbc1, sbc2, sbclookup *sandboxconn
 
 	getSandbox(KsTestUnsharded).VSchema = unshardedVSchema
 
-	executor = NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize)
+	executor = NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 	return executor, sbc1, sbc2, sbclookup
 }
 
diff --git a/go/vt/vtgate/executor_select_test.go b/go/vt/vtgate/executor_select_test.go
index c72cd1d4844..10e1c27fd03 100644
--- a/go/vt/vtgate/executor_select_test.go
+++ b/go/vt/vtgate/executor_select_test.go
@@ -56,7 +56,7 @@ func TestSelectNext(t *testing.T) {
 func TestExecDBA(t *testing.T) {
 	executor, sbc1, _, _ := createExecutorEnv()
 
-	query := "select * from information_schema.foo"
+	query := "select * from INFORMATION_SCHEMA.foo"
 	_, err := executor.Execute(
 		context.Background(),
 		&vtgatepb.Session{TargetString: "TestExecutor"},
@@ -821,7 +821,7 @@ func TestSelectScatter(t *testing.T) {
 		sbc := hc.AddTestTablet(cell, shard, 1, "TestExecutor", shard, topodatapb.TabletType_MASTER, true, 1, nil)
 		conns = append(conns, sbc)
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	_, err := executorExec(executor, "select id from user", nil)
 	if err != nil {
@@ -853,7 +853,7 @@ func TestStreamSelectScatter(t *testing.T) {
 		sbc := hc.AddTestTablet(cell, shard, 1, "TestExecutor", shard, topodatapb.TabletType_MASTER, true, 1, nil)
 		conns = append(conns, sbc)
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	sql := "select id from user"
 	result, err := executorStream(executor, sql)
@@ -894,7 +894,7 @@ func TestSelectScatterFail(t *testing.T) {
 	}
 	serv := new(sandboxTopo)
 	resolver := newTestResolver(hc, serv, cell)
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	_, err := executorExec(executor, "select id from user", nil)
 	want := "paramsAllShards: keyspace TestExecutor fetch error: topo error GetSrvKeyspace"
@@ -934,7 +934,7 @@ func TestSelectScatterOrderBy(t *testing.T) {
 		}})
 		conns = append(conns, sbc)
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	query := "select col1, col2 from user order by col2 desc"
 	gotResult, err := executorExec(executor, query, nil)
@@ -1002,7 +1002,7 @@ func TestStreamSelectScatterOrderBy(t *testing.T) {
 		}})
 		conns = append(conns, sbc)
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, 10)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	query := "select id, col from user order by col desc"
 	gotResult, err := executorStream(executor, query)
@@ -1065,7 +1065,7 @@ func TestSelectScatterOrderByFail(t *testing.T) {
 			}},
 		}})
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	_, err := executorExec(executor, "select id, col from user order by col asc", nil)
 	want := "types are not comparable: VARCHAR vs VARCHAR"
@@ -1102,7 +1102,7 @@ func TestSelectScatterAggregate(t *testing.T) {
 		}})
 		conns = append(conns, sbc)
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	query := "select col, sum(foo) from user group by col"
 	gotResult, err := executorExec(executor, query, nil)
@@ -1167,7 +1167,7 @@ func TestStreamSelectScatterAggregate(t *testing.T) {
 		}})
 		conns = append(conns, sbc)
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, 10)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	query := "select col, sum(foo) from user group by col"
 	gotResult, err := executorStream(executor, query)
@@ -1232,7 +1232,7 @@ func TestSelectScatterLimit(t *testing.T) {
 		}})
 		conns = append(conns, sbc)
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, 10)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	query := "select col1, col2 from user order by col2 desc limit 3"
 	gotResult, err := executorExec(executor, query, nil)
@@ -1306,7 +1306,7 @@ func TestStreamSelectScatterLimit(t *testing.T) {
 		}})
 		conns = append(conns, sbc)
 	}
-	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, 10)
+	executor := NewExecutor(context.Background(), serv, cell, "", resolver, false, testBufferSize, testCacheSize)
 
 	query := "select col1, col2 from user order by col2 desc limit 3"
 	gotResult, err := executorStream(executor, query)
diff --git a/go/vt/vtgate/executor_test.go b/go/vt/vtgate/executor_test.go
index aa30ad2bfae..e54d4ada9ca 100644
--- a/go/vt/vtgate/executor_test.go
+++ b/go/vt/vtgate/executor_test.go
@@ -281,6 +281,12 @@ func TestExecutorSet(t *testing.T) {
 	}, {
 		in:  "set net_read_timeout = 600",
 		out: &vtgatepb.Session{},
+	}, {
+		in:  "set skip_query_plan_cache = 1",
+		out: &vtgatepb.Session{Options: &querypb.ExecuteOptions{SkipQueryPlanCache: true}},
+	}, {
+		in:  "set skip_query_plan_cache = 0",
+		out: &vtgatepb.Session{Options: &querypb.ExecuteOptions{}},
 	}}
 	for _, tcase := range testcases {
 		session := &vtgatepb.Session{}
@@ -428,6 +434,26 @@ func TestExecutorShow(t *testing.T) {
 		t.Errorf("show databases:\n%+v, want\n%+v", qr, wantqr)
 	}
 
+	// Make sure it still works when one of the keyspaces is in a bad state
+	getSandbox("TestExecutor").SrvKeyspaceMustFail++
+	qr, err = executor.Execute(context.Background(), session, "show vitess_shards", nil)
+	if err != nil {
+		t.Error(err)
+	}
+	// Just test for first & last.
+	qr.Rows = [][]sqltypes.Value{qr.Rows[0], qr.Rows[len(qr.Rows)-1]}
+	wantqr = &sqltypes.Result{
+		Fields: buildVarCharFields("Shards"),
+		Rows: [][]sqltypes.Value{
+			buildVarCharRow("TestSharded/-20"),
+			buildVarCharRow("TestXBadSharding/e0-"),
+		},
+		RowsAffected: 17,
+	}
+	if !reflect.DeepEqual(qr, wantqr) {
+		t.Errorf("show databases:\n%+v, want\n%+v", qr, wantqr)
+	}
+
 	session = &vtgatepb.Session{TargetString: KsTestUnsharded}
 	qr, err = executor.Execute(context.Background(), session, "show vschema_tables", nil)
 	if err != nil {
@@ -707,11 +733,11 @@ func TestGetPlanUnnormalized(t *testing.T) {
 	unshardedvc := newVCursorImpl(context.Background(), nil, querypb.Target{Keyspace: KsTestUnsharded}, "", r)
 
 	query1 := "select * from music_user_map where id = 1"
-	plan1, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{})
+	plan1, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
-	plan2, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{})
+	plan2, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -724,14 +750,14 @@ func TestGetPlanUnnormalized(t *testing.T) {
 	if keys := r.plans.Keys(); !reflect.DeepEqual(keys, want) {
 		t.Errorf("Plan keys: %s, want %s", keys, want)
 	}
-	plan3, err := r.getPlan(unshardedvc, query1, map[string]*querypb.BindVariable{})
+	plan3, err := r.getPlan(unshardedvc, query1, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
 	if plan1 == plan3 {
 		t.Errorf("getPlan(query1, ks): plans must not be equal: %p %p", plan1, plan3)
 	}
-	plan4, err := r.getPlan(unshardedvc, query1, map[string]*querypb.BindVariable{})
+	plan4, err := r.getPlan(unshardedvc, query1, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -747,6 +773,47 @@ func TestGetPlanUnnormalized(t *testing.T) {
 	}
 }
 
+func TestGetPlanCacheUnnormalized(t *testing.T) {
+	r, _, _, _ := createExecutorEnv()
+	emptyvc := newVCursorImpl(context.Background(), nil, querypb.Target{}, "", r)
+	query1 := "select * from music_user_map where id = 1"
+	_, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{}, true /* skipQueryPlanCache */)
+	if err != nil {
+		t.Error(err)
+	}
+	if r.plans.Size() != 0 {
+		t.Errorf("getPlan() expected cache to have size 0, but got: %b", r.plans.Size())
+	}
+	_, err = r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{}, false /* skipQueryPlanCache */)
+	if err != nil {
+		t.Error(err)
+	}
+	if r.plans.Size() != 1 {
+		t.Errorf("getPlan() expected cache to have size 1, but got: %b", r.plans.Size())
+	}
+}
+
+func TestGetPlanCacheNormalized(t *testing.T) {
+	r, _, _, _ := createExecutorEnv()
+	r.normalize = true
+	emptyvc := newVCursorImpl(context.Background(), nil, querypb.Target{}, "", r)
+	query1 := "select * from music_user_map where id = 1"
+	_, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{}, true /* skipQueryPlanCache */)
+	if err != nil {
+		t.Error(err)
+	}
+	if r.plans.Size() != 0 {
+		t.Errorf("getPlan() expected cache to have size 0, but got: %b", r.plans.Size())
+	}
+	_, err = r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{}, false /* skipQueryPlanCache */)
+	if err != nil {
+		t.Error(err)
+	}
+	if r.plans.Size() != 1 {
+		t.Errorf("getPlan() expected cache to have size 1, but got: %b", r.plans.Size())
+	}
+}
+
 func TestGetPlanNormalized(t *testing.T) {
 	r, _, _, _ := createExecutorEnv()
 	r.normalize = true
@@ -756,11 +823,11 @@ func TestGetPlanNormalized(t *testing.T) {
 	query1 := "select * from music_user_map where id = 1"
 	query2 := "select * from music_user_map where id = 2"
 	normalized := "select * from music_user_map where id = :vtg1"
-	plan1, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{})
+	plan1, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
-	plan2, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{})
+	plan2, err := r.getPlan(emptyvc, query1, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -773,14 +840,14 @@ func TestGetPlanNormalized(t *testing.T) {
 	if keys := r.plans.Keys(); !reflect.DeepEqual(keys, want) {
 		t.Errorf("Plan keys: %s, want %s", keys, want)
 	}
-	plan3, err := r.getPlan(emptyvc, query2, map[string]*querypb.BindVariable{})
+	plan3, err := r.getPlan(emptyvc, query2, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
 	if plan1 != plan3 {
 		t.Errorf("getPlan(query2): plans must be equal: %p %p", plan1, plan3)
 	}
-	plan4, err := r.getPlan(emptyvc, normalized, map[string]*querypb.BindVariable{})
+	plan4, err := r.getPlan(emptyvc, normalized, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -788,14 +855,14 @@ func TestGetPlanNormalized(t *testing.T) {
 		t.Errorf("getPlan(normalized): plans must be equal: %p %p", plan1, plan4)
 	}
 
-	plan3, err = r.getPlan(unshardedvc, query1, map[string]*querypb.BindVariable{})
+	plan3, err = r.getPlan(unshardedvc, query1, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
 	if plan1 == plan3 {
 		t.Errorf("getPlan(query1, ks): plans must not be equal: %p %p", plan1, plan3)
 	}
-	plan4, err = r.getPlan(unshardedvc, query1, map[string]*querypb.BindVariable{})
+	plan4, err = r.getPlan(unshardedvc, query1, map[string]*querypb.BindVariable{}, false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -811,12 +878,12 @@ func TestGetPlanNormalized(t *testing.T) {
 	}
 
 	// Errors
-	_, err = r.getPlan(emptyvc, "syntax", map[string]*querypb.BindVariable{})
+	_, err = r.getPlan(emptyvc, "syntax", map[string]*querypb.BindVariable{}, false)
 	wantErr := "syntax error at position 7 near 'syntax'"
 	if err == nil || err.Error() != wantErr {
 		t.Errorf("getPlan(syntax): %v, want %s", err, wantErr)
 	}
-	_, err = r.getPlan(emptyvc, "create table a(id int)", map[string]*querypb.BindVariable{})
+	_, err = r.getPlan(emptyvc, "create table a(id int)", map[string]*querypb.BindVariable{}, false)
 	wantErr = "unsupported construct: ddl"
 	if err == nil || err.Error() != wantErr {
 		t.Errorf("getPlan(syntax): %v, want %s", err, wantErr)
@@ -941,3 +1008,42 @@ func TestPassthroughDDL(t *testing.T) {
 	sbc2.Queries = nil
 	masterSession.TargetString = ""
 }
+
+func TestParseEmptyTargetSingleKeyspace(t *testing.T) {
+	r, _, _, _ := createExecutorEnv()
+	altVSchema := &vindexes.VSchema{
+		Keyspaces: map[string]*vindexes.KeyspaceSchema{
+			KsTestUnsharded: r.vschema.Keyspaces[KsTestUnsharded],
+		},
+	}
+	r.vschema = altVSchema
+
+	got := r.ParseTarget("")
+	want := querypb.Target{
+		Keyspace:   KsTestUnsharded,
+		TabletType: topodatapb.TabletType_MASTER,
+	}
+	if !proto.Equal(&got, &want) {
+		t.Errorf("ParseTarget(%s): %v, want %v", "@master", got, want)
+	}
+}
+
+func TestParseEmptyTargetMultiKeyspace(t *testing.T) {
+	r, _, _, _ := createExecutorEnv()
+	altVSchema := &vindexes.VSchema{
+		Keyspaces: map[string]*vindexes.KeyspaceSchema{
+			KsTestUnsharded: r.vschema.Keyspaces[KsTestUnsharded],
+			KsTestSharded:   r.vschema.Keyspaces[KsTestSharded],
+		},
+	}
+	r.vschema = altVSchema
+
+	got := r.ParseTarget("")
+	want := querypb.Target{
+		Keyspace:   "",
+		TabletType: topodatapb.TabletType_MASTER,
+	}
+	if !proto.Equal(&got, &want) {
+		t.Errorf("ParseTarget(%s): %v, want %v", "@master", got, want)
+	}
+}
diff --git a/go/vt/vtgate/grpcvtgateconn/conn.go b/go/vt/vtgate/grpcvtgateconn/conn.go
index e5e56507b8d..e4d3f0f92dc 100644
--- a/go/vt/vtgate/grpcvtgateconn/conn.go
+++ b/go/vt/vtgate/grpcvtgateconn/conn.go
@@ -58,7 +58,7 @@ func dial(ctx context.Context, addr string, timeout time.Duration) (vtgateconn.I
 	if err != nil {
 		return nil, err
 	}
-	cc, err := grpc.Dial(addr, opt, grpc.WithBlock(), grpc.WithTimeout(timeout))
+	cc, err := grpc.Dial(addr, opt, grpc.WithBlock(), grpc.WithTimeout(timeout), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(*grpcutils.MaxMessageSize), grpc.MaxCallSendMsgSize(*grpcutils.MaxMessageSize)))
 	if err != nil {
 		return nil, err
 	}
diff --git a/go/vt/vtgate/planbuilder/from.go b/go/vt/vtgate/planbuilder/from.go
index f0c69bbe3e3..189605eb190 100644
--- a/go/vt/vtgate/planbuilder/from.go
+++ b/go/vt/vtgate/planbuilder/from.go
@@ -27,8 +27,6 @@ import (
 
 // This file has functions to analyze the FROM clause.
 
-var infoSchema = sqlparser.NewTableIdent("information_schema")
-
 // processTableExprs analyzes the FROM clause. It produces a builder
 // with all the routes identified.
 func processTableExprs(tableExprs sqlparser.TableExprs, vschema VSchema) (builder, error) {
@@ -159,7 +157,7 @@ func processAliasedTable(tableExpr *sqlparser.AliasedTableExpr, vschema VSchema)
 // It also returns the associated vschema info (*Table) so that
 // it can be used to create the symbol table entry.
 func buildERoute(tableName sqlparser.TableName, vschema VSchema) (*engine.Route, *vindexes.Table, error) {
-	if tableName.Qualifier == infoSchema {
+	if systemTable(tableName.Qualifier.String()) {
 		ks, err := vschema.DefaultKeyspace()
 		if err != nil {
 			return nil, nil, err
diff --git a/go/vt/vtgate/planbuilder/ordered_aggregate.go b/go/vt/vtgate/planbuilder/ordered_aggregate.go
index b02a5f2475d..f6a616e73fe 100644
--- a/go/vt/vtgate/planbuilder/ordered_aggregate.go
+++ b/go/vt/vtgate/planbuilder/ordered_aggregate.go
@@ -19,6 +19,7 @@ package planbuilder
 import (
 	"errors"
 	"fmt"
+	"strconv"
 
 	"github.com/youtube/vitess/go/vt/sqlparser"
 	"github.com/youtube/vitess/go/vt/vtgate/engine"
@@ -112,11 +113,11 @@ func checkAggregates(sel *sqlparser.Select, bldr builder) (builder, error) {
 	// 'select id, col from t group by id, col', or a query could be like
 	// 'select id, count(*) from t group by id'. In the above cases,
 	// the grouping can be done at the shard level, which allows the entire query
-	// to be pushed down. However, we cannot analyze group by clauses here
-	// because it can only be done after the symbol table has been updated
-	// with select expressions.
-	// For the sake of simplicity, we won't perform this optimization because
-	// these use cases are rare.
+	// to be pushed down. In order to perform this analysis, we're going to look
+	// ahead at the group by clause to see if it references a unique vindex.
+	if groupByHasUniqueVindex(sel, bldr, rb) {
+		return bldr, nil
+	}
 
 	// We need an aggregator primitive.
 	return &orderedAggregate{
@@ -148,6 +149,81 @@ func nodeHasAggregates(node sqlparser.SQLNode) bool {
 	return hasAggregates
 }
 
+// groupbyHasUniqueVindex looks ahead at the group by expression to see if
+// it references a unique vindex.
+//
+// The vitess group by rules are different from MySQL because it's not possible
+// to match the MySQL behavior without knowing the schema. For example:
+// 'select id as val from t group by val' will have different interpretations
+// under MySQL depending on whether t has a val column or not.
+// In vitess, we always assume that 'val' references 'id'. This is achieved
+// by the symbol table resolving against the select list before searching
+// the tables.
+//
+// In order to look ahead, we have to overcome the chicken-and-egg problem:
+// group by needs the select aliases to be built. Select aliases are built
+// on push-down. But push-down decision depends on whether group by expressions
+// reference a vindex.
+// To overcome this, the look-ahead has to perform a search that matches
+// the group by analyzer. The flow is similar to oa.SetGroupBy, except that
+// we don't search the ResultColumns because they're not created yet. Also,
+// error conditions are treated as no match for simplicity; They will be
+// subsequently caught downstream.
+func groupByHasUniqueVindex(sel *sqlparser.Select, bldr builder, rb *route) bool {
+	for _, expr := range sel.GroupBy {
+		var matchedExpr sqlparser.Expr
+		switch node := expr.(type) {
+		case *sqlparser.ColName:
+			if expr := findAlias(node, sel.SelectExprs); expr != nil {
+				matchedExpr = expr
+			} else {
+				matchedExpr = node
+			}
+		case *sqlparser.SQLVal:
+			if node.Type != sqlparser.IntVal {
+				continue
+			}
+			num, err := strconv.ParseInt(string(node.Val), 0, 64)
+			if err != nil {
+				continue
+			}
+			if num < 1 || num > int64(len(sel.SelectExprs)) {
+				continue
+			}
+			expr, ok := sel.SelectExprs[num-1].(*sqlparser.AliasedExpr)
+			if !ok {
+				continue
+			}
+			matchedExpr = expr.Expr
+		default:
+			continue
+		}
+		vindex := bldr.Symtab().Vindex(matchedExpr, rb)
+		if vindex != nil && vindexes.IsUnique(vindex) {
+			return true
+		}
+	}
+	return false
+}
+
+func findAlias(colname *sqlparser.ColName, selects sqlparser.SelectExprs) sqlparser.Expr {
+	// Qualified column names cannot match an (unqualified) alias.
+	if !colname.Qualifier.IsEmpty() {
+		return nil
+	}
+	// See if this references an alias.
+	for _, selectExpr := range selects {
+		selectExpr, ok := selectExpr.(*sqlparser.AliasedExpr)
+		if !ok {
+			continue
+		}
+		if colname.Name.Equal(selectExpr.As) {
+			return selectExpr.Expr
+		}
+	}
+	return nil
+}
+
 // Symtab satisfies the builder interface.
 func (oa *orderedAggregate) Symtab() *symtab {
 	return oa.symtab
@@ -245,14 +321,14 @@ func (oa *orderedAggregate) MakeDistinct() error {
 }
 
 // SetGroupBy satisfies the builder interface.
-func (oa *orderedAggregate) SetGroupBy(groupBy sqlparser.GroupBy) (builder, error) {
+func (oa *orderedAggregate) SetGroupBy(groupBy sqlparser.GroupBy) error {
 	colnum := -1
 	for _, expr := range groupBy {
 		switch node := expr.(type) {
 		case *sqlparser.ColName:
 			c := node.Metadata.(*column)
 			if c.Origin() == oa {
-				return nil, fmt.Errorf("group by expression cannot reference an aggregate function: %v", sqlparser.String(node))
+				return fmt.Errorf("group by expression cannot reference an aggregate function: %v", sqlparser.String(node))
 			}
 			for i, rc := range oa.resultColumns {
 				if rc.column == c {
@@ -261,38 +337,22 @@ func (oa *orderedAggregate) SetGroupBy(groupBy sqlparser.GroupBy) (builder, erro
 				}
 			}
 			if colnum == -1 {
-				return nil, errors.New("unsupported: in scatter query: group by column must reference column in SELECT list")
+				return errors.New("unsupported: in scatter query: group by column must reference column in SELECT list")
 			}
 		case *sqlparser.SQLVal:
 			num, err := ResultFromNumber(oa.resultColumns, node)
 			if err != nil {
-				return nil, err
+				return err
 			}
 			colnum = num
 		default:
-			return nil, errors.New("unsupported: in scatter query: only simple references allowed")
-		}
-		if vindexes.IsUnique(oa.resultColumns[colnum].column.Vindex) {
-			oa.setDefunct()
-			return oa.input.SetGroupBy(groupBy)
+			return errors.New("unsupported: in scatter query: only simple references allowed")
 		}
 		oa.eaggr.Keys = append(oa.eaggr.Keys, colnum)
 	}
 
-	_, _ = oa.input.SetGroupBy(groupBy)
-	return oa, nil
-}
-
-// setDefunct replaces the column references originated by
-// oa into the ones of the underlying route, effectively
-// removing itself as an originator. Because resultColumns
-// are shared objects, this change equally affects the ones
-// in symtab. So, the change is global. All future resolves
-// will yield the column originated by the underlying route.
-func (oa *orderedAggregate) setDefunct() {
-	for i, rc := range oa.resultColumns {
-		rc.column = oa.input.ResultColumns()[i].column
-	}
+	_ = oa.input.SetGroupBy(groupBy)
+	return nil
 }
 
 // PushOrderBy pushes the order by expression into the primitive.
diff --git a/go/vt/vtgate/planbuilder/postprocess.go b/go/vt/vtgate/planbuilder/postprocess.go
index e52562f9c39..6967956a7de 100644
--- a/go/vt/vtgate/planbuilder/postprocess.go
+++ b/go/vt/vtgate/planbuilder/postprocess.go
@@ -32,28 +32,26 @@ type groupByHandler interface {
 	// SetGroupBy makes the primitive handle the group by clause.
 	// The primitive may outsource some of its work to an underlying
 	// primitive that is also a groupByHandler (like a route).
-	// This function returns either the current builder or a different
-	// one depending on the result of the analysis.
-	SetGroupBy(sqlparser.GroupBy) (builder, error)
+	SetGroupBy(sqlparser.GroupBy) error
 	// MakeDistinct makes the primitive handle the distinct clause.
 	MakeDistinct() error
 }
 
 // pushGroupBy processes the group by clause. It resolves all symbols,
 // and ensures that there are no subqueries.
-func pushGroupBy(sel *sqlparser.Select, bldr builder) (builder, error) {
+func pushGroupBy(sel *sqlparser.Select, bldr builder) error {
 	if sel.Distinct != "" {
 		// We can be here only if the builder could handle a group by.
 		if err := bldr.(groupByHandler).MakeDistinct(); err != nil {
-			return nil, err
+			return err
 		}
 	}
 
 	if len(sel.GroupBy) == 0 {
-		return bldr, nil
+		return nil
 	}
 	if err := bldr.Symtab().ResolveSymbols(sel.GroupBy); err != nil {
-		return nil, fmt.Errorf("unsupported: in group by: %v", err)
+		return fmt.Errorf("unsupported: in group by: %v", err)
 	}
 
 	// We can be here only if the builder could handle a group by.
diff --git a/go/vt/vtgate/planbuilder/route.go b/go/vt/vtgate/planbuilder/route.go
index e95a00c7d6c..f9f8f2afc7a 100644
--- a/go/vt/vtgate/planbuilder/route.go
+++ b/go/vt/vtgate/planbuilder/route.go
@@ -19,6 +19,7 @@ package planbuilder
 import (
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/youtube/vitess/go/sqltypes"
 	"github.com/youtube/vitess/go/vt/sqlparser"
@@ -392,9 +393,9 @@ func (rb *route) MakeDistinct() error {
 }
 
 // SetGroupBy sets the GROUP BY clause for the route.
-func (rb *route) SetGroupBy(groupBy sqlparser.GroupBy) (builder, error) {
+func (rb *route) SetGroupBy(groupBy sqlparser.GroupBy) error {
 	rb.Select.(*sqlparser.Select).GroupBy = groupBy
-	return rb, nil
+	return nil
 }
 
 // PushOrderBy sets the order by for the route.
@@ -405,7 +406,7 @@ func (rb *route) PushOrderBy(order *sqlparser.Order) error {
 	}
 
 	// If it's a scatter, we have to populate the OrderBy field.
-	var colnum int
+	colnum := -1
 	switch expr := order.Expr.(type) {
 	case *sqlparser.SQLVal:
 		var err error
@@ -414,8 +415,6 @@ func (rb *route) PushOrderBy(order *sqlparser.Order) error {
 		}
 	case *sqlparser.ColName:
 		c := expr.Metadata.(*column)
-		// The column is guaranteed to be found because this function is called
-		// only after a successful symbol resolution that points to this route.
 		for i, rc := range rb.resultColumns {
 			if rc.column == c {
 				colnum = i
@@ -423,11 +422,12 @@ func (rb *route) PushOrderBy(order *sqlparser.Order) error {
 			}
 		}
 	default:
-		return fmt.Errorf("unsupported: in scatter query: complex order by expression: %v", sqlparser.String(expr))
+		return fmt.Errorf("unsupported: in scatter query: complex order by expression: %s", sqlparser.String(expr))
 	}
-	// Ensure that it's not an anonymous column (* expression).
-	if rb.resultColumns[colnum].alias.IsEmpty() {
-		return errors.New("unsupported: scatter order by with a '*' in select expression")
+	// If column is not found, then the order by is referencing
+	// a column that's not on the select list.
+	if colnum == -1 {
+		return fmt.Errorf("unsupported: in scatter query: order by must reference a column in the select list: %s", sqlparser.String(order))
 	}
 	rb.ERoute.OrderBy = append(rb.ERoute.OrderBy, engine.OrderbyParams{
 		Col:  colnum,
@@ -519,10 +519,12 @@ func (rb *route) Wireup(bldr builder, jt *jointab) error {
 				return
 			}
 		case sqlparser.TableName:
-			if node.Qualifier != infoSchema {
+			if !systemTable(node.Qualifier.String()) {
 				node.Name.Format(buf)
 				return
 			}
+			node.Format(buf)
+			return
 		}
 		node.Format(buf)
 	}
@@ -533,6 +535,13 @@ func (rb *route) Wireup(bldr builder, jt *jointab) error {
 	return nil
 }
 
+func systemTable(qualifier string) bool {
+	return strings.EqualFold(qualifier, "information_schema") ||
+		strings.EqualFold(qualifier, "performance_schema") ||
+		strings.EqualFold(qualifier, "sys") ||
+		strings.EqualFold(qualifier, "mysql")
+}
+
 // procureValues procures and converts the input into
 // the expected types for rb.Values.
 func (rb *route) procureValues(bldr builder, jt *jointab, val sqlparser.Expr) (sqltypes.PlanValue, error) {
@@ -573,10 +582,12 @@ func (rb *route) generateFieldQuery(sel sqlparser.SelectStatement, jt *jointab)
 				return
 			}
 		case sqlparser.TableName:
-			if node.Qualifier != infoSchema {
+			if !systemTable(node.Qualifier.String()) {
 				node.Name.Format(buf)
 				return
 			}
+			node.Format(buf)
+			return
 		}
 		sqlparser.FormatImpossibleQuery(buf, node)
 	}
diff --git a/go/vt/vtgate/planbuilder/select.go b/go/vt/vtgate/planbuilder/select.go
index 9258ab079d7..7b4c038955d 100644
--- a/go/vt/vtgate/planbuilder/select.go
+++ b/go/vt/vtgate/planbuilder/select.go
@@ -127,8 +127,7 @@ func pushSelectExprs(sel *sqlparser.Select, bldr builder) (builder, error) {
 	}
 	bldr.Symtab().ResultColumns = resultColumns
 
-	bldr, err = pushGroupBy(sel, bldr)
-	if err != nil {
+	if err := pushGroupBy(sel, bldr); err != nil {
 		return nil, err
 	}
 	return bldr, nil
diff --git a/go/vt/vtgate/plugin_mysql_server.go b/go/vt/vtgate/plugin_mysql_server.go
index b45b0bfa890..ea65dc138b3 100644
--- a/go/vt/vtgate/plugin_mysql_server.go
+++ b/go/vt/vtgate/plugin_mysql_server.go
@@ -20,6 +20,8 @@ import (
 	"flag"
 	"fmt"
 	"net"
+	"os"
+	"syscall"
 
 	log "github.com/golang/glog"
 	"golang.org/x/net/context"
@@ -162,20 +164,52 @@ func initMySQLProtocol() {
 			mysqlListener.SlowConnectWarnThreshold = *mysqlSlowConnectWarnThreshold
 		}
 		// Start listening for tcp
-		go func() {
-			mysqlListener.Accept()
-		}()
+		go mysqlListener.Accept()
 	}
 
 	if *mysqlServerSocketPath != "" {
-		mysqlUnixListener, err = mysql.NewListener("unix", *mysqlServerSocketPath, authServer, vh)
+		// Let's create this unix socket with permissions to all users. In this way,
+		// clients can connect to vtgate mysql server without being vtgate user
+		oldMask := syscall.Umask(000)
+		mysqlUnixListener, err = newMysqlUnixSocket(*mysqlServerSocketPath, authServer, vh)
+		_ = syscall.Umask(oldMask)
 		if err != nil {
 			log.Fatalf("mysql.NewListener failed: %v", err)
+			return
 		}
 		// Listen for unix socket
-		go func() {
-			mysqlUnixListener.Accept()
-		}()
+		go mysqlUnixListener.Accept()
+	}
+}
+
+// newMysqlUnixSocket creates a new unix socket mysql listener. If a socket file already exists, attempts
+// to clean it up.
+func newMysqlUnixSocket(address string, authServer mysql.AuthServer, handler mysql.Handler) (*mysql.Listener, error) {
+	listener, err := mysql.NewListener("unix", address, authServer, handler)
+	switch err := err.(type) {
+	case nil:
+		return listener, nil
+	case *net.OpError:
+		log.Warningf("Found existent socket when trying to create new unix mysql listener: %s, attempting to clean up", address)
+		// err.Op should never be different from listen, just being extra careful
+		// in case in the future other errors are returned here
+		if err.Op != "listen" {
+			return nil, err
+		}
+		_, dialErr := net.Dial("unix", address)
+		if dialErr == nil {
+			log.Errorf("Existent socket is still accepting connections, aborting", address)
+			return nil, err
+		}
+		removeFileErr := os.Remove(address)
+		if removeFileErr != nil {
+			log.Errorf("Couldn't remove existent socket file: %s", address)
+			return nil, err
+		}
+		listener, listenerErr := mysql.NewListener("unix", address, authServer, handler)
+		return listener, listenerErr
+	default:
+		return nil, err
 	}
 }
 
diff --git a/go/vt/vtgate/plugin_mysql_server_test.go b/go/vt/vtgate/plugin_mysql_server_test.go
new file mode 100644
index 00000000000..ef96a782d2f
--- /dev/null
+++ b/go/vt/vtgate/plugin_mysql_server_test.go
@@ -0,0 +1,156 @@
+/*
+Copyright 2017 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreedto in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package vtgate
+
+import (
+	"golang.org/x/net/context"
+	"io/ioutil"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/youtube/vitess/go/mysql"
+	"github.com/youtube/vitess/go/sqltypes"
+)
+
+type testHandler struct {
+	lastConn *mysql.Conn
+}
+
+func (th *testHandler) NewConnection(c *mysql.Conn) {
+	th.lastConn = c
+}
+
+func (th *testHandler) ConnectionClosed(c *mysql.Conn) {
+}
+
+func (th *testHandler) ComQuery(c *mysql.Conn, q []byte, callback func(*sqltypes.Result) error) error {
+	return nil
+}
+
+func TestConnectionUnixSocket(t *testing.T) {
+	th := &testHandler{}
+
+	authServer := mysql.NewAuthServerStatic()
+
+	authServer.Entries["user1"] = []*mysql.AuthServerStaticEntry{
+		{
+			Password:   "password1",
+			UserData:   "userData1",
+			SourceHost: "localhost",
+		},
+	}
+
+	// Use tmp file to reserve a path, remove it immediately, we only care about
+	// name in this context
+	unixSocket, err := ioutil.TempFile("", "mysql_vitess_test.sock")
+	if err != nil {
+		t.Fatalf("Failed to create temp file")
+	}
+	os.Remove(unixSocket.Name())
+
+	l, err := newMysqlUnixSocket(unixSocket.Name(), authServer, th)
+	if err != nil {
+		t.Fatalf("NewUnixSocket failed: %v", err)
+	}
+	defer l.Close()
+	go l.Accept()
+
+	params := &mysql.ConnParams{
+		UnixSocket: unixSocket.Name(),
+		Uname:      "user1",
+		Pass:       "password1",
+	}
+
+	c, err := mysql.Connect(context.Background(), params)
+	if err != nil {
+		t.Errorf("Should be able to connect to server but found error: %v", err)
+	}
+	c.Close()
+}
+
+func TestConnectionStaleUnixSocket(t *testing.T) {
+	th := &testHandler{}
+
+	authServer := mysql.NewAuthServerStatic()
+
+	authServer.Entries["user1"] = []*mysql.AuthServerStaticEntry{
+		{
+			Password:   "password1",
+			UserData:   "userData1",
+			SourceHost: "localhost",
+		},
+	}
+
+	// First let's create a file. In this way, we simulate
+	// having a stale socket on disk that needs to be cleaned up.
+	unixSocket, err := ioutil.TempFile("", "mysql_vitess_test.sock")
+	if err != nil {
+		t.Fatalf("Failed to create temp file")
+	}
+
+	l, err := newMysqlUnixSocket(unixSocket.Name(), authServer, th)
+	if err != nil {
+		t.Fatalf("NewListener failed: %v", err)
+	}
+	defer l.Close()
+	go l.Accept()
+
+	params := &mysql.ConnParams{
+		UnixSocket: unixSocket.Name(),
+		Uname:      "user1",
+		Pass:       "password1",
+	}
+
+	c, err := mysql.Connect(context.Background(), params)
+	if err != nil {
+		t.Errorf("Should be able to connect to server but found error: %v", err)
+	}
+	c.Close()
+}
+
+func TestConnectionRespectsExistingUnixSocket(t *testing.T) {
+	th := &testHandler{}
+
+	authServer := mysql.NewAuthServerStatic()
+
+	authServer.Entries["user1"] = []*mysql.AuthServerStaticEntry{
+		{
+			Password:   "password1",
+			UserData:   "userData1",
+			SourceHost: "localhost",
+		},
+	}
+
+	unixSocket, err := ioutil.TempFile("", "mysql_vitess_test.sock")
+	if err != nil {
+		t.Fatalf("Failed to create temp file")
+	}
+	os.Remove(unixSocket.Name())
+
+	l, err := newMysqlUnixSocket(unixSocket.Name(), authServer, th)
+	if err != nil {
+		t.Errorf("NewListener failed: %v", err)
+	}
+	defer l.Close()
+	go l.Accept()
+	_, err = newMysqlUnixSocket(unixSocket.Name(), authServer, th)
+	want := "listen unix"
+	if err == nil || !strings.HasPrefix(err.Error(), want) {
+		t.Errorf("Error: %v, want prefix %s", err, want)
+	}
+}
diff --git a/go/vt/vtgate/scatter_conn.go b/go/vt/vtgate/scatter_conn.go
index 547157de5a3..5a8acaf74b3 100644
--- a/go/vt/vtgate/scatter_conn.go
+++ b/go/vt/vtgate/scatter_conn.go
@@ -17,6 +17,8 @@ limitations under the License.
 package vtgate
 
 import (
+	"flag"
+	"io"
 	"math/rand"
 	"sync"
 	"time"
@@ -36,6 +38,10 @@ import (
 	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
 )
 
+var (
+	messageStreamGracePeriod = flag.Duration("message_stream_grace_period", 30*time.Second, "the amount of time to give for a vttablet to resume if it ends a message stream, usually because of a reparent.")
+)
+
 // ScatterConn is used for executing queries across
 // multiple shard level connections.
 type ScatterConn struct {
@@ -403,15 +409,88 @@ func (stc *ScatterConn) StreamExecuteMulti(
 	return allErrors.AggrError(vterrors.Aggregate)
 }
 
+// timeTracker is a convenience wrapper used by MessageStream
+// to track how long a stream has been unavailable.
+type timeTracker struct {
+	mu         sync.Mutex
+	timestamps map[*querypb.Target]time.Time
+}
+
+func newTimeTracker() *timeTracker {
+	return &timeTracker{
+		timestamps: make(map[*querypb.Target]time.Time),
+	}
+}
+
+// Reset resets the timestamp set by Record.
+func (tt *timeTracker) Reset(target *querypb.Target) {
+	tt.mu.Lock()
+	defer tt.mu.Unlock()
+	delete(tt.timestamps, target)
+}
+
+// Record records the time to Now if there was no previous timestamp,
+// and it keeps returning that value until the next Reset.
+func (tt *timeTracker) Record(target *querypb.Target) time.Time {
+	tt.mu.Lock()
+	defer tt.mu.Unlock()
+	last, ok := tt.timestamps[target]
+	if !ok {
+		last = time.Now()
+		tt.timestamps[target] = last
+	}
+	return last
+}
+
 // MessageStream streams messages from the specified shards.
 func (stc *ScatterConn) MessageStream(ctx context.Context, keyspace string, shards []string, name string, callback func(*sqltypes.Result) error) error {
+	// The cancelable context is used for handling errors
+	// from individual streams.
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
 	// mu is used to merge multiple callback calls into one.
 	var mu sync.Mutex
 	fieldSent := false
+	lastErrors := newTimeTracker()
 	allErrors := stc.multiGo(ctx, "MessageStream", keyspace, shards, topodatapb.TabletType_MASTER, func(target *querypb.Target) error {
-		return stc.gateway.MessageStream(ctx, target, name, func(qr *sqltypes.Result) error {
-			return stc.processOneStreamingResult(&mu, &fieldSent, qr, callback)
-		})
+		// This loop handles the case where a reparent happens, which can cause
+		// an individual stream to end. If we don't succeed on the retries for
+		// messageStreamGracePeriod, we abort and return an error.
+		for {
+			err := stc.gateway.MessageStream(ctx, target, name, func(qr *sqltypes.Result) error {
+				lastErrors.Reset(target)
+				return stc.processOneStreamingResult(&mu, &fieldSent, qr, callback)
+			})
+			// nil and EOF are equivalent. UNAVAILABLE can be returned by vttablet if it's demoted
+			// from master to replica. For any of these conditions, we have to retry.
+			if err != nil && err != io.EOF && vterrors.Code(err) != vtrpcpb.Code_UNAVAILABLE {
+				cancel()
+				return err
+			}
+
+			// There was no error. We have to see if we need to retry.
+			// If context was canceled, likely due to client disconnect,
+			// return normally without retrying.
+			select {
+			case <-ctx.Done():
+				return nil
+			default:
+			}
+			firstErrorTimeStamp := lastErrors.Record(target)
+			if time.Now().Sub(firstErrorTimeStamp) >= *messageStreamGracePeriod {
+				// Cancel all streams and return an error.
+				cancel()
+				return vterrors.Errorf(vtrpcpb.Code_DEADLINE_EXCEEDED, "message stream from %v has repeatedly failed for longer than %v", target, *messageStreamGracePeriod)
+			}
+
+			// It's not been too long since our last good send. Wait and retry.
+			select {
+			case <-ctx.Done():
+				return nil
+			case <-time.After(*messageStreamGracePeriod / 5):
+			}
+		}
 	})
 	return allErrors.AggrError(vterrors.Aggregate)
 }
diff --git a/go/vt/vtgate/vcursor_impl.go b/go/vt/vtgate/vcursor_impl.go
index c8f92e11c2a..3c0f7285aec 100644
--- a/go/vt/vtgate/vcursor_impl.go
+++ b/go/vt/vtgate/vcursor_impl.go
@@ -82,7 +82,7 @@ func (vc *vcursorImpl) DefaultKeyspace() (*vindexes.Keyspace, error) {
 	}
 	ks, ok := vc.executor.VSchema().Keyspaces[vc.target.Keyspace]
 	if !ok {
-		return nil, vterrors.Errorf(vtrpcpb.Code_NOT_FOUND, "keyspace %s not found in vschema", vc.target.Keyspace)
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "keyspace %s not found in vschema", vc.target.Keyspace)
 	}
 	return ks.Keyspace, nil
 }
diff --git a/go/vt/vtgate/vindexes/vindex.go b/go/vt/vtgate/vindexes/vindex.go
index 240fb57fa40..675a273a865 100644
--- a/go/vt/vtgate/vindexes/vindex.go
+++ b/go/vt/vtgate/vindexes/vindex.go
@@ -129,7 +129,7 @@ func Register(vindexType string, newVindexFunc NewVindexFunc) {
 func CreateVindex(vindexType, name string, params map[string]string) (Vindex, error) {
 	f, ok := registry[vindexType]
 	if !ok {
-		return nil, fmt.Errorf("vindexType %s not found", vindexType)
+		return nil, fmt.Errorf("vindexType %q not found", vindexType)
 	}
 	return f(name, params)
 }
diff --git a/go/vt/vtgate/vindexes/vschema.go b/go/vt/vtgate/vindexes/vschema.go
index 5c8ca0fcff3..f2d01b40aa2 100644
--- a/go/vt/vtgate/vindexes/vschema.go
+++ b/go/vt/vtgate/vindexes/vschema.go
@@ -162,7 +162,7 @@ func buildTables(source *vschemapb.SrvVSchema, vschema *VSchema) error {
 			case Unique:
 			case NonUnique:
 			default:
-				return fmt.Errorf("vindex %s needs to be Unique or NonUnique", vname)
+				return fmt.Errorf("vindex %q needs to be Unique or NonUnique", vname)
 			}
 			vindexes[vname] = vindex
 		}
diff --git a/go/vt/vtgate/vindexes/vschema_test.go b/go/vt/vtgate/vindexes/vschema_test.go
index 886a2361f84..c0a2ae10c2a 100644
--- a/go/vt/vtgate/vindexes/vschema_test.go
+++ b/go/vt/vtgate/vindexes/vschema_test.go
@@ -355,7 +355,7 @@ func TestBuildVSchemaVindexNotFoundFail(t *testing.T) {
 		},
 	}
 	_, err := BuildVSchema(&bad)
-	want := "vindexType noexist not found"
+	want := `vindexType "noexist" not found`
 	if err == nil || err.Error() != want {
 		t.Errorf("BuildVSchema: %v, want %v", err, want)
 	}
@@ -408,7 +408,7 @@ func TestBuildVSchemaInvalidVindexFail(t *testing.T) {
 		},
 	}
 	_, err := BuildVSchema(&bad)
-	want := "vindex stf needs to be Unique or NonUnique"
+	want := `vindex "stf" needs to be Unique or NonUnique`
 	if err == nil || err.Error() != want {
 		t.Errorf("BuildVSchema: %v, want %v", err, want)
 	}
@@ -1028,7 +1028,7 @@ func TestValidate(t *testing.T) {
 		},
 	}
 	err = ValidateKeyspace(bad)
-	want := "vindexType absent not found"
+	want := `vindexType "absent" not found`
 	if err == nil || !strings.HasPrefix(err.Error(), want) {
 		t.Errorf("Validate: %v, must start with %s", err, want)
 	}
diff --git a/go/vt/vtgate/vtgate.go b/go/vt/vtgate/vtgate.go
index 6407ae0bd9e..2b0a6ecea41 100644
--- a/go/vt/vtgate/vtgate.go
+++ b/go/vt/vtgate/vtgate.go
@@ -55,6 +55,7 @@ var (
 	transactionMode  = flag.String("transaction_mode", "MULTI", "SINGLE: disallow multi-db transactions, MULTI: allow multi-db transactions with best effort commit, TWOPC: allow multi-db transactions with 2pc commit")
 	normalizeQueries = flag.Bool("normalize_queries", true, "Rewrite queries with bind vars. Turn this off if the app itself sends normalized queries with bind vars.")
 	streamBufferSize = flag.Int("stream_buffer_size", 32*1024, "the number of bytes sent from vtgate for each stream call. It's recommended to keep this value in sync with vttablet's query-server-config-stream-buffer-size.")
+	queryCacheSize   = flag.Int64("gate_query_cache_size", 10000, "gate server query cache size, maximum number of queries to be cached. vtgate analyzes every incoming query and generate a query plan, these plans are being cached in a lru cache. This config controls the capacity of the lru cache.")
 )
 
 func getTxMode() vtgatepb.TransactionMode {
@@ -160,7 +161,7 @@ func Init(ctx context.Context, hc discovery.HealthCheck, topoServer topo.Server,
 	resolver := NewResolver(serv, cell, sc)
 
 	rpcVTGate = &VTGate{
-		executor:     NewExecutor(ctx, serv, cell, "VTGateExecutor", resolver, *normalizeQueries, *streamBufferSize),
+		executor:     NewExecutor(ctx, serv, cell, "VTGateExecutor", resolver, *normalizeQueries, *streamBufferSize, *queryCacheSize),
 		resolver:     resolver,
 		txConn:       tc,
 		timings:      stats.NewMultiTimings("VtgateApi", []string{"Operation", "Keyspace", "DbType"}),
@@ -498,7 +499,7 @@ handleError:
 func (vtg *VTGate) ExecuteBatchShards(ctx context.Context, queries []*vtgatepb.BoundShardQuery, tabletType topodatapb.TabletType, asTransaction bool, session *vtgatepb.Session, options *querypb.ExecuteOptions) ([]sqltypes.Result, error) {
 	startTime := time.Now()
 	ltt := topoproto.TabletTypeLString(tabletType)
-	statsKey := []string{"ExecuteBatchShards", "", ltt}
+	statsKey := []string{"ExecuteBatchShards", unambiguousKeyspaceBSQ(queries), ltt}
 	defer vtg.timings.Record(statsKey, startTime)
 
 	var qrs []sqltypes.Result
@@ -547,7 +548,7 @@ handleError:
 func (vtg *VTGate) ExecuteBatchKeyspaceIds(ctx context.Context, queries []*vtgatepb.BoundKeyspaceIdQuery, tabletType topodatapb.TabletType, asTransaction bool, session *vtgatepb.Session, options *querypb.ExecuteOptions) ([]sqltypes.Result, error) {
 	startTime := time.Now()
 	ltt := topoproto.TabletTypeLString(tabletType)
-	statsKey := []string{"ExecuteBatchKeyspaceIds", "", ltt}
+	statsKey := []string{"ExecuteBatchKeyspaceIds", unambiguousKeyspaceBKSIQ(queries), ltt}
 	defer vtg.timings.Record(statsKey, startTime)
 
 	var qrs []sqltypes.Result
@@ -1073,3 +1074,47 @@ func annotateBoundShardQueriesAsUnfriendly(queries []*vtgatepb.BoundShardQuery)
 		queries[i].Query.Sql = sqlannotation.AnnotateIfDML(q.Query.Sql, nil)
 	}
 }
+
+// unambiguousKeyspaceBKSIQ is a helper function used in the
+// ExecuteBatchKeyspaceIds method to determine the "keyspace" label for the
+// stats reporting.
+// If all queries target the same keyspace, it returns that keyspace.
+// Otherwise it returns an empty string.
+func unambiguousKeyspaceBKSIQ(queries []*vtgatepb.BoundKeyspaceIdQuery) string {
+	switch len(queries) {
+	case 0:
+		return ""
+	case 1:
+		return queries[0].Keyspace
+	default:
+		keyspace := queries[0].Keyspace
+		for _, q := range queries[1:] {
+			if q.Keyspace != keyspace {
+				// Request targets at least two different keyspaces.
+				return ""
+			}
+		}
+		return keyspace
+	}
+}
+
+// unambiguousKeyspaceBSQ is the same as unambiguousKeyspaceBKSIQ but for the
+// ExecuteBatchShards method. We are intentionally duplicating the code here and
+// do not try to generalize it because this may be less performant.
+func unambiguousKeyspaceBSQ(queries []*vtgatepb.BoundShardQuery) string {
+	switch len(queries) {
+	case 0:
+		return ""
+	case 1:
+		return queries[0].Keyspace
+	default:
+		keyspace := queries[0].Keyspace
+		for _, q := range queries[1:] {
+			if q.Keyspace != keyspace {
+				// Request targets at least two different keyspaces.
+				return ""
+			}
+		}
+		return keyspace
+	}
+}
diff --git a/go/vt/vtgate/vtgate_test.go b/go/vt/vtgate/vtgate_test.go
index 27a2021996c..c7e7b24e6f4 100644
--- a/go/vt/vtgate/vtgate_test.go
+++ b/go/vt/vtgate/vtgate_test.go
@@ -19,10 +19,12 @@ package vtgate
 import (
 	"encoding/hex"
 	"fmt"
+	"io"
 	"math"
 	"reflect"
 	"strings"
 	"testing"
+	"time"
 
 	"golang.org/x/net/context"
 
@@ -791,6 +793,11 @@ func TestVTGateExecuteBatchShards(t *testing.T) {
 	if len(session.ShardSessions) != 2 {
 		t.Errorf("want 2, got %d", len(session.ShardSessions))
 	}
+
+	timingsCount := rpcVTGate.timings.Counts()["ExecuteBatchShards.TestVTGateExecuteBatchShards.master"]
+	if got, want := timingsCount, int64(2); got != want {
+		t.Errorf("stats were not properly recorded: got = %d, want = %d", got, want)
+	}
 }
 
 func TestVTGateExecuteBatchKeyspaceIds(t *testing.T) {
@@ -860,6 +867,11 @@ func TestVTGateExecuteBatchKeyspaceIds(t *testing.T) {
 	if len(session.ShardSessions) != 2 {
 		t.Errorf("want 2, got %d", len(session.ShardSessions))
 	}
+
+	timingsCount := rpcVTGate.timings.Counts()["ExecuteBatchKeyspaceIds.TestVTGateExecuteBatchKeyspaceIds.master"]
+	if got, want := timingsCount, int64(2); got != want {
+		t.Errorf("stats were not properly recorded: got = %d, want = %d", got, want)
+	}
 }
 
 func TestVTGateStreamExecute(t *testing.T) {
@@ -1172,10 +1184,15 @@ func TestVTGateMessageStreamSharded(t *testing.T) {
 	_ = hcVTGateTest.AddTestTablet("aa", "1.1.1.1", 1002, ks, shard2, topodatapb.TabletType_MASTER, true, 1, nil)
 	ch := make(chan *sqltypes.Result)
 	done := make(chan struct{})
+	ctx, cancel := context.WithCancel(context.Background())
 	go func() {
 		kr := &topodatapb.KeyRange{End: []byte{0x40}}
-		err := rpcVTGate.MessageStream(context.Background(), ks, "", kr, "msg", func(qr *sqltypes.Result) error {
-			ch <- qr
+		err := rpcVTGate.MessageStream(ctx, ks, "", kr, "msg", func(qr *sqltypes.Result) error {
+			select {
+			case <-ctx.Done():
+				return io.EOF
+			case ch <- qr:
+			}
 			return nil
 		})
 		if err != nil {
@@ -1189,6 +1206,8 @@ func TestVTGateMessageStreamSharded(t *testing.T) {
 	if !reflect.DeepEqual(got, sandboxconn.SingleRowResult) {
 		t.Errorf("MessageStream: %v, want %v", got, sandboxconn.SingleRowResult)
 	}
+	// Once we cancel, the function should return.
+	cancel()
 	<-done
 
 	// Test error case.
@@ -1210,9 +1229,14 @@ func TestVTGateMessageStreamUnsharded(t *testing.T) {
 	_ = hcVTGateTest.AddTestTablet("aa", "1.1.1.1", 1001, ks, "0", topodatapb.TabletType_MASTER, true, 1, nil)
 	ch := make(chan *sqltypes.Result)
 	done := make(chan struct{})
+	ctx, cancel := context.WithCancel(context.Background())
 	go func() {
-		err := rpcVTGate.MessageStream(context.Background(), ks, "0", nil, "msg", func(qr *sqltypes.Result) error {
-			ch <- qr
+		err := rpcVTGate.MessageStream(ctx, ks, "0", nil, "msg", func(qr *sqltypes.Result) error {
+			select {
+			case <-ctx.Done():
+				return io.EOF
+			case ch <- qr:
+			}
 			return nil
 		})
 		if err != nil {
@@ -1224,9 +1248,143 @@ func TestVTGateMessageStreamUnsharded(t *testing.T) {
 	if !reflect.DeepEqual(got, sandboxconn.SingleRowResult) {
 		t.Errorf("MessageStream: %v, want %v", got, sandboxconn.SingleRowResult)
 	}
+	// Function should return after cancel.
+	cancel()
 	<-done
 }
 
+func TestVTGateMessageStreamRetry(t *testing.T) {
+	*messageStreamGracePeriod = 5 * time.Second
+	defer func() {
+		*messageStreamGracePeriod = 30 * time.Second
+	}()
+	ks := KsTestUnsharded
+	createSandbox(ks)
+	hcVTGateTest.Reset()
+	_ = hcVTGateTest.AddTestTablet("aa", "1.1.1.1", 1001, ks, "0", topodatapb.TabletType_MASTER, true, 1, nil)
+	ch := make(chan *sqltypes.Result)
+	done := make(chan struct{})
+	ctx, cancel := context.WithCancel(context.Background())
+	go func() {
+		err := rpcVTGate.MessageStream(ctx, ks, "0", nil, "msg", func(qr *sqltypes.Result) error {
+			select {
+			case <-ctx.Done():
+				return io.EOF
+			case ch <- qr:
+			}
+			return nil
+		})
+		if err != nil {
+			t.Error(err)
+		}
+		close(done)
+	}()
+	<-ch
+
+	// By default, will end the stream after the first message,
+	// which should make vtgate wait for 1s (5s/5) and retry.
+	start := time.Now()
+	<-ch
+	duration := time.Now().Sub(start)
+	if duration < 1*time.Second || duration > 2*time.Second {
+		t.Errorf("Retry duration should be around 1 second: %v", duration)
+	}
+	// Function should return after cancel.
+	cancel()
+	<-done
+}
+
+func TestVTGateMessageStreamUnavailable(t *testing.T) {
+	*messageStreamGracePeriod = 5 * time.Second
+	defer func() {
+		*messageStreamGracePeriod = 30 * time.Second
+	}()
+	ks := KsTestUnsharded
+	createSandbox(ks)
+	hcVTGateTest.Reset()
+	tablet := hcVTGateTest.AddTestTablet("aa", "1.1.1.1", 1001, ks, "0", topodatapb.TabletType_MASTER, true, 1, nil)
+	// Unavailable error should cause vtgate to wait 1s and retry.
+	tablet.MustFailCodes[vtrpcpb.Code_UNAVAILABLE] = 1
+	ch := make(chan *sqltypes.Result)
+	done := make(chan struct{})
+	ctx, cancel := context.WithCancel(context.Background())
+	go func() {
+		err := rpcVTGate.MessageStream(ctx, ks, "0", nil, "msg", func(qr *sqltypes.Result) error {
+			select {
+			case <-ctx.Done():
+				return io.EOF
+			case ch <- qr:
+			}
+			return nil
+		})
+		if err != nil {
+			t.Error(err)
+		}
+		close(done)
+	}()
+
+	// Verify the 1s delay.
+	start := time.Now()
+	<-ch
+	duration := time.Now().Sub(start)
+	if duration < 1*time.Second || duration > 2*time.Second {
+		t.Errorf("Retry duration should be around 1 second: %v", duration)
+	}
+	// Function should return after cancel.
+	cancel()
+	<-done
+}
+
+func TestVTGateMessageStreamGracePeriod(t *testing.T) {
+	*messageStreamGracePeriod = 1 * time.Second
+	defer func() {
+		*messageStreamGracePeriod = 30 * time.Second
+	}()
+	ks := KsTestUnsharded
+	createSandbox(ks)
+	hcVTGateTest.Reset()
+	tablet := hcVTGateTest.AddTestTablet("aa", "1.1.1.1", 1001, ks, "0", topodatapb.TabletType_MASTER, true, 1, nil)
+	// tablet should return no results for at least 5 calls for it to exceed the grace period.
+	tablet.SetResults([]*sqltypes.Result{
+		nil,
+		nil,
+		nil,
+		nil,
+		nil,
+		nil,
+		nil,
+		nil,
+	})
+	start := time.Now()
+	err := rpcVTGate.MessageStream(context.Background(), ks, "0", nil, "msg", func(qr *sqltypes.Result) error {
+		return nil
+	})
+	want := "has repeatedly failed for longer than 1s"
+	if err == nil || !strings.Contains(err.Error(), want) {
+		t.Errorf("MessageStream err: %v, must contain %s", err, want)
+	}
+	duration := time.Now().Sub(start)
+	if duration < 1*time.Second || duration > 2*time.Second {
+		t.Errorf("Retry duration should be around 1 second: %v", duration)
+	}
+}
+
+func TestVTGateMessageStreamFail(t *testing.T) {
+	ks := KsTestUnsharded
+	createSandbox(ks)
+	hcVTGateTest.Reset()
+	tablet := hcVTGateTest.AddTestTablet("aa", "1.1.1.1", 1001, ks, "0", topodatapb.TabletType_MASTER, true, 1, nil)
+	// tablet should should fail immediately if the error is not EOF or UNAVAILABLE.
+	tablet.MustFailCodes[vtrpcpb.Code_RESOURCE_EXHAUSTED] = 1
+	err := rpcVTGate.MessageStream(context.Background(), ks, "0", nil, "msg", func(qr *sqltypes.Result) error {
+		return nil
+	})
+	want := "RESOURCE_EXHAUSTED error"
+	if err == nil || !strings.Contains(err.Error(), want) {
+		t.Errorf("MessageStream err: %v, must contain %s", err, want)
+	}
+}
+
 func TestVTGateMessageAck(t *testing.T) {
 	ks := KsTestUnsharded
 	createSandbox(ks)
@@ -1996,6 +2154,10 @@ func testErrorPropagation(t *testing.T, sbcs []*sandboxconn.SandboxConn, before
 			t.Errorf("unexpected error, got %v want %v: %v", ec, expected, err)
 		}
 	}
+	statsKey := fmt.Sprintf("%s.%s.master.%v", "ExecuteBatchShards", KsTestUnsharded, vterrors.Code(err))
+	if got, want := errorCounts.Counts()[statsKey], int64(1); got != want {
+		t.Errorf("errorCounts not increased for '%s': got = %v, want = %v", statsKey, got, want)
+	}
 	for _, sbc := range sbcs {
 		after(sbc)
 	}
@@ -2027,13 +2189,17 @@ func testErrorPropagation(t *testing.T, sbcs []*sandboxconn.SandboxConn, before
 		nil,
 		executeOptions)
 	if err == nil {
-		t.Errorf("error %v not propagated for ExecuteBatchShards", expected)
+		t.Errorf("error %v not propagated for ExecuteBatchKeyspaceIds", expected)
 	} else {
 		ec := vterrors.Code(err)
 		if ec != expected {
 			t.Errorf("unexpected error, got %v want %v: %v", ec, expected, err)
 		}
 	}
+	statsKey = fmt.Sprintf("%s.%s.master.%v", "ExecuteBatchKeyspaceIds", KsTestUnsharded, vterrors.Code(err))
+	if got, want := errorCounts.Counts()[statsKey], int64(1); got != want {
+		t.Errorf("errorCounts not increased for '%s': got = %v, want = %v", statsKey, got, want)
+	}
 	for _, sbc := range sbcs {
 		after(sbc)
 	}
diff --git a/go/vt/vttablet/endtoend/framework/testcase.go b/go/vt/vttablet/endtoend/framework/testcase.go
index 37d09c6f19a..21dd13eacc7 100644
--- a/go/vt/vttablet/endtoend/framework/testcase.go
+++ b/go/vt/vttablet/endtoend/framework/testcase.go
@@ -142,7 +142,7 @@ func (tc *TestCase) Test(name string, client *QueryClient) error {
 			got = append(got, str)
 		}
 		if !reflect.DeepEqual(got, tc.Rewritten) {
-			errs = append(errs, fmt.Sprintf("Rewritten mismatch:\n'%+v' does not match\n'%+v'", got, tc.Rewritten))
+			errs = append(errs, fmt.Sprintf("Rewritten mismatch:\n'%q' does not match\n'%q'", got, tc.Rewritten))
 		}
 	}
 	if tc.Plan != "" {
diff --git a/go/vt/vttablet/endtoend/main_test.go b/go/vt/vttablet/endtoend/main_test.go
index b2b50e8fc6a..257578087a2 100644
--- a/go/vt/vttablet/endtoend/main_test.go
+++ b/go/vt/vttablet/endtoend/main_test.go
@@ -132,13 +132,16 @@ create table vitess_ints(tiny tinyint default 0, tinyu tinyint unsigned default
 create table vitess_fracts(id int default 0, deci decimal(5,2) default null, num numeric(5,2) default null, f float default null, d double default null, primary key(id));
 create table vitess_strings(vb varbinary(16) default 'vb', c char(16) default null, vc varchar(16) default null, b binary(4) default null, tb tinyblob default null, bl blob default null, ttx tinytext default null, tx text default null, en enum('a','b') default null, s set('a','b') default null, primary key(vb));
 create table vitess_misc(id int default 0, b bit(8) default null, d date default null, dt datetime default null, t time default null, g geometry default null, primary key(id));
-create table vitess_unsupported(id int default 0, pt point default null, primary key(id));
+create table vitess_bit_default(id bit(8) default b'101', primary key(id));
 
 create table vitess_bool(auto int auto_increment, bval tinyint(1) default 0, sval varchar(16) default '', ival int default null, primary key (auto));
 
 create table vitess_seq(id int default 0, next_id bigint default null, cache bigint default null, increment bigint default null, primary key(id)) comment 'vitess_sequence';
 insert into vitess_seq(id, next_id, cache) values(0, 1, 3);
 
+create table vitess_reset_seq(id int default 0, next_id bigint default null, cache bigint default null, increment bigint default null, primary key(id)) comment 'vitess_sequence';
+insert into vitess_reset_seq(id, next_id, cache) values(0, 1, 3);
+
 create table vitess_part(id int, data varchar(16), primary key(id));
 alter table vitess_part partition by range (id) (partition p0 values less than (10), partition p1 values less than (maxvalue));
 
@@ -181,7 +184,7 @@ var tableACLConfig = `{
     },
     {
       "name": "vitess",
-      "table_names_or_prefixes": ["vitess_a", "vitess_b", "vitess_c", "dual", "vitess_d", "vitess_temp", "vitess_e", "vitess_f", "vitess_mixed_case", "upsert_test", "vitess_strings", "vitess_fracts", "vitess_ints", "vitess_misc", "vitess_big", "vitess_view", "vitess_json", "vitess_bool", "vitess_autoinc_seq"],
+      "table_names_or_prefixes": ["vitess_a", "vitess_b", "vitess_c", "dual", "vitess_d", "vitess_temp", "vitess_e", "vitess_f", "vitess_mixed_case", "upsert_test", "vitess_strings", "vitess_fracts", "vitess_ints", "vitess_misc", "vitess_bit_default", "vitess_big", "vitess_view", "vitess_json", "vitess_bool", "vitess_autoinc_seq"],
       "readers": ["dev"],
       "writers": ["dev"],
       "admins": ["dev"]
@@ -200,6 +203,13 @@ var tableACLConfig = `{
       "writers": ["dev"],
       "admins": ["dev"]
     },
+    {
+      "name": "vitess_reset_seq",
+      "table_names_or_prefixes": ["vitess_reset_seq"],
+      "readers": ["dev"],
+      "writers": ["dev"],
+      "admins": ["dev"]
+    },
     {
       "name": "vitess_message",
       "table_names_or_prefixes": ["vitess_message"],
diff --git a/go/vt/vttablet/endtoend/queries_test.go b/go/vt/vttablet/endtoend/queries_test.go
index 8c72c225c01..fc9456b8bbd 100644
--- a/go/vt/vttablet/endtoend/queries_test.go
+++ b/go/vt/vttablet/endtoend/queries_test.go
@@ -20,8 +20,9 @@ import (
 	"testing"
 
 	"github.com/youtube/vitess/go/sqltypes"
-	querypb "github.com/youtube/vitess/go/vt/proto/query"
 	"github.com/youtube/vitess/go/vt/vttablet/endtoend/framework"
+
+	querypb "github.com/youtube/vitess/go/vt/proto/query"
 )
 
 var frameworkErrors = `fail failed:
@@ -30,8 +31,8 @@ Result mismatch:
 '[[2 1] [1 2]]'
 RowsAffected mismatch: 2, want 1
 Rewritten mismatch:
-'[select eid, id from vitess_a where 1 != 1 union select eid, id from vitess_b where 1 != 1 select /* fail */ eid, id from vitess_a union select eid, id from vitess_b limit 10001]' does not match
-'[select eid id from vitess_a where 1 != 1 union select eid, id from vitess_b where 1 != 1 select /* fail */ eid, id from vitess_a union select eid, id from vitess_b]'
+'["select eid, id from vitess_a where 1 != 1 union select eid, id from vitess_b where 1 != 1" "select /* fail */ eid, id from vitess_a union select eid, id from vitess_b limit 10001"]' does not match
+'["select eid id from vitess_a where 1 != 1 union select eid, id from vitess_b where 1 != 1" "select /* fail */ eid, id from vitess_a union select eid, id from vitess_b"]'
 Plan mismatch: PASS_SELECT, want aa`
 
 func TestTheFramework(t *testing.T) {
@@ -58,7 +59,8 @@ func TestTheFramework(t *testing.T) {
 	}
 }
 
-func TestNocacheCases(t *testing.T) {
+// TODO(sougou): break this up into smaller parts.
+func TestQueries(t *testing.T) {
 	client := framework.NewClient()
 
 	testCases := []framework.Testable{
@@ -1794,3 +1796,36 @@ func TestNocacheCases(t *testing.T) {
 		}
 	}
 }
+
+func TestBitDefault(t *testing.T) {
+	client := framework.NewClient()
+
+	testCases := []framework.Testable{
+		&framework.MultiCase{
+			Name: "bit default value",
+			Cases: []framework.Testable{
+				framework.TestQuery("begin"),
+				&framework.TestCase{
+					Query: "insert into vitess_bit_default values()",
+					Rewritten: []string{
+						"insert into vitess_bit_default(id) values ('\x05') /* _stream vitess_bit_default (id ) ('BQ==' )",
+					},
+					RowsAffected: 1,
+				},
+				framework.TestQuery("commit"),
+				&framework.TestCase{
+					Query: "select hex(id) from vitess_bit_default",
+					Result: [][]string{
+						{"5"},
+					},
+					RowsAffected: 1,
+				},
+			},
+		},
+	}
+	for _, tcase := range testCases {
+		if err := tcase.Test("", client); err != nil {
+			t.Error(err)
+		}
+	}
+}
diff --git a/go/vt/vttablet/endtoend/sequence_test.go b/go/vt/vttablet/endtoend/sequence_test.go
index a481f828848..4ca830134ca 100644
--- a/go/vt/vttablet/endtoend/sequence_test.go
+++ b/go/vt/vttablet/endtoend/sequence_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/youtube/vitess/go/vt/vttablet/endtoend/framework"
 
 	querypb "github.com/youtube/vitess/go/vt/proto/query"
+	topodatapb "github.com/youtube/vitess/go/vt/proto/topodata"
 )
 
 func TestSequence(t *testing.T) {
@@ -41,8 +42,7 @@ func TestSequence(t *testing.T) {
 		want.Rows[0][0] = sqltypes.NewInt64(wantval)
 		qr, err := framework.NewClient().Execute("select next 2 values from vitess_seq", nil)
 		if err != nil {
-			t.Error(err)
-			return
+			t.Fatal(err)
 		}
 		if !reflect.DeepEqual(*qr, want) {
 			t.Errorf("Execute: \n%#v, want \n%#v", *qr, want)
@@ -58,11 +58,51 @@ func TestSequence(t *testing.T) {
 	}
 	qr, err := framework.NewClient().Execute("select next_id, cache from vitess_seq", nil)
 	if err != nil {
-		t.Error(err)
-		return
+		t.Fatal(err)
 	}
 	qr.Fields = nil
 	if !reflect.DeepEqual(*qr, want) {
 		t.Errorf("Execute: \n%#v, want \n%#v", *qr, want)
 	}
 }
+
+func TestResetSequence(t *testing.T) {
+	client := framework.NewClient()
+	want := sqltypes.Result{
+		Fields: []*querypb.Field{{
+			Name: "nextval",
+			Type: sqltypes.Int64,
+		}},
+		RowsAffected: 1,
+		Rows: [][]sqltypes.Value{{
+			sqltypes.NewInt64(1),
+		}},
+	}
+	qr, err := client.Execute("select next value from vitess_reset_seq", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(*qr, want) {
+		t.Errorf("Execute: \n%#v, want \n%#v", *qr, want)
+	}
+
+	// Reset mastership
+	err = client.SetServingType(topodatapb.TabletType_REPLICA)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = client.SetServingType(topodatapb.TabletType_MASTER)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Ensure the next value skips previously cached values.
+	want.Rows[0][0] = sqltypes.NewInt64(4)
+	qr, err = client.Execute("select next value from vitess_reset_seq", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(*qr, want) {
+		t.Errorf("Execute: \n%#v, want \n%#v", *qr, want)
+	}
+}
diff --git a/go/vt/vttablet/grpctabletconn/conn.go b/go/vt/vttablet/grpctabletconn/conn.go
index c87319c6c23..4e9d885b7b7 100644
--- a/go/vt/vttablet/grpctabletconn/conn.go
+++ b/go/vt/vttablet/grpctabletconn/conn.go
@@ -77,6 +77,7 @@ func DialTablet(tablet *topodatapb.Tablet, timeout time.Duration) (queryservice.
 	if timeout > 0 {
 		opts = append(opts, grpc.WithBlock(), grpc.WithTimeout(timeout))
 	}
+	opts = append(opts, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(*grpcutils.MaxMessageSize), grpc.MaxCallSendMsgSize(*grpcutils.MaxMessageSize)))
 	cc, err := grpc.Dial(addr, opts...)
 	if err != nil {
 		return nil, err
diff --git a/go/vt/vttablet/heartbeat/reader.go b/go/vt/vttablet/heartbeat/reader.go
index 3f81976c333..17cd892b774 100644
--- a/go/vt/vttablet/heartbeat/reader.go
+++ b/go/vt/vttablet/heartbeat/reader.go
@@ -55,10 +55,12 @@ type Reader struct {
 	now           func() time.Time
 	errorLog      *logutil.ThrottledLogger
 
-	mu             sync.Mutex
-	isOpen         bool
-	pool           *connpool.Pool
-	ticks          *timer.Timer
+	runMu  sync.Mutex
+	isOpen bool
+	pool   *connpool.Pool
+	ticks  *timer.Timer
+
+	lagMu          sync.Mutex
 	lastKnownLag   time.Duration
 	lastKnownError error
 }
@@ -95,8 +97,8 @@ func (r *Reader) Open(dbc dbconfigs.DBConfigs) {
 	if !r.enabled {
 		return
 	}
-	r.mu.Lock()
-	defer r.mu.Unlock()
+	r.runMu.Lock()
+	defer r.runMu.Unlock()
 	if r.isOpen {
 		return
 	}
@@ -113,8 +115,8 @@ func (r *Reader) Close() {
 	if !r.enabled {
 		return
 	}
-	r.mu.Lock()
-	defer r.mu.Unlock()
+	r.runMu.Lock()
+	defer r.runMu.Unlock()
 	if !r.isOpen {
 		return
 	}
@@ -126,8 +128,8 @@ func (r *Reader) Close() {
 
 // GetLatest returns the most recently recorded lag measurement or error encountered.
 func (r *Reader) GetLatest() (time.Duration, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
+	r.lagMu.Lock()
+	defer r.lagMu.Unlock()
 	if r.lastKnownError != nil {
 		return 0, r.lastKnownError
 	}
@@ -157,10 +159,10 @@ func (r *Reader) readHeartbeat() {
 	lagNs.Add(lag.Nanoseconds())
 	reads.Add(1)
 
-	r.mu.Lock()
+	r.lagMu.Lock()
 	r.lastKnownLag = lag
 	r.lastKnownError = nil
-	r.mu.Unlock()
+	r.lagMu.Unlock()
 }
 
 // fetchMostRecentHeartbeat fetches the most recently recorded heartbeat from the heartbeat table,
@@ -209,9 +211,9 @@ func parseHeartbeatResult(res *sqltypes.Result) (int64, error) {
 // Errors tracked here are logged with throttling to cut down on log spam since
 // operations can happen very frequently in this package.
 func (r *Reader) recordError(err error) {
-	r.mu.Lock()
+	r.lagMu.Lock()
 	r.lastKnownError = err
-	r.mu.Unlock()
+	r.lagMu.Unlock()
 	r.errorLog.Errorf("%v", err)
 	readErrors.Add(1)
 }
diff --git a/go/vt/vttablet/sandboxconn/sandboxconn.go b/go/vt/vttablet/sandboxconn/sandboxconn.go
index 59843a3a438..d4469a30468 100644
--- a/go/vt/vttablet/sandboxconn/sandboxconn.go
+++ b/go/vt/vttablet/sandboxconn/sandboxconn.go
@@ -80,6 +80,10 @@ type SandboxConn struct {
 	// no results left, SingleRowResult is returned.
 	results []*sqltypes.Result
 
+	// Executor contains an optional interface to get results, otherwise
+	// it uses the static results
+	Executor SandboxExecutor
+
 	// ReadTransactionResults is used for returning results for ReadTransaction.
 	ReadTransactionResults []*querypb.TransactionMetadata
 
@@ -89,6 +93,12 @@ type SandboxConn struct {
 	TransactionID sync2.AtomicInt64
 }
 
+// SandboxExecutor is an interface to allow test clients to obtain query
+// results via a callback
+type SandboxExecutor interface {
+	Execute(ctx context.Context, target *querypb.Target, query string, bindVars map[string]*querypb.BindVariable, transactionID int64, options *querypb.ExecuteOptions) (*sqltypes.Result, error)
+}
+
 var _ queryservice.QueryService = (*SandboxConn)(nil) // compile-time interface check
 
 // NewSandboxConn returns a new SandboxConn targeted to the provided tablet.
@@ -130,6 +140,9 @@ func (sbc *SandboxConn) Execute(ctx context.Context, target *querypb.Target, que
 	if err := sbc.getError(); err != nil {
 		return nil, err
 	}
+	if sbc.Executor != nil {
+		return sbc.Executor.Execute(ctx, target, query, bindVars, transactionID, options)
+	}
 	return sbc.getNextResult(), nil
 }
 
@@ -301,7 +314,14 @@ func (sbc *SandboxConn) BeginExecuteBatch(ctx context.Context, target *querypb.T
 
 // MessageStream is part of the QueryService interface.
 func (sbc *SandboxConn) MessageStream(ctx context.Context, target *querypb.Target, name string, callback func(*sqltypes.Result) error) (err error) {
-	callback(SingleRowResult)
+	if err := sbc.getError(); err != nil {
+		return err
+	}
+	r := sbc.getNextResult()
+	if r == nil {
+		return nil
+	}
+	callback(r)
 	return nil
 }
 
diff --git a/go/vt/vttablet/sysloglogger/sysloglogger_test.go b/go/vt/vttablet/sysloglogger/sysloglogger_test.go
index 1c37005a054..8e98fabf0a7 100644
--- a/go/vt/vttablet/sysloglogger/sysloglogger_test.go
+++ b/go/vt/vttablet/sysloglogger/sysloglogger_test.go
@@ -83,7 +83,7 @@ func (fw *failingFakeWriter) Close() error          { return nil }
 // expectedLogStatsText returns the results expected from the plugin processing a dummy message generated by mockLogStats(...).
 func expectedLogStatsText(originalSQL string) string {
 	return fmt.Sprintf("Execute\t\t\t''\t''\tJan  1 00:00:00.000000\tJan  1 00:00:00.000000\t0.000000\tPASS_SELECT\t"+
-		"\"%s\"\tmap[]\t0\t\"\"\tnone\t0.000000\t0.000000\t0\t0\t\"\"", originalSQL)
+		"\"%s\"\t[REDACTED]\t0\t\"[REDACTED]\"\tnone\t0.000000\t0.000000\t0\t0\t\"\"", originalSQL)
 }
 
 // TestSyslog sends a stream of five query records to the plugin, and verifies that they are logged.
diff --git a/go/vt/vttablet/tabletmanager/action_agent.go b/go/vt/vttablet/tabletmanager/action_agent.go
index 042157d6173..cd48450b237 100644
--- a/go/vt/vttablet/tabletmanager/action_agent.go
+++ b/go/vt/vttablet/tabletmanager/action_agent.go
@@ -271,6 +271,10 @@ func NewActionAgent(
 		return nil, err
 	}
 
+	// Run a background task to rebuild the SrvKeyspace in our cell/keyspace
+	// if it doesn't exist yet.
+	go agent.maybeRebuildKeyspace(agent.initialTablet.Alias.Cell, agent.initialTablet.Keyspace)
+
 	// register the RPC services from the agent
 	servenv.OnRun(func() {
 		agent.registerQueryService()
@@ -638,10 +642,6 @@ func (agent *ActionAgent) Start(ctx context.Context, mysqlHost string, mysqlPort
 	startingTablet.Type = topodatapb.TabletType_UNKNOWN
 	agent.setTablet(startingTablet)
 
-	// run a background task to rebuild the SrvKeyspace in our cell/keyspace
-	// if it doesn't exist yet
-	go agent.maybeRebuildKeyspace(agent.initialTablet.Alias.Cell, agent.initialTablet.Keyspace)
-
 	return nil
 }
 
diff --git a/go/vt/vttablet/tabletserver/messager/cache.go b/go/vt/vttablet/tabletserver/messager/cache.go
index 9c5a8d6b8ee..3f8f367c12c 100644
--- a/go/vt/vttablet/tabletserver/messager/cache.go
+++ b/go/vt/vttablet/tabletserver/messager/cache.go
@@ -28,9 +28,10 @@ import (
 // MessageRow represents a message row.
 // The first column in Row is always the "id".
 type MessageRow struct {
-	TimeNext int64
-	Epoch    int64
-	Row      []sqltypes.Value
+	TimeNext    int64
+	Epoch       int64
+	TimeCreated int64
+	Row         []sqltypes.Value
 }
 
 type messageHeap []*MessageRow
diff --git a/go/vt/vttablet/tabletserver/messager/engine.go b/go/vt/vttablet/tabletserver/messager/engine.go
index 875d31e504d..53a8713383a 100644
--- a/go/vt/vttablet/tabletserver/messager/engine.go
+++ b/go/vt/vttablet/tabletserver/messager/engine.go
@@ -24,6 +24,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/youtube/vitess/go/sqltypes"
+	"github.com/youtube/vitess/go/sync2"
 	"github.com/youtube/vitess/go/vt/dbconfigs"
 	"github.com/youtube/vitess/go/vt/sqlparser"
 	"github.com/youtube/vitess/go/vt/vterrors"
@@ -49,9 +50,10 @@ type Engine struct {
 	isOpen   bool
 	managers map[string]*messageManager
 
-	tsv   TabletService
-	se    *schema.Engine
-	conns *connpool.Pool
+	tsv          TabletService
+	se           *schema.Engine
+	conns        *connpool.Pool
+	postponeSema *sync2.Semaphore
 }
 
 // NewEngine creates a new Engine.
@@ -65,7 +67,8 @@ func NewEngine(tsv TabletService, se *schema.Engine, config tabletenv.TabletConf
 			time.Duration(config.IdleTimeout*1e9),
 			tsv,
 		),
-		managers: make(map[string]*messageManager),
+		postponeSema: sync2.NewSemaphore(config.MessagePostponeCap, 0),
+		managers:     make(map[string]*messageManager),
 	}
 }
 
@@ -103,16 +106,17 @@ func (me *Engine) Close() {
 // usually triggered by Close. It's the responsibility of the send
 // function to promptly return if the done channel is closed. Otherwise,
 // the engine's Close function will hang indefinitely.
-func (me *Engine) Subscribe(name string, send func(*sqltypes.Result) error) (done chan struct{}, err error) {
+func (me *Engine) Subscribe(ctx context.Context, name string, send func(*sqltypes.Result) error) (done <-chan struct{}, err error) {
 	me.mu.Lock()
 	defer me.mu.Unlock()
+	if !me.isOpen {
+		return nil, vterrors.Errorf(vtrpcpb.Code_UNAVAILABLE, "messager engine is closed, probably because this is not a master any more")
+	}
 	mm := me.managers[name]
 	if mm == nil {
 		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "message table %s not found", name)
 	}
-	rcv, done := newMessageReceiver(send)
-	mm.Subscribe(rcv)
-	return done, nil
+	return mm.Subscribe(ctx, send), nil
 }
 
 // LockDB obtains db locks for all messages that need to
@@ -182,7 +186,7 @@ func (me *Engine) GenerateLoadMessagesQuery(name string) (*sqlparser.ParsedQuery
 	defer me.mu.Unlock()
 	mm := me.managers[name]
 	if mm == nil {
-		return nil, vterrors.Errorf(vtrpcpb.Code_NOT_FOUND, "message table %s not found in schema", name)
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "message table %s not found in schema", name)
 	}
 	return mm.loadMessagesQuery, nil
 }
@@ -193,7 +197,7 @@ func (me *Engine) GenerateAckQuery(name string, ids []string) (string, map[strin
 	defer me.mu.Unlock()
 	mm := me.managers[name]
 	if mm == nil {
-		return "", nil, vterrors.Errorf(vtrpcpb.Code_NOT_FOUND, "message table %s not found in schema", name)
+		return "", nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "message table %s not found in schema", name)
 	}
 	query, bv := mm.GenerateAckQuery(ids)
 	return query, bv, nil
@@ -205,7 +209,7 @@ func (me *Engine) GeneratePostponeQuery(name string, ids []string) (string, map[
 	defer me.mu.Unlock()
 	mm := me.managers[name]
 	if mm == nil {
-		return "", nil, vterrors.Errorf(vtrpcpb.Code_NOT_FOUND, "message table %s not found in schema", name)
+		return "", nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "message table %s not found in schema", name)
 	}
 	query, bv := mm.GeneratePostponeQuery(ids)
 	return query, bv, nil
@@ -217,7 +221,7 @@ func (me *Engine) GeneratePurgeQuery(name string, timeCutoff int64) (string, map
 	defer me.mu.Unlock()
 	mm := me.managers[name]
 	if mm == nil {
-		return "", nil, vterrors.Errorf(vtrpcpb.Code_NOT_FOUND, "message table %s not found in schema", name)
+		return "", nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "message table %s not found in schema", name)
 	}
 	query, bv := mm.GeneratePurgeQuery(timeCutoff)
 	return query, bv, nil
@@ -236,7 +240,7 @@ func (me *Engine) schemaChanged(tables map[string]*schema.Table, created, altere
 			log.Errorf("Newly created table alread exists in messages: %s", name)
 			continue
 		}
-		mm := newMessageManager(me.tsv, t, me.conns)
+		mm := newMessageManager(me.tsv, t, me.conns, me.postponeSema)
 		me.managers[name] = mm
 		mm.Open()
 	}
diff --git a/go/vt/vttablet/tabletserver/messager/engine_test.go b/go/vt/vttablet/tabletserver/messager/engine_test.go
index 65ff652878d..a01599a0256 100644
--- a/go/vt/vttablet/tabletserver/messager/engine_test.go
+++ b/go/vt/vttablet/tabletserver/messager/engine_test.go
@@ -24,11 +24,15 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"github.com/youtube/vitess/go/mysql/fakesqldb"
 	"github.com/youtube/vitess/go/sqltypes"
 	"github.com/youtube/vitess/go/sync2"
 	"github.com/youtube/vitess/go/vt/dbconfigs"
+	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
 	"github.com/youtube/vitess/go/vt/sqlparser"
+	"github.com/youtube/vitess/go/vt/vterrors"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/schema"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/tabletenv"
 )
@@ -96,7 +100,6 @@ func TestSubscribe(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	engine := newTestEngine(db)
-	defer engine.Close()
 	tables := map[string]*schema.Table{
 		"t1": meTable,
 		"t2": meTable,
@@ -105,9 +108,9 @@ func TestSubscribe(t *testing.T) {
 	f1, ch1 := newEngineReceiver()
 	f2, ch2 := newEngineReceiver()
 	// Each receiver is subscribed to different managers.
-	engine.Subscribe("t1", f1)
+	engine.Subscribe(context.Background(), "t1", f1)
 	<-ch1
-	engine.Subscribe("t2", f2)
+	engine.Subscribe(context.Background(), "t2", f2)
 	<-ch2
 	engine.managers["t1"].Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("1")}})
 	engine.managers["t2"].Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("2")}})
@@ -116,10 +119,17 @@ func TestSubscribe(t *testing.T) {
 
 	// Error case.
 	want := "message table t3 not found"
-	_, err := engine.Subscribe("t3", f1)
+	_, err := engine.Subscribe(context.Background(), "t3", f1)
 	if err == nil || err.Error() != want {
 		t.Errorf("Subscribe: %v, want %s", err, want)
 	}
+
+	// After close, Subscribe should return a closed channel.
+	engine.Close()
+	_, err = engine.Subscribe(context.Background(), "t1", nil)
+	if got, want := vterrors.Code(err), vtrpcpb.Code_UNAVAILABLE; got != want {
+		t.Errorf("Subscribed on closed engine error code: %v, want %v", got, want)
+	}
 }
 
 func TestLockDB(t *testing.T) {
@@ -133,7 +143,7 @@ func TestLockDB(t *testing.T) {
 	}
 	engine.schemaChanged(tables, []string{"t1", "t2"}, nil, nil)
 	f1, ch1 := newEngineReceiver()
-	engine.Subscribe("t1", f1)
+	engine.Subscribe(context.Background(), "t1", f1)
 	<-ch1
 
 	row1 := &MessageRow{
@@ -158,7 +168,7 @@ func TestLockDB(t *testing.T) {
 
 	ch2 := make(chan *sqltypes.Result)
 	var count sync2.AtomicInt64
-	engine.Subscribe("t2", func(qr *sqltypes.Result) error {
+	engine.Subscribe(context.Background(), "t2", func(qr *sqltypes.Result) error {
 		count.Add(1)
 		ch2 <- qr
 		return nil
@@ -207,7 +217,7 @@ func TestGenerateLoadMessagesQuery(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	want := "select time_next, epoch, id, time_scheduled, message from t1 where :#pk"
+	want := "select time_next, epoch, time_created, id, time_scheduled, message from t1 where :#pk"
 	if q.Query != want {
 		t.Errorf("GenerateLoadMessagesQuery: %s, want %s", q.Query, want)
 	}
diff --git a/go/vt/vttablet/tabletserver/messager/message_manager.go b/go/vt/vttablet/tabletserver/messager/message_manager.go
index 6b1d96c6c79..027c050e92a 100644
--- a/go/vt/vttablet/tabletserver/messager/message_manager.go
+++ b/go/vt/vttablet/tabletserver/messager/message_manager.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/youtube/vitess/go/sqltypes"
 	"github.com/youtube/vitess/go/stats"
+	"github.com/youtube/vitess/go/sync2"
 	"github.com/youtube/vitess/go/timer"
 	"github.com/youtube/vitess/go/vt/sqlparser"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/connpool"
@@ -38,44 +39,44 @@ import (
 // MessageStats tracks stats for messages.
 var MessageStats = stats.NewMultiCounters("Messages", []string{"TableName", "Metric"})
 
+// MessageDelayTimings records total latency from queueing to sent to clients.
+var MessageDelayTimings = stats.NewMultiTimings("MessageDelay", []string{"TableName"})
+
 type messageReceiver struct {
-	mu   sync.Mutex
-	send func(*sqltypes.Result) error
-	done chan struct{}
+	ctx     context.Context
+	errChan chan error
+	send    func(*sqltypes.Result) error
+	cancel  context.CancelFunc
 }
 
-func newMessageReceiver(send func(*sqltypes.Result) error) (*messageReceiver, chan struct{}) {
+func newMessageReceiver(ctx context.Context, send func(*sqltypes.Result) error) (*messageReceiver, <-chan struct{}) {
+	ctx, cancel := context.WithCancel(ctx)
 	rcv := &messageReceiver{
-		send: send,
-		done: make(chan struct{}),
+		ctx:     ctx,
+		errChan: make(chan error, 1),
+		send:    send,
+		cancel:  cancel,
 	}
-	return rcv, rcv.done
+	return rcv, ctx.Done()
 }
 
 func (rcv *messageReceiver) Send(qr *sqltypes.Result) error {
-	rcv.mu.Lock()
-	defer rcv.mu.Unlock()
-	if rcv.done == nil {
-		return io.EOF
-	}
-	err := rcv.send(qr)
-	if err == io.EOF {
-		close(rcv.done)
-		rcv.done = nil
-	}
-	return err
-}
-
-func (rcv *messageReceiver) Cancel() {
-	// Do this async to avoid getting stuck.
+	// We have to use a channel so we can also
+	// monitor the context.
 	go func() {
-		rcv.mu.Lock()
-		defer rcv.mu.Unlock()
-		if rcv.done != nil {
-			close(rcv.done)
-			rcv.done = nil
-		}
+		rcv.errChan <- rcv.send(qr)
 	}()
+	select {
+	case <-rcv.ctx.Done():
+		return io.EOF
+	case err := <-rcv.errChan:
+		if err == io.EOF {
+			// This is only a failsafe. If we received an EOF,
+			// grpc would have already canceled the context.
+			rcv.cancel()
+		}
+		return err
+	}
 }
 
 // receiverWithStatus is a separate struct to signify
@@ -93,14 +94,15 @@ type messageManager struct {
 
 	isOpen bool
 
-	name        sqlparser.TableIdent
-	fieldResult *sqltypes.Result
-	ackWaitTime time.Duration
-	purgeAfter  time.Duration
-	batchSize   int
-	pollerTicks *timer.Timer
-	purgeTicks  *timer.Timer
-	conns       *connpool.Pool
+	name         sqlparser.TableIdent
+	fieldResult  *sqltypes.Result
+	ackWaitTime  time.Duration
+	purgeAfter   time.Duration
+	batchSize    int
+	pollerTicks  *timer.Timer
+	purgeTicks   *timer.Timer
+	conns        *connpool.Pool
+	postponeSema *sync2.Semaphore
 
 	mu sync.Mutex
 	// cond gets triggered if a receiver becomes available (curReceiver != -1),
@@ -128,29 +130,30 @@ type messageManager struct {
 // newMessageManager creates a new message manager.
 // Calls into tsv have to be made asynchronously. Otherwise,
 // it can lead to deadlocks.
-func newMessageManager(tsv TabletService, table *schema.Table, conns *connpool.Pool) *messageManager {
+func newMessageManager(tsv TabletService, table *schema.Table, conns *connpool.Pool, postponeSema *sync2.Semaphore) *messageManager {
 	mm := &messageManager{
 		tsv:  tsv,
 		name: table.Name,
 		fieldResult: &sqltypes.Result{
 			Fields: table.MessageInfo.Fields,
 		},
-		ackWaitTime: table.MessageInfo.AckWaitDuration,
-		purgeAfter:  table.MessageInfo.PurgeAfterDuration,
-		batchSize:   table.MessageInfo.BatchSize,
-		cache:       newCache(table.MessageInfo.CacheSize),
-		pollerTicks: timer.NewTimer(table.MessageInfo.PollInterval),
-		purgeTicks:  timer.NewTimer(table.MessageInfo.PollInterval),
-		conns:       conns,
+		ackWaitTime:  table.MessageInfo.AckWaitDuration,
+		purgeAfter:   table.MessageInfo.PurgeAfterDuration,
+		batchSize:    table.MessageInfo.BatchSize,
+		cache:        newCache(table.MessageInfo.CacheSize),
+		pollerTicks:  timer.NewTimer(table.MessageInfo.PollInterval),
+		purgeTicks:   timer.NewTimer(table.MessageInfo.PollInterval),
+		conns:        conns,
+		postponeSema: postponeSema,
 	}
 	mm.cond.L = &mm.mu
 
 	columnList := buildSelectColumnList(table)
 	mm.readByTimeNext = sqlparser.BuildParsedQuery(
-		"select time_next, epoch, %s from %v where time_next < %a order by time_next desc limit %a",
+		"select time_next, epoch, time_created, %s from %v where time_next < %a order by time_next desc limit %a",
 		columnList, mm.name, ":time_next", ":max")
 	mm.loadMessagesQuery = sqlparser.BuildParsedQuery(
-		"select time_next, epoch, %s from %v where %a",
+		"select time_next, epoch, time_created, %s from %v where %a",
 		columnList, mm.name, ":#pk")
 	mm.ackQuery = sqlparser.BuildParsedQuery(
 		"update %v set time_acked = %a, time_next = null where id in %a and time_acked is null",
@@ -208,7 +211,7 @@ func (mm *messageManager) Close() {
 	}
 	mm.isOpen = false
 	for _, rcvr := range mm.receivers {
-		rcvr.receiver.Cancel()
+		rcvr.receiver.cancel()
 	}
 	mm.receivers = nil
 	mm.cache.Clear()
@@ -218,8 +221,13 @@ func (mm *messageManager) Close() {
 	mm.wg.Wait()
 }
 
-// Subscribe adds the receiver to the list of subsribers.
-func (mm *messageManager) Subscribe(receiver *messageReceiver) {
+// Subscribe registers the send function as a receiver of messages
+// and returns a 'done' channel that will be closed when the subscription
+// ends. There are many reaons for a subscription to end: a grpc context
+// cancel or timeout, or tabletserver shutdown, etc.
+func (mm *messageManager) Subscribe(ctx context.Context, send func(*sqltypes.Result) error) <-chan struct{} {
+	receiver, done := newMessageReceiver(ctx, send)
+	MessageStats.Add([]string{mm.name.String(), "ClientCount"}, 1)
 	mm.mu.Lock()
 	defer mm.mu.Unlock()
 	withStatus := &receiverWithStatus{
@@ -231,9 +239,17 @@ func (mm *messageManager) Subscribe(receiver *messageReceiver) {
 	// Send the message asynchronously.
 	mm.wg.Add(1)
 	go mm.send(withStatus, mm.fieldResult)
+
+	// Track the context and unsubscribe if it gets cancelled.
+	go func() {
+		<-done
+		mm.unsubscribe(receiver)
+	}()
+	return done
 }
 
 func (mm *messageManager) unsubscribe(receiver *messageReceiver) {
+	MessageStats.Add([]string{mm.name.String(), "ClientCount"}, -1)
 	mm.mu.Lock()
 	defer mm.mu.Unlock()
 	for i, rcv := range mm.receivers {
@@ -310,11 +326,13 @@ func (mm *messageManager) runSend() {
 				continue
 			}
 			lateCount := int64(0)
+			timingsKey := []string{mm.name.String()}
 			for i := 0; i < mm.batchSize; i++ {
 				if mr := mm.cache.Pop(); mr != nil {
 					if mr.Epoch >= 1 {
 						lateCount++
 					}
+					MessageDelayTimings.Record(timingsKey, time.Unix(0, mr.TimeCreated))
 					rows = append(rows, mr.Row)
 					continue
 				}
@@ -326,10 +344,17 @@ func (mm *messageManager) runSend() {
 			}
 			if mm.messagesPending {
 				// Trigger the poller to fetch more.
-				mm.pollerTicks.Trigger()
+				// Do this as a separate goroutine. Otherwise, this could cause
+				// the following deadlock:
+				// 1. runSend obtains a lock
+				// 2. Poller gets trigerred, and waits for lock.
+				// 3. runSend calls this function, but the trigger will hang because
+				// this function cannot return until poller returns.
+				go mm.pollerTicks.Trigger()
 			}
 			mm.cond.Wait()
 		}
+		MessageStats.Add([]string{mm.name.String(), "Sent"}, int64(len(rows)))
 		// If we're here, there is a current receiver, and messages
 		// to send. Reserve the receiver and find the next one.
 		receiver := mm.receivers[mm.curReceiver]
@@ -348,49 +373,64 @@ func (mm *messageManager) send(receiver *receiverWithStatus, qr *sqltypes.Result
 		tabletenv.LogError()
 		mm.wg.Done()
 	}()
+
+	ids := make([]string, len(qr.Rows))
+	for i, row := range qr.Rows {
+		ids[i] = row[0].ToString()
+	}
+
+	// This is the cleanup.
+	defer func() {
+		// Discard messages from cache only at the end. This will
+		// prevent them from being requeued while they're being postponed.
+		mm.cache.Discard(ids)
+
+		mm.mu.Lock()
+		defer mm.mu.Unlock()
+
+		receiver.busy = false
+		// Rescan if there were no previously available receivers
+		// because the current receiver became non-busy.
+		if mm.curReceiver == -1 {
+			mm.rescanReceivers(-1)
+		}
+	}()
+
 	if err := receiver.receiver.Send(qr); err != nil {
 		if err == io.EOF {
+			// If the receiver ended the stream, we want the messages
+			// to be resent ASAP without postponement. Setting messagesPending
+			// will trigger the poller as soon as the cache is clear.
+			mm.mu.Lock()
+			mm.messagesPending = true
+			mm.mu.Unlock()
 			// No need to call Cancel. messageReceiver already
 			// does that before returning this error.
 			mm.unsubscribe(receiver.receiver)
 		} else {
 			log.Errorf("Error sending messages: %v", qr)
 		}
-	}
-	mm.mu.Lock()
-	receiver.busy = false
-	if mm.curReceiver == -1 {
-		// Since the current receiver became non-busy,
-		// rescan.
-		mm.rescanReceivers(-1)
-	}
-	mm.mu.Unlock()
-	if len(qr.Rows) == 0 {
-		// It was just a Fields send.
 		return
 	}
-	ids := make([]string, len(qr.Rows))
-	for i, row := range qr.Rows {
-		ids[i] = row[0].ToString()
-	}
-	// postpone should discard, but this is a safety measure
-	// in case it fails.
-	mm.cache.Discard(ids)
-	go postpone(mm.tsv, mm.name.String(), mm.ackWaitTime, ids)
+	mm.postpone(mm.tsv, mm.name.String(), mm.ackWaitTime, ids)
 }
 
-// postpone is a non-member because it should be called asynchronously and should
-// not rely on members of messageManager.
-func postpone(tsv TabletService, name string, ackWaitTime time.Duration, ids []string) {
+func (mm *messageManager) postpone(tsv TabletService, name string, ackWaitTime time.Duration, ids []string) {
+	// ids can be empty if it's the field info being sent.
+	if len(ids) == 0 {
+		return
+	}
+	// Use the semaphore to limit parallelism.
+	if !mm.postponeSema.Acquire() {
+		// Unreachable.
+		return
+	}
+	defer mm.postponeSema.Release()
 	ctx, cancel := context.WithTimeout(tabletenv.LocalContext(), ackWaitTime)
-	defer func() {
-		tabletenv.LogError()
-		cancel()
-	}()
-	_, err := tsv.PostponeMessages(ctx, nil, name, ids)
-	if err != nil {
-		tabletenv.InternalErrors.Add("Messages", 1)
-		log.Errorf("Unable to postpone messages %v: %v", ids, err)
+	defer cancel()
+	if _, err := tsv.PostponeMessages(ctx, nil, name, ids); err != nil {
+		// This can happen during spikes. Record the incident for monitoring.
+		MessageStats.Add([]string{mm.name.String(), "PostponeFailed"}, 1)
 	}
 }
 
@@ -538,10 +578,15 @@ func BuildMessageRow(row []sqltypes.Value) (*MessageRow, error) {
 	if err != nil {
 		return nil, err
 	}
+	timeCreated, err := sqltypes.ToInt64(row[2])
+	if err != nil {
+		return nil, err
+	}
 	return &MessageRow{
-		TimeNext: timeNext,
-		Epoch:    epoch,
-		Row:      row[2:],
+		TimeNext:    timeNext,
+		Epoch:       epoch,
+		TimeCreated: timeCreated,
+		Row:         row[3:],
 	}, nil
 }
 
diff --git a/go/vt/vttablet/tabletserver/messager/message_manager_test.go b/go/vt/vttablet/tabletserver/messager/message_manager_test.go
index fbbbeb74733..e286bf12a9a 100644
--- a/go/vt/vttablet/tabletserver/messager/message_manager_test.go
+++ b/go/vt/vttablet/tabletserver/messager/message_manager_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package messager
 
 import (
-	"io"
 	"reflect"
 	"runtime"
 	"testing"
@@ -71,8 +70,7 @@ func newMMTable() *schema.Table {
 }
 
 type testReceiver struct {
-	rcv   *messageReceiver
-	done  chan struct{}
+	rcv   func(*sqltypes.Result) error
 	count sync2.AtomicInt64
 	ch    chan *sqltypes.Result
 }
@@ -81,20 +79,11 @@ func newTestReceiver(size int) *testReceiver {
 	tr := &testReceiver{
 		ch: make(chan *sqltypes.Result, size),
 	}
-	tr.rcv, tr.done = newMessageReceiver(func(qr *sqltypes.Result) error {
-		select {
-		case <-tr.done:
-			return io.EOF
-		default:
-		}
+	tr.rcv = func(qr *sqltypes.Result) error {
 		tr.count.Add(1)
-		select {
-		case tr.ch <- qr:
-		case <-time.After(20 * time.Second):
-			panic("test may be hung")
-		}
+		tr.ch <- qr
 		return nil
-	})
+	}
 	return tr
 }
 
@@ -108,28 +97,16 @@ func (tr *testReceiver) WaitForCount(n int) {
 	}
 }
 
-func (tr *testReceiver) WaitForDone() {
-	for {
-		runtime.Gosched()
-		time.Sleep(10 * time.Millisecond)
-		select {
-		case <-tr.done:
-			return
-		default:
-		}
-	}
-}
-
-func TestReceiverEOF(t *testing.T) {
+func TestReceiverCancel(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
-	mm := newMessageManager(newFakeTabletServer(), mmTable, newMMConnPool(db))
+	mm := newMessageManager(newFakeTabletServer(), mmTable, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 	r1 := newTestReceiver(0)
-	r1.done = make(chan struct{})
-	mm.Subscribe(r1.rcv)
-	close(r1.done)
+	ctx, cancel := context.WithCancel(context.Background())
+	_ = mm.Subscribe(ctx, r1.rcv)
+	cancel()
 	// r1 should eventually be unsubscribed.
 	for i := 0; i < 10; i++ {
 		runtime.Gosched()
@@ -148,7 +125,7 @@ func TestReceiverEOF(t *testing.T) {
 func TestMessageManagerState(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
-	mm := newMessageManager(newFakeTabletServer(), mmTable, newMMConnPool(db))
+	mm := newMessageManager(newFakeTabletServer(), mmTable, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	// Do it twice
 	for i := 0; i < 2; i++ {
 		mm.Open()
@@ -165,7 +142,7 @@ func TestMessageManagerState(t *testing.T) {
 	for i := 0; i < 2; i++ {
 		mm.Open()
 		r1 := newTestReceiver(1)
-		mm.Subscribe(r1.rcv)
+		mm.Subscribe(context.Background(), r1.rcv)
 		// This time the wait is in a different code path.
 		runtime.Gosched()
 		mm.Close()
@@ -177,7 +154,7 @@ func TestMessageManagerAdd(t *testing.T) {
 	defer db.Close()
 	ti := newMMTable()
 	ti.MessageInfo.CacheSize = 1
-	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db))
+	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 
@@ -189,7 +166,7 @@ func TestMessageManagerAdd(t *testing.T) {
 	}
 
 	r1 := newTestReceiver(0)
-	mm.Subscribe(r1.rcv)
+	mm.Subscribe(context.Background(), r1.rcv)
 	<-r1.ch
 	if !mm.Add(row1) {
 		t.Error("Add(1 receiver): false, want true")
@@ -203,22 +180,17 @@ func TestMessageManagerAdd(t *testing.T) {
 	if mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("3")}}) {
 		t.Error("Add(cache full): true, want false")
 	}
-	// Drain the receiver to prevent hangs.
-	go func() {
-		for range r1.ch {
-		}
-	}()
 }
 
 func TestMessageManagerSend(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	tsv := newFakeTabletServer()
-	mm := newMessageManager(tsv, mmTable, newMMConnPool(db))
+	mm := newMessageManager(tsv, mmTable, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 	r1 := newTestReceiver(1)
-	mm.Subscribe(r1.rcv)
+	mm.Subscribe(context.Background(), r1.rcv)
 	want := &sqltypes.Result{
 		Fields: testFields,
 	}
@@ -241,8 +213,8 @@ func TestMessageManagerSend(t *testing.T) {
 	}
 
 	// Ensure Postpone got called.
-	if got := <-ch; got != mmTable.Name.String() {
-		t.Errorf("Postpone: %s, want %v", got, mmTable.Name)
+	if got, want := <-ch, "postpone"; got != want {
+		t.Errorf("Postpone: %s, want %v", got, want)
 	}
 
 	// Verify item has been removed from cache.
@@ -250,24 +222,124 @@ func TestMessageManagerSend(t *testing.T) {
 		t.Error("Message 1 is still present in cache")
 	}
 
+	// Test that mm stops sending to a canceled receiver.
 	r2 := newTestReceiver(1)
-	mm.Subscribe(r2.rcv)
+	ctx, cancel := context.WithCancel(context.Background())
+	mm.Subscribe(ctx, r2.rcv)
 	<-r2.ch
 	mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("2")}})
 	mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("3")}})
 	// Send should be round-robin.
 	<-r1.ch
 	<-r2.ch
-	r2.rcv.Cancel()
-	r2.WaitForDone()
-	// One of these messages will fail to send
-	// because r1 will return EOF.
+
+	// Cancel and wait for it to take effect.
+	cancel()
+	for i := 0; i < 10; i++ {
+		runtime.Gosched()
+		time.Sleep(10 * time.Millisecond)
+		mm.mu.Lock()
+		if len(mm.receivers) != 1 {
+			mm.mu.Unlock()
+			continue
+		}
+		mm.mu.Unlock()
+		break
+	}
+
 	mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("4")}})
 	mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("5")}})
 	mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("6")}})
 	// Only r1 should be receiving.
 	<-r1.ch
 	<-r1.ch
+	<-r1.ch
+}
+
+func TestMessageManagerPostponeThrottle(t *testing.T) {
+	db := fakesqldb.New(t)
+	defer db.Close()
+	tsv := newFakeTabletServer()
+	mm := newMessageManager(tsv, mmTable, newMMConnPool(db), sync2.NewSemaphore(1, 0))
+	mm.Open()
+	defer mm.Close()
+	r1 := newTestReceiver(1)
+	mm.Subscribe(context.Background(), r1.rcv)
+	<-r1.ch
+
+	// Set the channel to verify call to Postpone.
+	ch := make(chan string)
+	tsv.SetChannel(ch)
+	tsv.postponeCount.Set(0)
+
+	mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("1"), sqltypes.NULL}})
+	// Once we receive, mm will obtain the single semaphore and call postpone.
+	// Postpone will wait on the unbuffered ch.
+	<-r1.ch
+
+	// Set up a second subsriber, add a message.
+	r2 := newTestReceiver(1)
+	mm.Subscribe(context.Background(), r2.rcv)
+	<-r2.ch
+
+	// Wait.
+	for i := 0; i < 2; i++ {
+		runtime.Gosched()
+		time.Sleep(10 * time.Millisecond)
+	}
+	// postponeCount should be 1. Verify for two iterations.
+	if got, want := tsv.postponeCount.Get(), int64(1); got != want {
+		t.Errorf("tsv.postponeCount: %d, want %d", got, want)
+	}
+
+	// Receive on this channel will allow the next postpone to go through.
+	<-ch
+	// Wait.
+	for i := 0; i < 2; i++ {
+		runtime.Gosched()
+		time.Sleep(10 * time.Millisecond)
+	}
+	if got, want := tsv.postponeCount.Get(), int64(1); got != want {
+		t.Errorf("tsv.postponeCount: %d, want %d", got, want)
+	}
+	<-ch
+}
+
+func TestMessageManagerSendEOF(t *testing.T) {
+	db := fakesqldb.New(t)
+	defer db.Close()
+	tsv := newFakeTabletServer()
+	mm := newMessageManager(tsv, mmTable, newMMConnPool(db), sync2.NewSemaphore(1, 0))
+	mm.Open()
+	defer mm.Close()
+	r1 := newTestReceiver(0)
+	ctx, cancel := context.WithCancel(context.Background())
+	mm.Subscribe(ctx, r1.rcv)
+	// Pull field info.
+	<-r1.ch
+
+	mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("1"), sqltypes.NULL}})
+	// Wait for send to enqueue
+	r1.WaitForCount(2)
+
+	// Now cancel, which will send an EOF to the sender.
+	cancel()
+	// messagesPending should get turned on.
+	messagesWerePending := false
+	for i := 0; i < 10; i++ {
+		runtime.Gosched()
+		mm.mu.Lock()
+		if mm.messagesPending {
+			messagesWerePending = true
+			mm.mu.Unlock()
+			break
+		}
+		mm.mu.Unlock()
+		time.Sleep(10 * time.Millisecond)
+	}
+	if !messagesWerePending {
+		t.Error("Send with EOF did not trigger pending messages")
+	}
 }
 
 func TestMessageManagerBatchSend(t *testing.T) {
@@ -275,11 +347,11 @@ func TestMessageManagerBatchSend(t *testing.T) {
 	defer db.Close()
 	ti := newMMTable()
 	ti.MessageInfo.BatchSize = 2
-	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db))
+	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 	r1 := newTestReceiver(1)
-	mm.Subscribe(r1.rcv)
+	mm.Subscribe(context.Background(), r1.rcv)
 	<-r1.ch
 	row1 := &MessageRow{
 		Row: []sqltypes.Value{sqltypes.NewVarBinary("1"), sqltypes.NULL},
@@ -317,30 +389,34 @@ func TestMessageManagerPoller(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	db.AddQueryPattern(
-		"select time_next, epoch, id, time_scheduled, message from foo.*",
+		"select time_next, epoch, time_created, id, time_scheduled, message from foo.*",
 		&sqltypes.Result{
 			Fields: []*querypb.Field{
 				{Type: sqltypes.Int64},
 				{Type: sqltypes.Int64},
 				{Type: sqltypes.Int64},
 				{Type: sqltypes.Int64},
+				{Type: sqltypes.Int64},
 				{Type: sqltypes.VarBinary},
 			},
 			Rows: [][]sqltypes.Value{{
 				sqltypes.NewInt64(1),
 				sqltypes.NewInt64(0),
+				sqltypes.NewInt64(0),
 				sqltypes.NewInt64(1),
 				sqltypes.NewInt64(10),
 				sqltypes.NewVarBinary("01"),
 			}, {
 				sqltypes.NewInt64(2),
 				sqltypes.NewInt64(0),
+				sqltypes.NewInt64(1),
 				sqltypes.NewInt64(2),
 				sqltypes.NewInt64(20),
 				sqltypes.NewVarBinary("02"),
 			}, {
 				sqltypes.NewInt64(1),
 				sqltypes.NewInt64(1),
+				sqltypes.NewInt64(0),
 				sqltypes.NewInt64(3),
 				sqltypes.NewInt64(30),
 				sqltypes.NewVarBinary("11"),
@@ -350,11 +426,12 @@ func TestMessageManagerPoller(t *testing.T) {
 	ti := newMMTable()
 	ti.MessageInfo.BatchSize = 2
 	ti.MessageInfo.PollInterval = 20 * time.Second
-	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db))
+	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 	r1 := newTestReceiver(1)
-	mm.Subscribe(r1.rcv)
+	ctx, cancel := context.WithCancel(context.Background())
+	mm.Subscribe(ctx, r1.rcv)
 	<-r1.ch
 	mm.pollerTicks.Trigger()
 	want := [][]sqltypes.Value{{
@@ -381,8 +458,7 @@ func TestMessageManagerPoller(t *testing.T) {
 	}
 
 	// If there are no receivers, nothing should fire.
-	r1.rcv.Cancel()
-	r1.WaitForDone()
+	cancel()
 	mm.pollerTicks.Trigger()
 	runtime.Gosched()
 	select {
@@ -398,7 +474,7 @@ func TestMessagesPending1(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	db.AddQueryPattern(
-		"select time_next, epoch, id, time_scheduled, message from foo.*",
+		"select time_next, epoch, time_created, id, time_scheduled, message from foo.*",
 		&sqltypes.Result{
 			Fields: []*querypb.Field{
 				{Type: sqltypes.Int64},
@@ -420,11 +496,11 @@ func TestMessagesPending1(t *testing.T) {
 	ti := newMMTable()
 	ti.MessageInfo.CacheSize = 2
 	ti.MessageInfo.PollInterval = 30 * time.Second
-	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db))
+	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 	r1 := newTestReceiver(0)
-	mm.Subscribe(r1.rcv)
+	mm.Subscribe(context.Background(), r1.rcv)
 	<-r1.ch
 
 	mm.Add(&MessageRow{Row: []sqltypes.Value{sqltypes.NewVarBinary("1")}})
@@ -465,7 +541,7 @@ func TestMessagesPending2(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	db.AddQueryPattern(
-		"select time_next, epoch, id, time_scheduled, message from foo.*",
+		"select time_next, epoch, time_created, id, time_scheduled, message from foo.*",
 		&sqltypes.Result{
 			Fields: []*querypb.Field{
 				{Type: sqltypes.Int64},
@@ -487,11 +563,11 @@ func TestMessagesPending2(t *testing.T) {
 	ti := newMMTable()
 	ti.MessageInfo.CacheSize = 1
 	ti.MessageInfo.PollInterval = 30 * time.Second
-	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db))
+	mm := newMessageManager(newFakeTabletServer(), ti, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 	r1 := newTestReceiver(0)
-	mm.Subscribe(r1.rcv)
+	mm.Subscribe(context.Background(), r1.rcv)
 	<-r1.ch
 
 	// Trigger the poller.
@@ -506,12 +582,6 @@ func TestMessagesPending2(t *testing.T) {
 	if d := time.Now().Sub(start); d > 15*time.Second {
 		t.Errorf("pending work trigger did not happen. Duration: %v", d)
 	}
-	// Consume the rest of the messages asynchronously to
-	// prevent hangs.
-	go func() {
-		for range r1.ch {
-		}
-	}()
 }
 
 func TestMessageManagerPurge(t *testing.T) {
@@ -525,19 +595,19 @@ func TestMessageManagerPurge(t *testing.T) {
 
 	ti := newMMTable()
 	ti.MessageInfo.PollInterval = 1 * time.Millisecond
-	mm := newMessageManager(tsv, ti, newMMConnPool(db))
+	mm := newMessageManager(tsv, ti, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 	// Ensure Purge got called.
-	if got := <-ch; got != mmTable.Name.String() {
-		t.Errorf("Postpone: %s, want %v", got, mmTable.Name)
+	if got, want := <-ch, "purge"; got != want {
+		t.Errorf("Purge: %s, want %v", got, want)
 	}
 }
 
 func TestMMGenerate(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
-	mm := newMessageManager(newFakeTabletServer(), mmTable, newMMConnPool(db))
+	mm := newMessageManager(newFakeTabletServer(), mmTable, newMMConnPool(db), sync2.NewSemaphore(1, 0))
 	mm.Open()
 	defer mm.Close()
 	query, bv := mm.GenerateAckQuery([]string{"1", "2"})
@@ -590,7 +660,9 @@ func TestMMGenerate(t *testing.T) {
 }
 
 type fakeTabletServer struct {
-	ch chan string
+	postponeCount sync2.AtomicInt64
+	purgeCount    sync2.AtomicInt64
+	ch            chan string
 }
 
 func newFakeTabletServer() *fakeTabletServer { return &fakeTabletServer{} }
@@ -602,15 +674,17 @@ func (fts *fakeTabletServer) SetChannel(ch chan string) {
 }
 
 func (fts *fakeTabletServer) PostponeMessages(ctx context.Context, target *querypb.Target, name string, ids []string) (count int64, err error) {
+	fts.postponeCount.Add(1)
 	if fts.ch != nil {
-		fts.ch <- name
+		fts.ch <- "postpone"
 	}
 	return 0, nil
 }
 
 func (fts *fakeTabletServer) PurgeMessages(ctx context.Context, target *querypb.Target, name string, timeCutoff int64) (count int64, err error) {
+	fts.purgeCount.Add(1)
 	if fts.ch != nil {
-		fts.ch <- name
+		fts.ch <- "purge"
 	}
 	return 0, nil
 }
diff --git a/go/vt/vttablet/tabletserver/planbuilder/dml.go b/go/vt/vttablet/tabletserver/planbuilder/dml.go
index b34c91fe4f3..d639785bcd8 100644
--- a/go/vt/vttablet/tabletserver/planbuilder/dml.go
+++ b/go/vt/vttablet/tabletserver/planbuilder/dml.go
@@ -17,13 +17,12 @@ limitations under the License.
 package planbuilder
 
 import (
-	"errors"
-	"fmt"
-
 	log "github.com/golang/glog"
 
 	"github.com/youtube/vitess/go/sqltypes"
+	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
 	"github.com/youtube/vitess/go/vt/sqlparser"
+	"github.com/youtube/vitess/go/vt/vterrors"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/schema"
 )
 
@@ -186,7 +185,7 @@ func analyzeSelect(sel *sqlparser.Select, tables map[string]*schema.Table) (plan
 	// Check if it's a NEXT VALUE statement.
 	if nextVal, ok := sel.SelectExprs[0].(sqlparser.Nextval); ok {
 		if table.Type != schema.Sequence {
-			return nil, fmt.Errorf("%s is not a sequence", tableName)
+			return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%s is not a sequence", tableName)
 		}
 		plan.PlanID = PlanNextval
 		v, err := sqlparser.NewPlanValue(nextVal.Expr)
@@ -338,7 +337,7 @@ func analyzeInsertNoType(ins *sqlparser.Insert, plan *Plan, table *schema.Table)
 		for _, col := range ins.Columns {
 			colIndex := table.FindColumn(col)
 			if colIndex == -1 {
-				return nil, fmt.Errorf("column %v not found in table %s", col, table.Name)
+				return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "column %v not found in table %s", col, table.Name)
 			}
 			plan.ColumnNumbers = append(plan.ColumnNumbers, colIndex)
 		}
@@ -348,9 +347,19 @@ func analyzeInsertNoType(ins *sqlparser.Insert, plan *Plan, table *schema.Table)
 
 	// If it's not a sqlparser.SelectStatement, it's Values.
 	rowList := ins.Rows.(sqlparser.Values)
-	for _, row := range rowList {
-		if len(row) != len(ins.Columns) {
-			return nil, errors.New("column count doesn't match value count")
+	for i := range rowList {
+		if len(rowList[i]) == 0 {
+			for _, col := range table.Columns {
+				expr, err := sqlparser.ExprFromValue(col.Default)
+				if err != nil {
+					return nil, vterrors.Wrap(err, "could not create default row for insert without row values")
+				}
+				rowList[i] = append(rowList[i], expr)
+			}
+			continue
+		}
+		if len(rowList[i]) != len(ins.Columns) {
+			return nil, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "column count doesn't match value count")
 		}
 	}
 	plan.PKValues = getInsertPKValues(pkColumnNumbers, rowList, table)
@@ -406,7 +415,7 @@ func analyzeInsertNoType(ins *sqlparser.Insert, plan *Plan, table *schema.Table)
 		if node, ok := node.(*sqlparser.ValuesFuncExpr); ok {
 			colnum := ins.Columns.FindColumn(node.Name)
 			if colnum == -1 {
-				formatErr = fmt.Errorf("could not find column %v", node.Name)
+				formatErr = vterrors.Errorf(vtrpcpb.Code_NOT_FOUND, "could not find column %v", node.Name)
 				return
 			}
 			buf.Myprintf("(%v)", rowList[0][colnum])
@@ -422,20 +431,20 @@ func analyzeInsertNoType(ins *sqlparser.Insert, plan *Plan, table *schema.Table)
 
 func analyzeInsertMessage(ins *sqlparser.Insert, plan *Plan, table *schema.Table) (*Plan, error) {
 	if _, ok := ins.Rows.(sqlparser.SelectStatement); ok {
-		return nil, fmt.Errorf("subquery not allowed for message table: %s", table.Name.String())
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "subquery not allowed for message table: %s", table.Name.String())
 	}
 	if ins.OnDup != nil {
-		return nil, fmt.Errorf("'on duplicate key' construct not allowed for message table: %s", table.Name.String())
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "'on duplicate key' construct not allowed for message table: %s", table.Name.String())
 	}
 	if len(ins.Columns) == 0 {
-		return nil, fmt.Errorf("column list must be specified for message table insert: %s", table.Name.String())
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "column list must be specified for message table insert: %s", table.Name.String())
 	}
 
 	// Sanity check first so we don't have to repeat this.
 	rowList := ins.Rows.(sqlparser.Values)
 	for _, row := range rowList {
 		if len(row) != len(ins.Columns) {
-			return nil, errors.New("column count doesn't match value count")
+			return nil, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "column count doesn't match value count")
 		}
 	}
 
@@ -453,34 +462,34 @@ func analyzeInsertMessage(ins *sqlparser.Insert, plan *Plan, table *schema.Table
 	col = sqlparser.NewColIdent("time_next")
 	num := ins.Columns.FindColumn(col)
 	if num != -1 {
-		return nil, fmt.Errorf("%s must not be specified for message insert", col.String())
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%s must not be specified for message insert", col.String())
 	}
 	_ = copyVal(ins, col, scheduleIndex)
 
 	// time_created should always be now.
 	col = sqlparser.NewColIdent("time_created")
 	if num := ins.Columns.FindColumn(col); num >= 0 {
-		return nil, fmt.Errorf("%s must not be specified for message insert", col.String())
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%s must not be specified for message insert", col.String())
 	}
 	_ = addVal(ins, col, timeNow)
 
 	// epoch should always be 0.
 	col = sqlparser.NewColIdent("epoch")
 	if num := ins.Columns.FindColumn(col); num >= 0 {
-		return nil, fmt.Errorf("%s must not be specified for message insert", col.String())
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%s must not be specified for message insert", col.String())
 	}
 	_ = addVal(ins, col, sqlparser.NewIntVal([]byte("0")))
 
 	// time_acked should must not be specified.
 	col = sqlparser.NewColIdent("time_acked")
 	if num := ins.Columns.FindColumn(col); num >= 0 {
-		return nil, fmt.Errorf("%s must not be specified for message insert", col.String())
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%s must not be specified for message insert", col.String())
 	}
 
 	col = sqlparser.NewColIdent("id")
 	num = ins.Columns.FindColumn(col)
 	if num < 0 {
-		return nil, fmt.Errorf("%s must be specified for message insert", col.String())
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%s must be specified for message insert", col.String())
 	}
 
 	pkColumnNumbers := getInsertPKColumns(ins.Columns, table)
diff --git a/go/vt/vttablet/tabletserver/planbuilder/plan.go b/go/vt/vttablet/tabletserver/planbuilder/plan.go
index 065e60dda9b..d76326d92d3 100644
--- a/go/vt/vttablet/tabletserver/planbuilder/plan.go
+++ b/go/vt/vttablet/tabletserver/planbuilder/plan.go
@@ -18,11 +18,10 @@ package planbuilder
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	"github.com/youtube/vitess/go/sqltypes"
-	"github.com/youtube/vitess/go/vt/proto/vtrpc"
+	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
 	"github.com/youtube/vitess/go/vt/sqlparser"
 	"github.com/youtube/vitess/go/vt/tableacl"
 	"github.com/youtube/vitess/go/vt/vterrors"
@@ -31,7 +30,7 @@ import (
 
 var (
 	// ErrTooComplex indicates given sql query is too complex.
-	ErrTooComplex = errors.New("Complex")
+	ErrTooComplex = vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "Complex")
 	execLimit     = &sqlparser.Limit{Rowcount: sqlparser.NewValArg([]byte(":#maxLimit"))}
 )
 
@@ -200,9 +199,10 @@ func (rt ReasonType) MarshalJSON() ([]byte, error) {
 
 // Plan is built for selects and DMLs.
 type Plan struct {
-	PlanID  PlanType
-	Reason  ReasonType
-	Table   *schema.Table
+	PlanID PlanType
+	Reason ReasonType
+	Table  *schema.Table
+	// NewName is the new name of the table. Set for DDLs which create or change the table.
 	NewName sqlparser.TableIdent
 
 	// FieldQuery is used to fetch field info
@@ -250,7 +250,7 @@ func (plan *Plan) TableName() sqlparser.TableIdent {
 
 func (plan *Plan) setTable(tableName sqlparser.TableIdent, tables map[string]*schema.Table) (*schema.Table, error) {
 	if plan.Table = tables[tableName.String()]; plan.Table == nil {
-		return nil, vterrors.Errorf(vtrpc.Code_NOT_FOUND, "table %s not found in schema", tableName)
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "table %s not found in schema", tableName)
 	}
 	return plan.Table, nil
 }
@@ -287,7 +287,8 @@ func Build(sql string, tables map[string]*schema.Table) (*Plan, error) {
 	case *sqlparser.OtherAdmin:
 		return &Plan{PlanID: PlanOtherAdmin}, nil
 	}
-	return nil, errors.New("invalid SQL")
+
+	return nil, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "invalid SQL")
 }
 
 // BuildStreaming builds a streaming plan based on the schema.
@@ -305,7 +306,7 @@ func BuildStreaming(sql string, tables map[string]*schema.Table) (*Plan, error)
 	switch stmt := statement.(type) {
 	case *sqlparser.Select:
 		if stmt.Lock != "" {
-			return nil, errors.New("select with lock not allowed for streaming")
+			return nil, vterrors.New(vtrpcpb.Code_FAILED_PRECONDITION, "select with lock not allowed for streaming")
 		}
 		if tableName := analyzeFrom(stmt.From); !tableName.IsEmpty() {
 			plan.setTable(tableName, tables)
@@ -313,7 +314,7 @@ func BuildStreaming(sql string, tables map[string]*schema.Table) (*Plan, error)
 	case *sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Union:
 		// pass
 	default:
-		return nil, fmt.Errorf("'%v' not allowed for streaming", sqlparser.String(stmt))
+		return nil, vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "'%v' not allowed for streaming", sqlparser.String(stmt))
 	}
 
 	return plan, nil
@@ -326,10 +327,10 @@ func BuildMessageStreaming(name string, tables map[string]*schema.Table) (*Plan,
 		Table:  tables[name],
 	}
 	if plan.Table == nil {
-		return nil, fmt.Errorf("table %s not found in schema", name)
+		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "table %s not found in schema", name)
 	}
 	if plan.Table.Type != schema.Message {
-		return nil, fmt.Errorf("'%s' is not a message table", name)
+		return nil, vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "'%s' is not a message table", name)
 	}
 	return plan, nil
 }
diff --git a/go/vt/vttablet/tabletserver/planbuilder/plan_test.go b/go/vt/vttablet/tabletserver/planbuilder/plan_test.go
index 6afe4ddfc4e..211cd3fed1f 100644
--- a/go/vt/vttablet/tabletserver/planbuilder/plan_test.go
+++ b/go/vt/vttablet/tabletserver/planbuilder/plan_test.go
@@ -219,7 +219,7 @@ func loadSchema(name string) map[string]*schema.Table {
 	if err != nil {
 		panic(err)
 	}
-	tables := make([]*schema.Table, 0, 8)
+	tables := make([]*schema.Table, 0, 10)
 	err = json.Unmarshal(b, &tables)
 	if err != nil {
 		panic(err)
diff --git a/go/vt/vttablet/tabletserver/query_engine.go b/go/vt/vttablet/tabletserver/query_engine.go
index 73a9450c071..2aace81c9bd 100644
--- a/go/vt/vttablet/tabletserver/query_engine.go
+++ b/go/vt/vttablet/tabletserver/query_engine.go
@@ -39,7 +39,6 @@ import (
 	"github.com/youtube/vitess/go/vt/sqlparser"
 	"github.com/youtube/vitess/go/vt/tableacl"
 	tacl "github.com/youtube/vitess/go/vt/tableacl/acl"
-	"github.com/youtube/vitess/go/vt/vterrors"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/connpool"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/planbuilder"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/rules"
@@ -48,7 +47,6 @@ import (
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/txserializer"
 
 	querypb "github.com/youtube/vitess/go/vt/proto/query"
-	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
 )
 
 //_______________________________________________
@@ -181,7 +179,9 @@ func NewQueryEngine(checker connpool.MySQLChecker, se *schema.Engine, config tab
 
 	qe.consolidator = sync2.NewConsolidator()
 	qe.txSerializer = txserializer.New(config.EnableHotRowProtectionDryRun,
-		config.HotRowProtectionMaxQueueSize, config.HotRowProtectionMaxGlobalQueueSize)
+		config.HotRowProtectionMaxQueueSize,
+		config.HotRowProtectionMaxGlobalQueueSize,
+		config.HotRowProtectionConcurrentTransactions)
 	qe.streamQList = NewQueryList()
 
 	qe.autoCommit.Set(config.EnableAutoCommit)
@@ -280,7 +280,7 @@ func (qe *QueryEngine) Close() {
 }
 
 // GetPlan returns the TabletPlan that for the query. Plans are cached in a cache.LRUCache.
-func (qe *QueryEngine) GetPlan(ctx context.Context, logStats *tabletenv.LogStats, sql string) (*TabletPlan, error) {
+func (qe *QueryEngine) GetPlan(ctx context.Context, logStats *tabletenv.LogStats, sql string, skipQueryPlanCache bool) (*TabletPlan, error) {
 	span := trace.NewSpanFromContext(ctx)
 	span.StartLocal("QueryEngine.GetPlan")
 	defer span.Finish()
@@ -299,8 +299,7 @@ func (qe *QueryEngine) GetPlan(ctx context.Context, logStats *tabletenv.LogStats
 	defer qe.mu.RUnlock()
 	splan, err := planbuilder.Build(sql, qe.tables)
 	if err != nil {
-		// TODO(sougou): Inspect to see if Build can return coded error.
-		return nil, vterrors.New(vtrpcpb.Code_UNKNOWN, err.Error())
+		return nil, err
 	}
 	plan := &TabletPlan{Plan: splan}
 	plan.Rules = qe.queryRuleSources.FilterByPlan(sql, plan.PlanID, plan.TableName().String())
@@ -327,7 +326,9 @@ func (qe *QueryEngine) GetPlan(ctx context.Context, logStats *tabletenv.LogStats
 	} else if plan.PlanID == planbuilder.PlanDDL || plan.PlanID == planbuilder.PlanSet {
 		return plan, nil
 	}
-	qe.queries.Set(sql, plan)
+	if !skipQueryPlanCache {
+		qe.queries.Set(sql, plan)
+	}
 	return plan, nil
 }
 
@@ -338,8 +339,7 @@ func (qe *QueryEngine) GetStreamPlan(sql string) (*TabletPlan, error) {
 	defer qe.mu.RUnlock()
 	splan, err := planbuilder.BuildStreaming(sql, qe.tables)
 	if err != nil {
-		// TODO(sougou): Inspect to see if BuildStreaming can return coded error.
-		return nil, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, err.Error())
+		return nil, err
 	}
 	plan := &TabletPlan{Plan: splan}
 	plan.Rules = qe.queryRuleSources.FilterByPlan(sql, plan.PlanID, plan.TableName().String())
@@ -353,8 +353,7 @@ func (qe *QueryEngine) GetMessageStreamPlan(name string) (*TabletPlan, error) {
 	defer qe.mu.RUnlock()
 	splan, err := planbuilder.BuildMessageStreaming(name, qe.tables)
 	if err != nil {
-		// TODO(sougou): Inspect to see if BuildMessageStreaming can return coded error.
-		return nil, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, err.Error())
+		return nil, err
 	}
 	plan := &TabletPlan{Plan: splan}
 	plan.Rules = qe.queryRuleSources.FilterByPlan("stream from "+name, plan.PlanID, plan.TableName().String())
diff --git a/go/vt/vttablet/tabletserver/query_engine_test.go b/go/vt/vttablet/tabletserver/query_engine_test.go
index 0c628326093..20ef702c144 100644
--- a/go/vt/vttablet/tabletserver/query_engine_test.go
+++ b/go/vt/vttablet/tabletserver/query_engine_test.go
@@ -95,7 +95,7 @@ func TestGetPlanPanicDuetoEmptyQuery(t *testing.T) {
 
 	ctx := context.Background()
 	logStats := tabletenv.NewLogStats(ctx, "GetPlanStats")
-	_, err := qe.GetPlan(ctx, logStats, "")
+	_, err := qe.GetPlan(ctx, logStats, "", false)
 	want := "syntax error"
 	if err == nil || !strings.Contains(err.Error(), want) {
 		t.Errorf("qe.GetPlan: %v, want %s", err, want)
@@ -131,7 +131,7 @@ func TestGetMessageStreamPlan(t *testing.T) {
 	}
 }
 
-func TestQueryCache(t *testing.T) {
+func TestQueryPlanCache(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	for query, result := range schematest.Queries() {
@@ -153,14 +153,14 @@ func TestQueryCache(t *testing.T) {
 	ctx := context.Background()
 	logStats := tabletenv.NewLogStats(ctx, "GetPlanStats")
 	qe.SetQueryCacheCap(1)
-	firstPlan, err := qe.GetPlan(ctx, logStats, firstQuery)
+	firstPlan, err := qe.GetPlan(ctx, logStats, firstQuery, false)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if firstPlan == nil {
 		t.Fatalf("plan should not be nil")
 	}
-	secondPlan, err := qe.GetPlan(ctx, logStats, secondQuery)
+	secondPlan, err := qe.GetPlan(ctx, logStats, secondQuery, false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -170,6 +170,43 @@ func TestQueryCache(t *testing.T) {
 	expvar.Do(func(kv expvar.KeyValue) {
 		_ = kv.Value.String()
 	})
+	if qe.queries.Size() == 0 {
+		t.Fatalf("query plan cache should not be 0")
+	}
+	qe.ClearQueryPlanCache()
+}
+
+func TestNoQueryPlanCache(t *testing.T) {
+	db := fakesqldb.New(t)
+	defer db.Close()
+	for query, result := range schematest.Queries() {
+		db.AddQuery(query, result)
+	}
+
+	firstQuery := "select * from test_table_01"
+	db.AddQuery("select * from test_table_01 where 1 != 1", &sqltypes.Result{})
+	db.AddQuery("select * from test_table_02 where 1 != 1", &sqltypes.Result{})
+
+	qe := newTestQueryEngine(10, 10*time.Second, true)
+	testUtils := newTestUtils()
+	dbconfigs := testUtils.newDBConfigs(db)
+	qe.se.Open(db.ConnParams())
+	qe.Open(dbconfigs)
+	defer qe.Close()
+
+	ctx := context.Background()
+	logStats := tabletenv.NewLogStats(ctx, "GetPlanStats")
+	qe.SetQueryCacheCap(1)
+	firstPlan, err := qe.GetPlan(ctx, logStats, firstQuery, true)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if firstPlan == nil {
+		t.Fatalf("plan should not be nil")
+	}
+	if qe.queries.Size() != 0 {
+		t.Fatalf("query plan cache should be 0")
+	}
 	qe.ClearQueryPlanCache()
 }
 
@@ -190,7 +227,7 @@ func TestStatsURL(t *testing.T) {
 	// warm up cache
 	ctx := context.Background()
 	logStats := tabletenv.NewLogStats(ctx, "GetPlanStats")
-	qe.GetPlan(ctx, logStats, query)
+	qe.GetPlan(ctx, logStats, query, false)
 
 	request, _ := http.NewRequest("GET", "/debug/tablet_plans", nil)
 	response := httptest.NewRecorder()
diff --git a/go/vt/vttablet/tabletserver/query_executor.go b/go/vt/vttablet/tabletserver/query_executor.go
index 5494fb4b97b..7eeb03c99bd 100644
--- a/go/vt/vttablet/tabletserver/query_executor.go
+++ b/go/vt/vttablet/tabletserver/query_executor.go
@@ -209,7 +209,7 @@ func (qre *QueryExecutor) MessageStream(callback func(*sqltypes.Result) error) e
 		return err
 	}
 
-	done, err := qre.tsv.messager.Subscribe(qre.plan.TableName().String(), func(r *sqltypes.Result) error {
+	done, err := qre.tsv.messager.Subscribe(qre.ctx, qre.plan.TableName().String(), func(r *sqltypes.Result) error {
 		select {
 		case <-qre.ctx.Done():
 			return io.EOF
@@ -275,14 +275,15 @@ func (qre *QueryExecutor) execAsTransaction(f func(conn *TxConnection) (*sqltype
 	return reply, nil
 }
 
-// checkPermissions
+// checkPermissions returns an error if the query does not pass all checks
+// (query blacklisting, table ACL).
 func (qre *QueryExecutor) checkPermissions() error {
 	// Skip permissions check if the context is local.
 	if tabletenv.IsLocalContext(qre.ctx) {
 		return nil
 	}
 
-	// Blacklist
+	// Check if the query is blacklisted.
 	remoteAddr := ""
 	username := ""
 	ci, ok := callinfo.FromContext(qre.ctx)
@@ -298,7 +299,8 @@ func (qre *QueryExecutor) checkPermissions() error {
 		return vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "disallowed due to rule: %s", desc)
 	}
 
-	// Check for SuperUser calling directly to VTTablet (e.g. VTWorker)
+	// Skip the ACL check if the connecting user is an exempted superuser.
+	// Necessary to whitelist e.g. direct vtworker access.
 	if qre.tsv.qe.exemptACL != nil && qre.tsv.qe.exemptACL.IsMember(&querypb.VTGateCallerID{Username: username}) {
 		qre.tsv.qe.tableaclExemptCount.Add(1)
 		return nil
@@ -312,16 +314,18 @@ func (qre *QueryExecutor) checkPermissions() error {
 		return nil
 	}
 
-	// a superuser that exempts from table ACL checking.
+	// Skip the ACL check if the caller id is an exempted superuser.
 	if qre.tsv.qe.exemptACL != nil && qre.tsv.qe.exemptACL.IsMember(callerID) {
 		qre.tsv.qe.tableaclExemptCount.Add(1)
 		return nil
 	}
 
-	// empty table name, do not need a table ACL check.
+	// Skip the ACL check if no table name is available in the query or DDL.
 	if qre.plan.TableName().IsEmpty() && qre.plan.NewName.IsEmpty() {
 		return nil
 	}
+
+	// DDL: Check against the new name of the table as well.
 	if !qre.plan.NewName.IsEmpty() {
 		altAuthorized := tableacl.Authorized(qre.plan.NewName.String(), qre.plan.PlanID.MinRole())
 		err := qre.checkAccess(altAuthorized, qre.plan.NewName, callerID)
@@ -329,7 +333,11 @@ func (qre *QueryExecutor) checkPermissions() error {
 			return err
 		}
 	}
+
+	// Actual ACL check: Check if the user is a member of the ACL.
 	if qre.plan.Authorized == nil {
+		// Note: This should never happen because tableacl.Authorized() sets this
+		// field to an "acl.DenyAllACL" ACL if no ACL was found.
 		return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "table acl error: nil acl")
 	}
 	if !qre.plan.TableName().IsEmpty() {
diff --git a/go/vt/vttablet/tabletserver/query_executor_test.go b/go/vt/vttablet/tabletserver/query_executor_test.go
index 28396b30f3b..4788650ce4e 100644
--- a/go/vt/vttablet/tabletserver/query_executor_test.go
+++ b/go/vt/vttablet/tabletserver/query_executor_test.go
@@ -195,7 +195,7 @@ func TestQueryExecutorPlanInsertMessage(t *testing.T) {
 	defer db.Close()
 	db.AddQueryPattern("insert into msg\\(time_scheduled, id, message, time_next, time_created, epoch\\) values \\(1, 2, 3, 1,.*", &sqltypes.Result{})
 	db.AddQuery(
-		"select time_next, epoch, id, time_scheduled, message from msg where (time_scheduled = 1 and id = 2)",
+		"select time_next, epoch, time_created, id, time_scheduled, message from msg where (time_scheduled = 1 and id = 2)",
 		&sqltypes.Result{
 			Fields: []*querypb.Field{
 				{Type: sqltypes.Int64},
@@ -203,11 +203,13 @@ func TestQueryExecutorPlanInsertMessage(t *testing.T) {
 				{Type: sqltypes.Int64},
 				{Type: sqltypes.Int64},
 				{Type: sqltypes.Int64},
+				{Type: sqltypes.Int64},
 			},
 			RowsAffected: 1,
 			Rows: [][]sqltypes.Value{{
 				sqltypes.NewVarBinary("1"),
 				sqltypes.NewVarBinary("0"),
+				sqltypes.NewVarBinary("10"),
 				sqltypes.NewVarBinary("1"),
 				sqltypes.NewVarBinary("10"),
 				sqltypes.NewVarBinary("2"),
@@ -223,7 +225,7 @@ func TestQueryExecutorPlanInsertMessage(t *testing.T) {
 	checkPlanID(t, planbuilder.PlanInsertMessage, qre.plan.PlanID)
 	ch1 := make(chan *sqltypes.Result)
 	count := 0
-	tsv.messager.Subscribe("msg", func(qr *sqltypes.Result) error {
+	tsv.messager.Subscribe(context.Background(), "msg", func(qr *sqltypes.Result) error {
 		if count > 1 {
 			return io.EOF
 		}
@@ -1859,7 +1861,7 @@ func newTransaction(tsv *TabletServer, options *querypb.ExecuteOptions) int64 {
 
 func newTestQueryExecutor(ctx context.Context, tsv *TabletServer, sql string, txID int64) *QueryExecutor {
 	logStats := tabletenv.NewLogStats(ctx, "TestQueryExecutor")
-	plan, err := tsv.qe.GetPlan(ctx, logStats, sql)
+	plan, err := tsv.qe.GetPlan(ctx, logStats, sql, false)
 	if err != nil {
 		panic(err)
 	}
diff --git a/go/vt/vttablet/tabletserver/schema/engine.go b/go/vt/vttablet/tabletserver/schema/engine.go
index 91999cfab7f..91ef405e462 100644
--- a/go/vt/vttablet/tabletserver/schema/engine.go
+++ b/go/vt/vttablet/tabletserver/schema/engine.go
@@ -189,6 +189,22 @@ func (se *Engine) Close() {
 	se.isOpen = false
 }
 
+// MakeNonMaster clears the sequence caches to make sure that
+// they don't get accidentally reused after losing mastership.
+func (se *Engine) MakeNonMaster() {
+	// This function is tested through endtoend test.
+	se.mu.Lock()
+	defer se.mu.Unlock()
+	for _, t := range se.tables {
+		if t.SequenceInfo != nil {
+			t.SequenceInfo.Lock()
+			t.SequenceInfo.NextVal = 0
+			t.SequenceInfo.LastVal = 0
+			t.SequenceInfo.Unlock()
+		}
+	}
+}
+
 // Reload reloads the schema info from the db.
 // Any tables that have changed since the last load are updated.
 // This is a no-op if the Engine is closed.
diff --git a/go/vt/vttablet/tabletserver/schema/load_table.go b/go/vt/vttablet/tabletserver/schema/load_table.go
index 48a2e27ce4d..b0624280b6a 100644
--- a/go/vt/vttablet/tabletserver/schema/load_table.go
+++ b/go/vt/vttablet/tabletserver/schema/load_table.go
@@ -73,9 +73,26 @@ func fetchColumns(ta *Table, conn *connpool.DBConn, sqlTableName string) error {
 		name := row[0].ToString()
 		columnType, ok := fieldTypes[name]
 		if !ok {
+			// This code is unreachable.
 			log.Warningf("Table: %s, column %s not found in select list, skipping.", ta.Name, name)
 			continue
 		}
+		// BIT data type default value representation differs from how
+		// it's returned. It's represented as b'101', but returned in
+		// its binary form. Extract the binary form.
+		if columnType == querypb.Type_BIT && row[4].ToString() != "" {
+			query := fmt.Sprintf("select %s", row[4].ToString())
+			r, err := conn.Exec(tabletenv.LocalContext(), query, 10000, false)
+			if err != nil {
+				return err
+			}
+			if len(r.Rows) != 1 || len(r.Rows[0]) != 1 {
+				// This code is unreachable.
+				return fmt.Errorf("Invalid rows returned from %s: %v", query, r.Rows)
+			}
+			// overwrite the original value with the new one.
+			row[4] = r.Rows[0][0]
+		}
 		ta.AddColumn(name, columnType, row[4], row[5].ToString())
 	}
 	return nil
diff --git a/go/vt/vttablet/tabletserver/schema/load_table_test.go b/go/vt/vttablet/tabletserver/schema/load_table_test.go
index 0d18d562f85..701739abc98 100644
--- a/go/vt/vttablet/tabletserver/schema/load_table_test.go
+++ b/go/vt/vttablet/tabletserver/schema/load_table_test.go
@@ -200,6 +200,22 @@ func TestLoadTableMessage(t *testing.T) {
 	}
 }
 
+func TestLoadTableWithBitColumn(t *testing.T) {
+	db := fakesqldb.New(t)
+	defer db.Close()
+	for query, result := range getTestLoadTableWithBitColumnQueries() {
+		db.AddQuery(query, result)
+	}
+	table, err := newTestLoadTable("USER_TABLE", "test table", db)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantValue := sqltypes.MakeTrusted(sqltypes.Bit, []byte{1, 0, 1})
+	if got, want := table.Columns[1].Default, wantValue; !reflect.DeepEqual(got, want) {
+		t.Errorf("Default bit value: %v, want %v", got, want)
+	}
+}
+
 func newTestLoadTable(tableType string, comment string, db *fakesqldb.DB) (*Table, error) {
 	ctx := context.Background()
 	appParams := db.ConnParams()
@@ -303,3 +319,39 @@ func getMessageTableQueries() map[string]*sqltypes.Result {
 		},
 	}
 }
+
+func getTestLoadTableWithBitColumnQueries() map[string]*sqltypes.Result {
+	return map[string]*sqltypes.Result{
+		"select * from test_table where 1 != 1": {
+			Fields: []*querypb.Field{{
+				Name: "pk",
+				Type: sqltypes.Int32,
+			}, {
+				Name: "flags",
+				Type: sqltypes.Bit,
+			}},
+		},
+		"describe test_table": {
+			Fields:       mysql.DescribeTableFields,
+			RowsAffected: 2,
+			Rows: [][]sqltypes.Value{
+				mysql.DescribeTableRow("pk", "int(11)", false, "PRI", "0"),
+				mysql.DescribeTableRow("flags", "int(11)", false, "", "b'101'"),
+			},
+		},
+		"show index from test_table": {
+			Fields:       mysql.ShowIndexFromTableFields,
+			RowsAffected: 1,
+			Rows: [][]sqltypes.Value{
+				mysql.ShowIndexFromTableRow("test_table", true, "PRIMARY", 1, "pk", false),
+			},
+		},
+		"select b'101'": {
+			Fields:       sqltypes.MakeTestFields("", "varbinary"),
+			RowsAffected: 1,
+			Rows: [][]sqltypes.Value{
+				{sqltypes.MakeTrusted(sqltypes.VarBinary, []byte{1, 0, 1})},
+			},
+		},
+	}
+}
diff --git a/go/vt/vttablet/tabletserver/tabletenv/config.go b/go/vt/vttablet/tabletserver/tabletenv/config.go
index 0fc3194c6f7..21ecfddf444 100644
--- a/go/vt/vttablet/tabletserver/tabletenv/config.go
+++ b/go/vt/vttablet/tabletserver/tabletenv/config.go
@@ -48,6 +48,7 @@ func init() {
 	flag.IntVar(&Config.StreamPoolSize, "queryserver-config-stream-pool-size", DefaultQsConfig.StreamPoolSize, "query server stream connection pool size, stream pool is used by stream queries: queries that return results to client in a streaming fashion")
 	flag.IntVar(&Config.MessagePoolSize, "queryserver-config-message-conn-pool-size", DefaultQsConfig.MessagePoolSize, "query server message connection pool size, message pool is used by message managers: recommended value is one per message table")
 	flag.IntVar(&Config.TransactionCap, "queryserver-config-transaction-cap", DefaultQsConfig.TransactionCap, "query server transaction cap is the maximum number of transactions allowed to happen at any given point of a time for a single vttablet. E.g. by setting transaction cap to 100, there are at most 100 transactions will be processed by a vttablet and the 101th transaction will be blocked (and fail if it cannot get connection within specified timeout)")
+	flag.IntVar(&Config.MessagePostponeCap, "queryserver-config-message-postpone-cap", DefaultQsConfig.MessagePostponeCap, "query server message postpone cap is the maximum number of messages that can be postponed at any given time. Set this number to substantially lower than transaction cap, so that the transaction pool isn't exhausted by the message subsystem.")
 	flag.IntVar(&Config.FoundRowsPoolSize, "client-found-rows-pool-size", DefaultQsConfig.FoundRowsPoolSize, "size of a special pool that will be used if the client requests that statements be executed with the CLIENT_FOUND_ROWS option of MySQL.")
 	flag.Float64Var(&Config.TransactionTimeout, "queryserver-config-transaction-timeout", DefaultQsConfig.TransactionTimeout, "query server transaction timeout (in seconds), a transaction will be killed if it takes longer than this value")
 	flag.Float64Var(&Config.TxShutDownGracePeriod, "transaction_shutdown_grace_period", DefaultQsConfig.TxShutDownGracePeriod, "how long to wait (in seconds) for transactions to complete during graceful shutdown.")
@@ -79,6 +80,7 @@ func init() {
 	flag.BoolVar(&Config.EnableHotRowProtectionDryRun, "enable_hot_row_protection_dry_run", DefaultQsConfig.EnableHotRowProtectionDryRun, "If true, hot row protection is not enforced but logs if transactions would have been queued.")
 	flag.IntVar(&Config.HotRowProtectionMaxQueueSize, "hot_row_protection_max_queue_size", DefaultQsConfig.HotRowProtectionMaxQueueSize, "Maximum number of BeginExecute RPCs which will be queued for the same row (range).")
 	flag.IntVar(&Config.HotRowProtectionMaxGlobalQueueSize, "hot_row_protection_max_global_queue_size", DefaultQsConfig.HotRowProtectionMaxGlobalQueueSize, "Global queue limit across all row (ranges). Useful to prevent that the queue can grow unbounded.")
+	flag.IntVar(&Config.HotRowProtectionConcurrentTransactions, "hot_row_protection_concurrent_transactions", DefaultQsConfig.HotRowProtectionConcurrentTransactions, "Number of concurrent transactions let through to the txpool/MySQL for the same hot row. Should be > 1 to have enough 'ready' transactions in MySQL and benefit from a pipelining effect.")
 
 	flag.BoolVar(&Config.HeartbeatEnable, "heartbeat_enable", DefaultQsConfig.HeartbeatEnable, "If true, vttablet records (if master) or checks (if replica) the current time of a replication heartbeat in the table _vt.heartbeat. The result is used to inform the serving state of the vttablet via healthchecks.")
 	flag.DurationVar(&Config.HeartbeatInterval, "heartbeat_interval", DefaultQsConfig.HeartbeatInterval, "How frequently to read and write replication heartbeat.")
@@ -98,6 +100,7 @@ type TabletConfig struct {
 	StreamPoolSize          int
 	MessagePoolSize         int
 	TransactionCap          int
+	MessagePostponeCap      int
 	FoundRowsPoolSize       int
 	TransactionTimeout      float64
 	TxShutDownGracePeriod   float64
@@ -125,10 +128,11 @@ type TabletConfig struct {
 	TxThrottlerConfig           string
 	TxThrottlerHealthCheckCells []string
 
-	EnableHotRowProtection             bool
-	EnableHotRowProtectionDryRun       bool
-	HotRowProtectionMaxQueueSize       int
-	HotRowProtectionMaxGlobalQueueSize int
+	EnableHotRowProtection                 bool
+	EnableHotRowProtectionDryRun           bool
+	HotRowProtectionMaxQueueSize           int
+	HotRowProtectionMaxGlobalQueueSize     int
+	HotRowProtectionConcurrentTransactions int
 
 	HeartbeatEnable   bool
 	HeartbeatInterval time.Duration
@@ -148,6 +152,7 @@ var DefaultQsConfig = TabletConfig{
 	StreamPoolSize:          200,
 	MessagePoolSize:         5,
 	TransactionCap:          20,
+	MessagePostponeCap:      4,
 	FoundRowsPoolSize:       20,
 	TransactionTimeout:      30,
 	TxShutDownGracePeriod:   0,
@@ -180,6 +185,9 @@ var DefaultQsConfig = TabletConfig{
 	// Default value is the same as TransactionCap.
 	HotRowProtectionMaxQueueSize:       20,
 	HotRowProtectionMaxGlobalQueueSize: 1000,
+	// Allow more than 1 transaction for the same hot row through to have enough
+	// of them ready in MySQL and profit from a pipelining effect.
+	HotRowProtectionConcurrentTransactions: 5,
 
 	HeartbeatEnable:   false,
 	HeartbeatInterval: 1 * time.Second,
@@ -218,6 +226,9 @@ func VerifyConfig() error {
 	if globalSize, size := Config.HotRowProtectionMaxGlobalQueueSize, Config.HotRowProtectionMaxQueueSize; globalSize < size {
 		return fmt.Errorf("global queue size must be >= per row (range) queue size: -hot_row_protection_max_global_queue_size < hot_row_protection_max_queue_size (%v < %v)", globalSize, size)
 	}
+	if v := Config.HotRowProtectionConcurrentTransactions; v <= 0 {
+		return fmt.Errorf("-hot_row_protection_concurrent_transactions must be > 0 (specified value: %v)", v)
+	}
 	return nil
 }
 
diff --git a/go/vt/vttablet/tabletserver/tabletenv/logstats.go b/go/vt/vttablet/tabletserver/tabletenv/logstats.go
index 35c44a68f02..b8f98c07b3f 100644
--- a/go/vt/vttablet/tabletserver/tabletenv/logstats.go
+++ b/go/vt/vttablet/tabletserver/tabletenv/logstats.go
@@ -199,7 +199,7 @@ func (stats *LogStats) RemoteAddrUsername() (string, string) {
 
 // Format returns a tab separated list of logged fields.
 func (stats *LogStats) Format(params url.Values) string {
-	_, fullBindParams := params["full"]
+	//_, fullBindParams := params["full"]
 
 	// TODO: remove username here we fully enforce immediate caller id
 	remoteAddr, username := stats.RemoteAddrUsername()
@@ -215,9 +215,9 @@ func (stats *LogStats) Format(params url.Values) string {
 		stats.TotalTime().Seconds(),
 		stats.PlanType,
 		stats.OriginalSQL,
-		stats.FmtBindVariables(fullBindParams),
+		"[REDACTED]", //stats.FmtBindVariables(fullBindParams),
 		stats.NumberOfQueries,
-		stats.RewrittenSQL(),
+		"[REDACTED]", //stats.RewrittenSQL(),
 		stats.FmtQuerySources(),
 		stats.MysqlResponseTime.Seconds(),
 		stats.WaitingForConnection.Seconds(),
diff --git a/go/vt/vttablet/tabletserver/tabletenv/tabletenv.go b/go/vt/vttablet/tabletserver/tabletenv/tabletenv.go
index e7c1065d484..0784dc6d594 100644
--- a/go/vt/vttablet/tabletserver/tabletenv/tabletenv.go
+++ b/go/vt/vttablet/tabletserver/tabletenv/tabletenv.go
@@ -86,6 +86,12 @@ var (
 	TableaclDenied = stats.NewMultiCounters("TableACLDenied", []string{"TableName", "TableGroup", "PlanID", "Username"})
 	// TableaclPseudoDenied tracks the number of pseudo denies.
 	TableaclPseudoDenied = stats.NewMultiCounters("TableACLPseudoDenied", []string{"TableName", "TableGroup", "PlanID", "Username"})
+	// Infof can be overridden during tests
+	Infof = log.Infof
+	// Warningf can be overridden during tests
+	Warningf = log.Warningf
+	// Errorf can be overridden during tests
+	Errorf = log.Errorf
 )
 
 // RecordUserQuery records the query data against the user.
diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
index 25b884b23ca..c58e2959c00 100644
--- a/go/vt/vttablet/tabletserver/tabletserver.go
+++ b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -466,6 +466,9 @@ func (tsv *TabletServer) serveNewType() (err error) {
 		tsv.te.Close(true)
 		tsv.watcher.Open(tsv.dbconfigs, tsv.mysqld)
 		tsv.txThrottler.Close()
+
+		// Reset the sequences.
+		tsv.se.MakeNonMaster()
 	}
 	tsv.transition(StateServing)
 	return nil
@@ -554,19 +557,27 @@ func (tsv *TabletServer) setTimeBomb() chan struct{} {
 	return done
 }
 
-// IsHealthy returns nil if the query service is healthy (able to
-// connect to the database and serving traffic) or an error explaining
+// IsHealthy returns nil for non-serving types or if the query service is healthy (able to
+// connect to the database and serving traffic), or an error explaining
 // the unhealthiness otherwise.
 func (tsv *TabletServer) IsHealthy() error {
-	_, err := tsv.Execute(
-		tabletenv.LocalContext(),
-		nil,
-		"select 1 from dual",
-		nil,
-		0,
-		nil,
-	)
-	return err
+	tsv.mu.Lock()
+	tabletType := tsv.target.TabletType
+	tsv.mu.Unlock()
+	switch tabletType {
+	case topodatapb.TabletType_MASTER, topodatapb.TabletType_REPLICA, topodatapb.TabletType_BATCH, topodatapb.TabletType_EXPERIMENTAL:
+		_, err := tsv.Execute(
+			tabletenv.LocalContext(),
+			nil,
+			"/* health */ select 1 from dual",
+			nil,
+			0,
+			nil,
+		)
+		return err
+	default:
+		return nil
+	}
 }
 
 // CheckMySQL initiates a check to see if MySQL is reachable.
@@ -849,7 +860,7 @@ func (tsv *TabletServer) Execute(ctx context.Context, target *querypb.Target, sq
 				bindVariables = make(map[string]*querypb.BindVariable)
 			}
 			query, comments := sqlparser.SplitTrailingComments(sql)
-			plan, err := tsv.qe.GetPlan(ctx, logStats, query)
+			plan, err := tsv.qe.GetPlan(ctx, logStats, query, skipQueryPlanCache(options))
 			if err != nil {
 				return err
 			}
@@ -921,7 +932,28 @@ func (tsv *TabletServer) ExecuteBatch(ctx context.Context, target *querypb.Targe
 		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "cannot start a new transaction in the scope of an existing one")
 	}
 
+	if tsv.enableHotRowProtection && asTransaction && len(queries) == 1 {
+		// Serialize transactions which target the same hot row range.
+		// NOTE: We put this intentionally at this place *before* tsv.startRequest()
+		// gets called below. Otherwise, the startRequest()/endRequest() section from
+		// below would overlap with the startRequest()/endRequest() section executed
+		// by tsv.beginWaitForSameRangeTransactions().
+		txDone, err := tsv.beginWaitForSameRangeTransactions(ctx, target, options, queries[0].Sql, queries[0].BindVariables)
+		if err != nil {
+			return nil, err
+		}
+		if txDone != nil {
+			defer txDone()
+		}
+	}
+
 	allowOnShutdown := (transactionID != 0)
+	// TODO(sougou): Convert startRequest/endRequest pattern to use wrapper
+	// function tsv.execRequest() instead.
+	// Note that below we always return "err" right away and do not call
+	// tsv.convertAndLogError. That's because the methods which returned "err",
+	// e.g. tsv.Execute(), already called that function and therefore already
+	// converted and logged the error.
 	if err = tsv.startRequest(ctx, target, false, allowOnShutdown); err != nil {
 		return nil, err
 	}
@@ -931,7 +963,7 @@ func (tsv *TabletServer) ExecuteBatch(ctx context.Context, target *querypb.Targe
 	if asTransaction {
 		transactionID, err = tsv.Begin(ctx, target, options)
 		if err != nil {
-			return nil, tsv.convertAndLogError(ctx, "batch", nil, err, nil)
+			return nil, err
 		}
 		// If transaction was not committed by the end, it means
 		// that there was an error, roll it back.
@@ -945,14 +977,14 @@ func (tsv *TabletServer) ExecuteBatch(ctx context.Context, target *querypb.Targe
 	for _, bound := range queries {
 		localReply, err := tsv.Execute(ctx, target, bound.Sql, bound.BindVariables, transactionID, options)
 		if err != nil {
-			return nil, tsv.convertAndLogError(ctx, "batch", nil, err, nil)
+			return nil, err
 		}
 		results = append(results, *localReply)
 	}
 	if asTransaction {
 		if err = tsv.Commit(ctx, target, transactionID); err != nil {
 			transactionID = 0
-			return nil, tsv.convertAndLogError(ctx, "batch", nil, err, nil)
+			return nil, err
 		}
 		transactionID = 0
 	}
@@ -1027,7 +1059,7 @@ func (tsv *TabletServer) beginWaitForSameRangeTransactions(ctx context.Context,
 func (tsv *TabletServer) computeTxSerializerKey(ctx context.Context, logStats *tabletenv.LogStats, sql string, bindVariables map[string]*querypb.BindVariable) (string, string) {
 	// Strip trailing comments so we don't pollute the query cache.
 	sql, _ = sqlparser.SplitTrailingComments(sql)
-	plan, err := tsv.qe.GetPlan(ctx, logStats, sql)
+	plan, err := tsv.qe.GetPlan(ctx, logStats, sql, false /* skipQueryPlanCache */)
 	if err != nil {
 		logComputeRowSerializerKey.Errorf("failed to get plan for query: %v err: %v", sql, err)
 		return "", ""
@@ -1057,6 +1089,8 @@ func (tsv *TabletServer) computeTxSerializerKey(ctx context.Context, logStats *t
 
 // BeginExecuteBatch combines Begin and ExecuteBatch.
 func (tsv *TabletServer) BeginExecuteBatch(ctx context.Context, target *querypb.Target, queries []*querypb.BoundQuery, asTransaction bool, options *querypb.ExecuteOptions) ([]sqltypes.Result, int64, error) {
+	// TODO(mberlin): Integrate hot row protection here as we did for BeginExecute()
+	// and ExecuteBatch(asTransaction=true).
 	transactionID, err := tsv.Begin(ctx, target, options)
 	if err != nil {
 		return nil, 0, err
@@ -1283,27 +1317,54 @@ func (tsv *TabletServer) convertAndLogError(ctx context.Context, sql string, bin
 	if err == nil {
 		return nil
 	}
-	err = tsv.convertError(ctx, sql, bindVariables, err)
 
-	if logStats != nil {
-		logStats.Error = err
-	}
-	errCode := vterrors.Code(err)
+	errCode := tsv.convertErrorCode(err)
 	tabletenv.ErrorStats.Add(errCode.String(), 1)
 
-	logMethod := log.Errorf
+	logMethod := tabletenv.Errorf
 	// Suppress or demote some errors in logs.
 	switch errCode {
 	case vtrpcpb.Code_FAILED_PRECONDITION, vtrpcpb.Code_ALREADY_EXISTS:
-		return err
+		logMethod = nil
 	case vtrpcpb.Code_RESOURCE_EXHAUSTED:
 		logMethod = logTxPoolFull.Errorf
 	case vtrpcpb.Code_ABORTED:
-		logMethod = log.Warningf
+		logMethod = tabletenv.Warningf
 	case vtrpcpb.Code_INVALID_ARGUMENT, vtrpcpb.Code_DEADLINE_EXCEEDED:
-		logMethod = log.Infof
+		logMethod = tabletenv.Infof
+	}
+
+	origErr := err
+	err = formatErrorWithCallerID(ctx, vterrors.New(errCode, err.Error()))
+	if logMethod != nil {
+		logMethod("%v: %v", err, queryAsString(sql, bindVariables))
+	}
+
+	// If TerseErrors is on, strip the error message returned by MySQL and only
+	// keep the error number and sql state.
+	// We assume that bind variable have PII, which are included in the MySQL
+	// query and come back as part of the error message. Removing the MySQL
+	// error helps us avoid leaking PII.
+	// There are two exceptions:
+	// 1. If no bind vars were specified, it's likely that the query was issued
+	// by someone manually. So, we don't suppress the error.
+	// 2. FAILED_PRECONDITION errors. These are caused when a failover is in progress.
+	// If so, we don't want to suppress the error. This will allow VTGate to
+	// detect and perform buffering during failovers.
+	if tsv.TerseErrors && len(bindVariables) != 0 && errCode != vtrpcpb.Code_FAILED_PRECONDITION {
+		sqlErr, ok := origErr.(*mysql.SQLError)
+		if ok {
+			sqlState := sqlErr.SQLState()
+			errnum := sqlErr.Number()
+			err = vterrors.Errorf(errCode, "(errno %d) (sqlstate %s) during query: %s", errnum, sqlState, sqlparser.TruncateForLog(sql))
+			err = formatErrorWithCallerID(ctx, err)
+		}
 	}
-	logMethod("%v: %v", err, queryAsString(sql, bindVariables))
+
+	if logStats != nil {
+		logStats.Error = err
+	}
+
 	return err
 }
 
@@ -1318,65 +1379,78 @@ func formatErrorWithCallerID(ctx context.Context, err error) error {
 	return vterrors.Errorf(vterrors.Code(err), "%v, CallerID: %s", err, callerID.Username)
 }
 
-func (tsv *TabletServer) convertError(ctx context.Context, sql string, bindVariables map[string]*querypb.BindVariable, err error) error {
+func (tsv *TabletServer) convertErrorCode(err error) vtrpcpb.Code {
+	errCode := vterrors.Code(err)
 	sqlErr, ok := err.(*mysql.SQLError)
 	if !ok {
-		return formatErrorWithCallerID(ctx, err)
+		return errCode
 	}
 
-	errCode := vterrors.Code(err)
 	errstr := err.Error()
 	errnum := sqlErr.Number()
-	sqlState := sqlErr.SQLState()
 	switch errnum {
+	case mysql.ERNotSupportedYet:
+		errCode = vtrpcpb.Code_UNIMPLEMENTED
+	case mysql.ERDiskFull, mysql.EROutOfMemory, mysql.EROutOfSortMemory, mysql.ERConCount, mysql.EROutOfResources, mysql.ERRecordFileFull, mysql.ERHostIsBlocked,
+		mysql.ERCantCreateThread, mysql.ERTooManyDelayedThreads, mysql.ERNetPacketTooLarge, mysql.ERTooManyUserConnections, mysql.ERLockTableFull, mysql.ERUserLimitReached, mysql.ERVitessMaxRowsExceeded:
+		errCode = vtrpcpb.Code_RESOURCE_EXHAUSTED
+	case mysql.ERLockWaitTimeout:
+		errCode = vtrpcpb.Code_DEADLINE_EXCEEDED
+	case mysql.CRServerGone, mysql.ERServerShutdown:
+		errCode = vtrpcpb.Code_UNAVAILABLE
+	case mysql.ERFormNotFound, mysql.ERKeyNotFound, mysql.ERBadFieldError, mysql.ERNoSuchThread, mysql.ERUnknownTable, mysql.ERCantFindUDF, mysql.ERNonExistingGrant,
+		mysql.ERNoSuchTable, mysql.ERNonExistingTableGrant, mysql.ERKeyDoesNotExist:
+		errCode = vtrpcpb.Code_NOT_FOUND
+	case mysql.ERDBAccessDenied, mysql.ERAccessDeniedError, mysql.ERKillDenied, mysql.ERNoPermissionToCreateUsers:
+		errCode = vtrpcpb.Code_PERMISSION_DENIED
+	case mysql.ERNoDb, mysql.ERNoSuchIndex, mysql.ERCantDropFieldOrKey, mysql.ERTableNotLockedForWrite, mysql.ERTableNotLocked, mysql.ERTooBigSelect, mysql.ERNotAllowedCommand,
+		mysql.ERTooLongString, mysql.ERDelayedInsertTableLocked, mysql.ERDupUnique, mysql.ERRequiresPrimaryKey, mysql.ERCantDoThisDuringAnTransaction, mysql.ERReadOnlyTransaction,
+		mysql.ERCannotAddForeign, mysql.ERNoReferencedRow, mysql.ERRowIsReferenced, mysql.ERCantUpdateWithReadLock, mysql.ERNoDefault, mysql.EROperandColumns,
+		mysql.ERSubqueryNo1Row, mysql.ERNonUpdateableTable, mysql.ERFeatureDisabled, mysql.ERDuplicatedValueInType, mysql.ERRowIsReferenced2,
+		mysql.ErNoReferencedRow2:
+		errCode = vtrpcpb.Code_FAILED_PRECONDITION
 	case mysql.EROptionPreventsStatement:
 		// Special-case this error code. It's probably because
 		// there was a failover and there are old clients still connected.
 		if strings.Contains(errstr, "read-only") {
 			errCode = vtrpcpb.Code_FAILED_PRECONDITION
 		}
-	case 1227: // Google internal failover error code.
+	case mysql.ERTableExists, mysql.ERDupEntry, mysql.ERFileExists, mysql.ERUDFExists:
+		errCode = vtrpcpb.Code_ALREADY_EXISTS
+	case mysql.ERGotSignal, mysql.ERForcingClose, mysql.ERAbortingConnection, mysql.ERLockDeadlock:
+		// For ERLockDeadlock, a deadlock rolls back the transaction.
+		errCode = vtrpcpb.Code_ABORTED
+	case mysql.ERUnknownComError, mysql.ERBadNullError, mysql.ERBadDb, mysql.ERBadTable, mysql.ERNonUniq, mysql.ERWrongFieldWithGroup, mysql.ERWrongGroupField,
+		mysql.ERWrongSumSelect, mysql.ERWrongValueCount, mysql.ERTooLongIdent, mysql.ERDupFieldName, mysql.ERDupKeyName, mysql.ERWrongFieldSpec, mysql.ERParseError,
+		mysql.EREmptyQuery, mysql.ERNonUniqTable, mysql.ERInvalidDefault, mysql.ERMultiplePriKey, mysql.ERTooManyKeys, mysql.ERTooManyKeyParts, mysql.ERTooLongKey,
+		mysql.ERKeyColumnDoesNotExist, mysql.ERBlobUsedAsKey, mysql.ERTooBigFieldLength, mysql.ERWrongAutoKey, mysql.ERWrongFieldTerminators, mysql.ERBlobsAndNoTerminated,
+		mysql.ERTextFileNotReadable, mysql.ERWrongSubKey, mysql.ERCantRemoveAllFields, mysql.ERUpdateTableUsed, mysql.ERNoTablesUsed, mysql.ERTooBigSet,
+		mysql.ERBlobCantHaveDefault, mysql.ERWrongDbName, mysql.ERWrongTableName, mysql.ERUnknownProcedure, mysql.ERWrongParamCountToProcedure,
+		mysql.ERWrongParametersToProcedure, mysql.ERFieldSpecifiedTwice, mysql.ERInvalidGroupFuncUse, mysql.ERTableMustHaveColumns, mysql.ERUnknownCharacterSet,
+		mysql.ERTooManyTables, mysql.ERTooManyFields, mysql.ERTooBigRowSize, mysql.ERWrongOuterJoin, mysql.ERNullColumnInIndex, mysql.ERFunctionNotDefined,
+		mysql.ERWrongValueCountOnRow, mysql.ERInvalidUseOfNull, mysql.ERRegexpError, mysql.ERMixOfGroupFuncAndFields, mysql.ERIllegalGrantForTable, mysql.ERSyntaxError,
+		mysql.ERWrongColumnName, mysql.ERWrongKeyColumn, mysql.ERBlobKeyWithoutLength, mysql.ERPrimaryCantHaveNull, mysql.ERTooManyRows, mysql.ERUnknownSystemVariable,
+		mysql.ERSetConstantsOnly, mysql.ERWrongArguments, mysql.ERWrongUsage, mysql.ERWrongNumberOfColumnsInSelect, mysql.ERDupArgument, mysql.ERLocalVariable,
+		mysql.ERGlobalVariable, mysql.ERWrongValueForVar, mysql.ERWrongTypeForVar, mysql.ERVarCantBeRead, mysql.ERCantUseOptionHere, mysql.ERIncorrectGlobalLocalVar,
+		mysql.ERWrongFKDef, mysql.ERKeyRefDoNotMatchTableRef, mysql.ERCyclicReference, mysql.ERCollationCharsetMismatch, mysql.ERCantAggregate2Collations,
+		mysql.ERCantAggregate3Collations, mysql.ERCantAggregateNCollations, mysql.ERVariableIsNotStruct, mysql.ERUnknownCollation, mysql.ERWrongNameForIndex,
+		mysql.ERWrongNameForCatalog, mysql.ERBadFTColumn, mysql.ERTruncatedWrongValue, mysql.ERTooMuchAutoTimestampCols, mysql.ERInvalidOnUpdate, mysql.ERUnknownTimeZone,
+		mysql.ERInvalidCharacterString, mysql.ERIllegalReference, mysql.ERDerivedMustHaveAlias, mysql.ERTableNameNotAllowedHere, mysql.ERDataTooLong, mysql.ERDataOutOfRange,
+		mysql.ERTruncatedWrongValueForField:
+		errCode = vtrpcpb.Code_INVALID_ARGUMENT
+	case mysql.ERSpecifiedAccessDenied:
+		// This code is also utilized for Google internal failover error code.
 		if strings.Contains(errstr, "failover in progress") {
 			errCode = vtrpcpb.Code_FAILED_PRECONDITION
+		} else {
+			errCode = vtrpcpb.Code_PERMISSION_DENIED
 		}
-	case mysql.ERDupEntry:
-		errCode = vtrpcpb.Code_ALREADY_EXISTS
-	case mysql.ERDataTooLong, mysql.ERDataOutOfRange, mysql.ERBadNullError, mysql.ERSyntaxError, mysql.ERUpdateTableUsed, mysql.ERTooBigSet,
-		mysql.ERWrongDbName, mysql.ERWrongTableName, mysql.ERInvalidGroupFuncUse, mysql.ERTooManyFields, mysql.ERTooManyTables,
-		mysql.ERTableNameNotAllowedHere, mysql.ERDerivedMustHaveAlias, mysql.ERIllegalReference, mysql.ERCyclicReference, mysql.ERTruncatedWrongValueForField:
-		errCode = vtrpcpb.Code_INVALID_ARGUMENT
-	case mysql.ERLockWaitTimeout:
-		errCode = vtrpcpb.Code_DEADLINE_EXCEEDED
-	case mysql.ERLockDeadlock:
-		// A deadlock rolls back the transaction.
-		errCode = vtrpcpb.Code_ABORTED
 	case mysql.CRServerLost:
 		// Query was killed.
 		errCode = vtrpcpb.Code_DEADLINE_EXCEEDED
-	case mysql.CRServerGone, mysql.ERServerShutdown:
-		errCode = vtrpcpb.Code_UNAVAILABLE
-	case mysql.ERBadFieldError, mysql.ERUnknownTable, mysql.ERNoSuchTable:
-		errCode = vtrpcpb.Code_NOT_FOUND
-	case mysql.ERNoReferencedRow, mysql.ErNoReferencedRow2, mysql.ERRowIsReferenced, mysql.ERRowIsReferenced2, mysql.ERTableNotLockedForWrite,
-		mysql.ERSubqueryNo1Row, mysql.EROperandColumns, mysql.ERCantDoThisDuringAnTransaction:
-		errCode = vtrpcpb.Code_FAILED_PRECONDITION
 	}
 
-	// If TerseErrors is on, strip the error message returned by MySQL and only
-	// keep the error number and sql state.
-	// We assume that bind variable have PII, which are included in the MySQL
-	// query and come back as part of the error message. Removing the MySQL
-	// error helps us avoid leaking PII.
-	// There are two exceptions:
-	// 1. If no bind vars were specified, it's likely that the query was issued
-	// by someone manually. So, we don't suppress the error.
-	// 2. FAILED_PRECONDITION errors. These are caused when a failover is in progress.
-	// If so, we don't want to suppress the error. This will allow VTGate to
-	// detect and perform buffering during failovers.
-	if tsv.TerseErrors && len(bindVariables) != 0 && errCode != vtrpcpb.Code_FAILED_PRECONDITION {
-		errstr = fmt.Sprintf("(errno %d) (sqlstate %s) during query: %s", errnum, sqlState, sqlparser.TruncateForLog(sql))
-	}
-	return formatErrorWithCallerID(ctx, vterrors.New(errCode, errstr))
+	return errCode
 }
 
 // validateSplitQueryParameters perform some validations on the SplitQuery parameters
@@ -1724,7 +1798,7 @@ func (tsv *TabletServer) endRequest(isTx bool) {
 
 // GetPlan is only used from vtexplain
 func (tsv *TabletServer) GetPlan(ctx context.Context, logStats *tabletenv.LogStats, sql string) (*TabletPlan, error) {
-	return tsv.qe.GetPlan(ctx, logStats, sql)
+	return tsv.qe.GetPlan(ctx, logStats, sql, false /* skipQueryPlanCache */)
 }
 
 func (tsv *TabletServer) registerDebugHealthHandler() {
@@ -1735,7 +1809,7 @@ func (tsv *TabletServer) registerDebugHealthHandler() {
 		}
 		w.Header().Set("Content-Type", "text/plain")
 		if err := tsv.IsHealthy(); err != nil {
-			w.Write([]byte("not ok"))
+			http.Error(w, fmt.Sprintf("not ok: %v", err), http.StatusInternalServerError)
 			return
 		}
 		w.Write([]byte("ok"))
@@ -1868,13 +1942,13 @@ func (tsv *TabletServer) MaxDMLRows() int {
 // and also truncates data if it's too long
 func queryAsString(sql string, bindVariables map[string]*querypb.BindVariable) string {
 	buf := &bytes.Buffer{}
-	fmt.Fprintf(buf, "Sql: %q, BindVars: {", sqlparser.TruncateForLog(sql))
+	fmt.Fprintf(buf, "Sql: %q, BindVars: {", sql)
 	for k, v := range bindVariables {
 		valString := fmt.Sprintf("%v", v)
-		fmt.Fprintf(buf, "%s: %q", k, sqlparser.TruncateForLog(valString))
+		fmt.Fprintf(buf, "%s: %q", k, valString)
 	}
 	fmt.Fprintf(buf, "}")
-	return string(buf.Bytes())
+	return sqlparser.TruncateForLog(string(buf.Bytes()))
 }
 
 // withTimeout returns a context based on the specified timeout.
@@ -1886,3 +1960,11 @@ func withTimeout(ctx context.Context, timeout time.Duration, options *querypb.Ex
 	}
 	return context.WithTimeout(ctx, timeout)
 }
+
+// skipQueryPlanCache returns true if the query plan should be cached
+func skipQueryPlanCache(options *querypb.ExecuteOptions) bool {
+	if options == nil {
+		return false
+	}
+	return options.SkipQueryPlanCache
+}
diff --git a/go/vt/vttablet/tabletserver/tabletserver_test.go b/go/vt/vttablet/tabletserver/tabletserver_test.go
index 820005390a3..a610c9888d7 100644
--- a/go/vt/vttablet/tabletserver/tabletserver_test.go
+++ b/go/vt/vttablet/tabletserver/tabletserver_test.go
@@ -28,12 +28,14 @@ import (
 	"testing"
 	"time"
 
+	log "github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
 
 	"github.com/youtube/vitess/go/mysql"
 	"github.com/youtube/vitess/go/mysql/fakesqldb"
 	"github.com/youtube/vitess/go/sqltypes"
+	"github.com/youtube/vitess/go/vt/sqlparser"
 	"github.com/youtube/vitess/go/vt/vterrors"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/tabletenv"
 
@@ -1475,6 +1477,7 @@ func TestSerializeTransactionsSameRow(t *testing.T) {
 	testUtils := newTestUtils()
 	config := testUtils.newQueryServiceConfig()
 	config.EnableHotRowProtection = true
+	config.HotRowProtectionConcurrentTransactions = 1
 	// Reduce the txpool to 2 because we should never consume more than two slots.
 	config.TransactionCap = 2
 	tsv := NewTabletServerWithNilTopoServer(config)
@@ -1512,7 +1515,7 @@ func TestSerializeTransactionsSameRow(t *testing.T) {
 	db.SetBeforeFunc("update test_table set name_string = 'tx1' where pk in (1) /* _stream test_table (pk ) (1 ); */",
 		func() {
 			close(tx1Started)
-			if err := waitForTxSerializationCount(tsv, "test_table where pk = 1 and name = 1", 2); err != nil {
+			if err := waitForTxSerializationPendingQueries(tsv, "test_table where pk = 1 and name = 1", 2); err != nil {
 				t.Fatal(err)
 			}
 		})
@@ -1580,7 +1583,262 @@ func TestSerializeTransactionsSameRow(t *testing.T) {
 	}
 }
 
-func waitForTxSerializationCount(tsv *TabletServer, key string, i int) error {
+// TestSerializeTransactionsSameRow_ExecuteBatchAsTransaction tests the same as
+// TestSerializeTransactionsSameRow but for the ExecuteBatch method with
+// asTransaction=true (i.e. vttablet wraps the query in a BEGIN/Query/COMMIT
+// sequence).
+// One subtle difference is that we have no control over the commit of tx2 and
+// therefore we cannot reproduce that tx2 is still pending after tx3 has
+// finished. Nonetheless, we check the overall serialization count and verify
+// that only tx1 and tx2, 2 transactions in total, are serialized.
+func TestSerializeTransactionsSameRow_ExecuteBatchAsTransaction(t *testing.T) {
+	// This test runs three transaction in parallel:
+	// tx1 | tx2 | tx3
+	// However, tx1 and tx2 have the same WHERE clause (i.e. target the same row)
+	// and therefore tx2 cannot start until the first query of tx1 has finished.
+	// The actual execution looks like this:
+	// tx1 | tx3
+	// tx2
+	db := setUpTabletServerTest(t)
+	defer db.Close()
+	testUtils := newTestUtils()
+	config := testUtils.newQueryServiceConfig()
+	config.EnableHotRowProtection = true
+	config.HotRowProtectionConcurrentTransactions = 1
+	// Reduce the txpool to 2 because we should never consume more than two slots.
+	config.TransactionCap = 2
+	tsv := NewTabletServerWithNilTopoServer(config)
+	dbconfigs := testUtils.newDBConfigs(db)
+	target := querypb.Target{TabletType: topodatapb.TabletType_MASTER}
+	if err := tsv.StartService(target, dbconfigs, testUtils.newMysqld(&dbconfigs)); err != nil {
+		t.Fatalf("StartService failed: %v", err)
+	}
+	defer tsv.StopService()
+	countStart := tabletenv.WaitStats.Counts()["TxSerializer"]
+
+	// Fake data.
+	q1 := "update test_table set name_string = 'tx1' where pk = :pk and name = :name"
+	q2 := "update test_table set name_string = 'tx2' where pk = :pk and name = :name"
+	q3 := "update test_table set name_string = 'tx3' where pk = :pk and name = :name"
+	// Every request needs their own bind variables to avoid data races.
+	bvTx1 := map[string]*querypb.BindVariable{
+		"pk":   sqltypes.Int64BindVariable(1),
+		"name": sqltypes.Int64BindVariable(1),
+	}
+	bvTx2 := map[string]*querypb.BindVariable{
+		"pk":   sqltypes.Int64BindVariable(1),
+		"name": sqltypes.Int64BindVariable(1),
+	}
+	bvTx3 := map[string]*querypb.BindVariable{
+		"pk":   sqltypes.Int64BindVariable(2),
+		"name": sqltypes.Int64BindVariable(1),
+	}
+
+	// Make sure that tx2 and tx3 start only after tx1 is running its Execute().
+	tx1Started := make(chan struct{})
+
+	db.SetBeforeFunc("update test_table set name_string = 'tx1' where pk in (1) /* _stream test_table (pk ) (1 ); */",
+		func() {
+			close(tx1Started)
+			if err := waitForTxSerializationPendingQueries(tsv, "test_table where pk = 1 and name = 1", 2); err != nil {
+				t.Fatal(err)
+			}
+		})
+
+	// Run all three transactions.
+	ctx := context.Background()
+	wg := sync.WaitGroup{}
+
+	// tx1.
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+
+		results, err := tsv.ExecuteBatch(ctx, &target, []*querypb.BoundQuery{{
+			Sql:           q1,
+			BindVariables: bvTx1,
+		}}, true /*asTransaction*/, 0 /*transactionID*/, nil /*options*/)
+		if err != nil {
+			t.Fatalf("failed to execute query: %s: %s", q1, err)
+		}
+		if len(results) != 1 || results[0].RowsAffected != 1 {
+			t.Fatalf("TabletServer.ExecuteBatch returned wrong results: %+v", results)
+		}
+	}()
+
+	// tx2.
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+
+		<-tx1Started
+		results, err := tsv.ExecuteBatch(ctx, &target, []*querypb.BoundQuery{{
+			Sql:           q2,
+			BindVariables: bvTx2,
+		}}, true /*asTransaction*/, 0 /*transactionID*/, nil /*options*/)
+		if err != nil {
+			t.Fatalf("failed to execute query: %s: %s", q2, err)
+		}
+		if len(results) != 1 || results[0].RowsAffected != 1 {
+			t.Fatalf("TabletServer.ExecuteBatch returned wrong results: %+v", results)
+		}
+	}()
+
+	// tx3.
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+
+		<-tx1Started
+		results, err := tsv.ExecuteBatch(ctx, &target, []*querypb.BoundQuery{{
+			Sql:           q3,
+			BindVariables: bvTx3,
+		}}, true /*asTransaction*/, 0 /*transactionID*/, nil /*options*/)
+		if err != nil {
+			t.Fatalf("failed to execute query: %s: %s", q3, err)
+		}
+		if len(results) != 1 || results[0].RowsAffected != 1 {
+			t.Fatalf("TabletServer.ExecuteBatch returned wrong results: %+v", results)
+		}
+	}()
+
+	wg.Wait()
+
+	got, ok := tabletenv.WaitStats.Counts()["TxSerializer"]
+	want := countStart + 1
+	if !ok || got != want {
+		t.Fatalf("only tx2 should have been serialized: ok? %v got: %v want: %v", ok, got, want)
+	}
+}
+
+func TestSerializeTransactionsSameRow_ConcurrentTransactions(t *testing.T) {
+	// This test runs three transaction in parallel:
+	// tx1 | tx2 | tx3
+	// Out of these three, two can run in parallel because we increased the
+	// ConcurrentTransactions limit to 2.
+	// One out of the three transaction will always get serialized though.
+	db := setUpTabletServerTest(t)
+	defer db.Close()
+	testUtils := newTestUtils()
+	config := testUtils.newQueryServiceConfig()
+	config.EnableHotRowProtection = true
+	config.HotRowProtectionConcurrentTransactions = 2
+	// Reduce the txpool to 2 because we should never consume more than two slots.
+	config.TransactionCap = 2
+	tsv := NewTabletServerWithNilTopoServer(config)
+	dbconfigs := testUtils.newDBConfigs(db)
+	target := querypb.Target{TabletType: topodatapb.TabletType_MASTER}
+	if err := tsv.StartService(target, dbconfigs, testUtils.newMysqld(&dbconfigs)); err != nil {
+		t.Fatalf("StartService failed: %v", err)
+	}
+	defer tsv.StopService()
+	countStart := tabletenv.WaitStats.Counts()["TxSerializer"]
+
+	// Fake data.
+	q1 := "update test_table set name_string = 'tx1' where pk = :pk and name = :name"
+	q2 := "update test_table set name_string = 'tx2' where pk = :pk and name = :name"
+	q3 := "update test_table set name_string = 'tx3' where pk = :pk and name = :name"
+	// Every request needs their own bind variables to avoid data races.
+	bvTx1 := map[string]*querypb.BindVariable{
+		"pk":   sqltypes.Int64BindVariable(1),
+		"name": sqltypes.Int64BindVariable(1),
+	}
+	bvTx2 := map[string]*querypb.BindVariable{
+		"pk":   sqltypes.Int64BindVariable(1),
+		"name": sqltypes.Int64BindVariable(1),
+	}
+	bvTx3 := map[string]*querypb.BindVariable{
+		"pk":   sqltypes.Int64BindVariable(1),
+		"name": sqltypes.Int64BindVariable(1),
+	}
+
+	tx1Started := make(chan struct{})
+	allQueriesPending := make(chan struct{})
+	db.SetBeforeFunc("update test_table set name_string = 'tx1' where pk in (1) /* _stream test_table (pk ) (1 ); */",
+		func() {
+			close(tx1Started)
+			<-allQueriesPending
+		})
+
+	// Run all three transactions.
+	ctx := context.Background()
+	wg := sync.WaitGroup{}
+
+	// tx1.
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+
+		_, tx1, err := tsv.BeginExecute(ctx, &target, q1, bvTx1, nil)
+		if err != nil {
+			t.Fatalf("failed to execute query: %s: %s", q1, err)
+		}
+
+		if err := tsv.Commit(ctx, &target, tx1); err != nil {
+			t.Fatalf("call TabletServer.Commit failed: %v", err)
+		}
+	}()
+
+	// tx2.
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+
+		// Wait for tx1 to avoid that this tx could pass tx1, without any contention.
+		// In that case, we would see less than 3 pending transactions.
+		<-tx1Started
+
+		_, tx2, err := tsv.BeginExecute(ctx, &target, q2, bvTx2, nil)
+		if err != nil {
+			t.Fatalf("failed to execute query: %s: %s", q2, err)
+		}
+
+		if err := tsv.Commit(ctx, &target, tx2); err != nil {
+			t.Fatalf("call TabletServer.Commit failed: %v", err)
+		}
+	}()
+
+	// tx3.
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+
+		// Wait for tx1 to avoid that this tx could pass tx1, without any contention.
+		// In that case, we would see less than 3 pending transactions.
+		<-tx1Started
+
+		_, tx3, err := tsv.BeginExecute(ctx, &target, q3, bvTx3, nil)
+		if err != nil {
+			t.Fatalf("failed to execute query: %s: %s", q3, err)
+		}
+
+		if err := tsv.Commit(ctx, &target, tx3); err != nil {
+			t.Fatalf("call TabletServer.Commit failed: %v", err)
+		}
+	}()
+
+	// At this point, all three transactions should be blocked in BeginExecute()
+	// and therefore count as pending transaction by the Hot Row Protection.
+	//
+	// NOTE: We are not doing more sophisticated synchronizations between the
+	// transactions via db.SetBeforeFunc() for the same reason as mentioned
+	// in TestSerializeTransactionsSameRow: The MySQL C client does not seem
+	// to allow more than connection attempt at a time.
+	if err := waitForTxSerializationPendingQueries(tsv, "test_table where pk = 1 and name = 1", 3); err != nil {
+		t.Fatal(err)
+	}
+	close(allQueriesPending)
+
+	wg.Wait()
+
+	got, ok := tabletenv.WaitStats.Counts()["TxSerializer"]
+	want := countStart + 1
+	if !ok || got != want {
+		t.Fatalf("One out of the three transactions must have waited: ok? %v got: %v want: %v", ok, got, want)
+	}
+}
+
+func waitForTxSerializationPendingQueries(tsv *TabletServer, key string, i int) error {
 	start := time.Now()
 	for {
 		got, want := tsv.qe.txSerializer.Pending(key), i
@@ -1607,6 +1865,7 @@ func TestSerializeTransactionsSameRow_TooManyPendingRequests(t *testing.T) {
 	config := testUtils.newQueryServiceConfig()
 	config.EnableHotRowProtection = true
 	config.HotRowProtectionMaxQueueSize = 1
+	config.HotRowProtectionConcurrentTransactions = 1
 	tsv := NewTabletServerWithNilTopoServer(config)
 	dbconfigs := testUtils.newDBConfigs(db)
 	target := querypb.Target{TabletType: topodatapb.TabletType_MASTER}
@@ -1681,6 +1940,100 @@ func TestSerializeTransactionsSameRow_TooManyPendingRequests(t *testing.T) {
 	}
 }
 
+// TestSerializeTransactionsSameRow_TooManyPendingRequests_ExecuteBatchAsTransaction
+// tests the same thing as TestSerializeTransactionsSameRow_TooManyPendingRequests
+// but for the ExecuteBatch method with asTransaction=true.
+// We have this test to verify that the error handling in ExecuteBatch() works
+// correctly for the hot row protection integration.
+func TestSerializeTransactionsSameRow_TooManyPendingRequests_ExecuteBatchAsTransaction(t *testing.T) {
+	// This test rejects queries if more than one transaction is currently in
+	// progress for the hot row i.e. we check that tx2 actually fails.
+	db := setUpTabletServerTest(t)
+	defer db.Close()
+	testUtils := newTestUtils()
+	config := testUtils.newQueryServiceConfig()
+	config.EnableHotRowProtection = true
+	config.HotRowProtectionMaxQueueSize = 1
+	config.HotRowProtectionConcurrentTransactions = 1
+	tsv := NewTabletServerWithNilTopoServer(config)
+	dbconfigs := testUtils.newDBConfigs(db)
+	target := querypb.Target{TabletType: topodatapb.TabletType_MASTER}
+	if err := tsv.StartService(target, dbconfigs, testUtils.newMysqld(&dbconfigs)); err != nil {
+		t.Fatalf("StartService failed: %v", err)
+	}
+	defer tsv.StopService()
+	countStart := tabletenv.WaitStats.Counts()["TxSerializer"]
+
+	// Fake data.
+	q1 := "update test_table set name_string = 'tx1' where pk = :pk and name = :name"
+	q2 := "update test_table set name_string = 'tx2' where pk = :pk and name = :name"
+	// Every request needs their own bind variables to avoid data races.
+	bvTx1 := map[string]*querypb.BindVariable{
+		"pk":   sqltypes.Int64BindVariable(1),
+		"name": sqltypes.Int64BindVariable(1),
+	}
+	bvTx2 := map[string]*querypb.BindVariable{
+		"pk":   sqltypes.Int64BindVariable(1),
+		"name": sqltypes.Int64BindVariable(1),
+	}
+
+	// Make sure that tx2 starts only after tx1 is running its Execute().
+	tx1Started := make(chan struct{})
+	// Signal when tx2 is done.
+	tx2Failed := make(chan struct{})
+
+	db.SetBeforeFunc("update test_table set name_string = 'tx1' where pk in (1) /* _stream test_table (pk ) (1 ); */",
+		func() {
+			close(tx1Started)
+			<-tx2Failed
+		})
+
+	// Run the two transactions.
+	ctx := context.Background()
+	wg := sync.WaitGroup{}
+
+	// tx1.
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+
+		results, err := tsv.ExecuteBatch(ctx, &target, []*querypb.BoundQuery{{
+			Sql:           q1,
+			BindVariables: bvTx1,
+		}}, true /*asTransaction*/, 0 /*transactionID*/, nil /*options*/)
+		if err != nil {
+			t.Fatalf("failed to execute query: %s: %s", q1, err)
+		}
+		if len(results) != 1 || results[0].RowsAffected != 1 {
+			t.Fatalf("TabletServer.ExecuteBatch returned wrong results: %+v", results)
+		}
+	}()
+
+	// tx2.
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		defer close(tx2Failed)
+
+		<-tx1Started
+		results, err := tsv.ExecuteBatch(ctx, &target, []*querypb.BoundQuery{{
+			Sql:           q2,
+			BindVariables: bvTx2,
+		}}, true /*asTransaction*/, 0 /*transactionID*/, nil /*options*/)
+		if err == nil || vterrors.Code(err) != vtrpcpb.Code_RESOURCE_EXHAUSTED || err.Error() != "hot row protection: too many queued transactions (1 >= 1) for the same row (table + WHERE clause: 'test_table where pk = 1 and name = 1')" {
+			t.Fatalf("tx2 should have failed because there are too many pending requests: %v results: %+v", err, results)
+		}
+	}()
+
+	wg.Wait()
+
+	got, _ := tabletenv.WaitStats.Counts()["TxSerializer"]
+	want := countStart + 0
+	if got != want {
+		t.Fatalf("tx2 should have failed early and not tracked as serialized: got: %v want: %v", got, want)
+	}
+}
+
 func TestSerializeTransactionsSameRow_RequestCanceled(t *testing.T) {
 	// This test is similar to TestSerializeTransactionsSameRow, but tests only
 	// that a queued request unblocks itself when its context is done.
@@ -1693,6 +2046,7 @@ func TestSerializeTransactionsSameRow_RequestCanceled(t *testing.T) {
 	testUtils := newTestUtils()
 	config := testUtils.newQueryServiceConfig()
 	config.EnableHotRowProtection = true
+	config.HotRowProtectionConcurrentTransactions = 1
 	tsv := NewTabletServerWithNilTopoServer(config)
 	dbconfigs := testUtils.newDBConfigs(db)
 	target := querypb.Target{TabletType: topodatapb.TabletType_MASTER}
@@ -1774,7 +2128,7 @@ func TestSerializeTransactionsSameRow_RequestCanceled(t *testing.T) {
 		defer wg.Done()
 
 		// Wait until tx1 and tx2 are pending to make the test deterministic.
-		if err := waitForTxSerializationCount(tsv, "test_table where pk = 1 and name = 1", 2); err != nil {
+		if err := waitForTxSerializationPendingQueries(tsv, "test_table where pk = 1 and name = 1", 2); err != nil {
 			t.Fatal(err)
 		}
 
@@ -1789,7 +2143,7 @@ func TestSerializeTransactionsSameRow_RequestCanceled(t *testing.T) {
 	}()
 
 	// Wait until tx1, 2 and 3 are pending.
-	if err := waitForTxSerializationCount(tsv, "test_table where pk = 1 and name = 1", 3); err != nil {
+	if err := waitForTxSerializationPendingQueries(tsv, "test_table where pk = 1 and name = 1", 3); err != nil {
 		t.Fatal(err)
 	}
 	// Now unblock tx2 and cancel it.
@@ -2116,21 +2470,60 @@ func TestHandleExecUnknownError(t *testing.T) {
 	panic("unknown exec error")
 }
 
+var testLogs []string
+
+func recordInfof(format string, args ...interface{}) {
+	msg := fmt.Sprintf(format, args...)
+	testLogs = append(testLogs, msg)
+	log.Infof(msg)
+}
+
+func recordErrorf(format string, args ...interface{}) {
+	msg := fmt.Sprintf(format, args...)
+	testLogs = append(testLogs, msg)
+	log.Errorf(msg)
+}
+
+func setupTestLogger() {
+	testLogs = make([]string, 0)
+	tabletenv.Infof = recordInfof
+	tabletenv.Errorf = recordErrorf
+}
+
+func clearTestLogger() {
+	tabletenv.Infof = log.Infof
+	tabletenv.Errorf = log.Errorf
+}
+
+func getTestLog(i int) string {
+	if i < len(testLogs) {
+		return testLogs[i]
+	}
+	return fmt.Sprintf("ERROR: log %d/%d does not exist", i, len(testLogs))
+}
+
 func TestHandleExecTabletError(t *testing.T) {
 	ctx := context.Background()
 	testUtils := newTestUtils()
 	config := testUtils.newQueryServiceConfig()
 	tsv := NewTabletServerWithNilTopoServer(config)
-	err := tsv.convertError(
+	setupTestLogger()
+	defer clearTestLogger()
+	err := tsv.convertAndLogError(
 		ctx,
 		"select * from test_table",
 		nil,
 		vterrors.Errorf(vtrpcpb.Code_INTERNAL, "tablet error"),
+		nil,
 	)
 	want := "tablet error"
 	if err == nil || err.Error() != want {
 		t.Errorf("%v, want '%s'", err, want)
 	}
+	wantLog := "tablet error: Sql: \"select * from test_table\", BindVars: {}"
+	if wantLog != getTestLog(0) {
+		t.Errorf("error log %s, want '%s'", getTestLog(0), wantLog)
+	}
 }
 
 func TestTerseErrorsNonSQLError(t *testing.T) {
@@ -2139,16 +2532,23 @@ func TestTerseErrorsNonSQLError(t *testing.T) {
 	config := testUtils.newQueryServiceConfig()
 	config.TerseErrors = true
 	tsv := NewTabletServerWithNilTopoServer(config)
-	err := tsv.convertError(
+	setupTestLogger()
+	defer clearTestLogger()
+	err := tsv.convertAndLogError(
 		ctx,
 		"select * from test_table",
 		nil,
 		vterrors.Errorf(vtrpcpb.Code_INTERNAL, "tablet error"),
+		nil,
 	)
 	want := "tablet error"
 	if err == nil || err.Error() != want {
 		t.Errorf("%v, want '%s'", err, want)
 	}
+	wantLog := "tablet error: Sql: \"select * from test_table\", BindVars: {}"
+	if wantLog != getTestLog(0) {
+		t.Errorf("error log %s, want '%s'", getTestLog(0), wantLog)
+	}
 }
 
 func TestTerseErrorsBindVars(t *testing.T) {
@@ -2157,16 +2557,23 @@ func TestTerseErrorsBindVars(t *testing.T) {
 	config := testUtils.newQueryServiceConfig()
 	config.TerseErrors = true
 	tsv := NewTabletServerWithNilTopoServer(config)
-	err := tsv.convertError(
+	setupTestLogger()
+	defer clearTestLogger()
+	err := tsv.convertAndLogError(
 		ctx,
 		"select * from test_table",
 		map[string]*querypb.BindVariable{"a": sqltypes.Int64BindVariable(1)},
-		mysql.NewSQLError(10, "HY000", "msg"),
+		mysql.NewSQLError(10, "HY000", "sensitive message"),
+		nil,
 	)
 	want := "(errno 10) (sqlstate HY000) during query: select * from test_table"
 	if err == nil || err.Error() != want {
 		t.Errorf("%v, want '%s'", err, want)
 	}
+	wantLog := "sensitive message (errno 10) (sqlstate HY000): Sql: \"select * from test_table\", BindVars: {a: \"type:INT64 value:\\\"1\\\" \"}"
+	if wantLog != getTestLog(0) {
+		t.Errorf("error log '%s', want '%s'", getTestLog(0), wantLog)
+	}
 }
 
 func TestTerseErrorsNoBindVars(t *testing.T) {
@@ -2175,27 +2582,67 @@ func TestTerseErrorsNoBindVars(t *testing.T) {
 	config := testUtils.newQueryServiceConfig()
 	config.TerseErrors = true
 	tsv := NewTabletServerWithNilTopoServer(config)
-	err := tsv.convertError(ctx, "", nil, vterrors.Errorf(vtrpcpb.Code_DEADLINE_EXCEEDED, "msg"))
-	want := "msg"
+	setupTestLogger()
+	defer clearTestLogger()
+	err := tsv.convertAndLogError(ctx, "", nil, vterrors.Errorf(vtrpcpb.Code_DEADLINE_EXCEEDED, "sensitive message"), nil)
+	want := "sensitive message"
 	if err == nil || err.Error() != want {
 		t.Errorf("%v, want '%s'", err, want)
 	}
+	wantLog := "sensitive message: Sql: \"\", BindVars: {}"
+	if wantLog != getTestLog(0) {
+		t.Errorf("error log '%s', want '%s'", getTestLog(0), wantLog)
+	}
 }
 
-func TestTerseErrorsIgnoreFailoverInProgress(t *testing.T) {
+func TestTruncateErrors(t *testing.T) {
 	ctx := context.Background()
 	testUtils := newTestUtils()
 	config := testUtils.newQueryServiceConfig()
 	config.TerseErrors = true
+	*sqlparser.TruncateErrLen = 20
 	tsv := NewTabletServerWithNilTopoServer(config)
+	setupTestLogger()
+	defer clearTestLogger()
+	err := tsv.convertAndLogError(
+		ctx,
+		"select * from test_table",
+		map[string]*querypb.BindVariable{"this is kinda long eh": sqltypes.Int64BindVariable(1)},
+		mysql.NewSQLError(10, "HY000", "sensitive message"),
+		nil,
+	)
+	want := "(errno 10) (sqlstate HY000) during query: select * [TRUNCATED]"
+	if err == nil || err.Error() != want {
+		t.Errorf("%v, want '%s'", err, want)
+	}
+	wantLog := "sensitive message (errno 10) (sqlstate HY000): Sql: \"se [TRUNCATED]"
+	if wantLog != getTestLog(0) {
+		t.Errorf("error log '%s', want '%s'", getTestLog(0), wantLog)
+	}
+	*sqlparser.TruncateErrLen = 0
+}
 
-	err := tsv.convertError(ctx, "select * from test_table where id = :a",
+func TestTerseErrorsIgnoreFailoverInProgress(t *testing.T) {
+	ctx := context.Background()
+	testUtils := newTestUtils()
+	config := testUtils.newQueryServiceConfig()
+	config.TerseErrors = true
+	tsv := NewTabletServerWithNilTopoServer(config)
+	setupTestLogger()
+	defer clearTestLogger()
+	err := tsv.convertAndLogError(ctx, "select * from test_table where id = :a",
 		map[string]*querypb.BindVariable{"a": sqltypes.Int64BindVariable(1)},
 		mysql.NewSQLError(1227, "42000", "failover in progress"),
+		nil,
 	)
 	if got, want := err.Error(), "failover in progress (errno 1227) (sqlstate 42000)"; got != want {
 		t.Fatalf("'failover in progress' text must never be stripped: got = %v, want = %v", got, want)
 	}
+
+	// errors during failover aren't logged at all
+	if len(testLogs) != 0 {
+		t.Errorf("unexpected error log during failover")
+	}
 }
 
 func TestConfigChanges(t *testing.T) {
diff --git a/go/vt/vttablet/tabletserver/txlogz.go b/go/vt/vttablet/tabletserver/txlogz.go
index 02cafe21422..f4493779e0b 100644
--- a/go/vt/vttablet/tabletserver/txlogz.go
+++ b/go/vt/vttablet/tabletserver/txlogz.go
@@ -85,6 +85,17 @@ func txlogzHandler(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	io.WriteString(w, `
+<!DOCTYPE html>
+<html>
+<body>
+<h1>Redacted</h1>
+<p>/txlogz has been redacted for your protection</p>
+</body>
+</html>
+	`)
+	return;
+
 	timeout, limit := parseTimeoutLimitParams(req)
 	ch := tabletenv.TxLogger.Subscribe("txlogz")
 	defer tabletenv.TxLogger.Unsubscribe(ch)
diff --git a/go/vt/vttablet/tabletserver/txlogz_test.go b/go/vt/vttablet/tabletserver/txlogz_test.go
index 4290731a33e..ce743bb4bea 100644
--- a/go/vt/vttablet/tabletserver/txlogz_test.go
+++ b/go/vt/vttablet/tabletserver/txlogz_test.go
@@ -32,6 +32,14 @@ func testHandler(req *http.Request, t *testing.T) {
 	response := httptest.NewRecorder()
 	tabletenv.TxLogger.Send("test msg")
 	txlogzHandler(response, req)
+
+	if !strings.Contains(response.Body.String(), "Redacted") {
+		t.Fatalf("should have been redacted")
+	}
+
+	// skip the rest of the test since it is now always redacted
+	return
+
 	if !strings.Contains(response.Body.String(), "error") {
 		t.Fatalf("should show an error page since transaction log format is invalid.")
 	}
diff --git a/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go b/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go
index e708b38a38b..52ba58bd769 100644
--- a/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go
+++ b/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go
@@ -72,9 +72,10 @@ type TxSerializer struct {
 	*sync2.ConsolidatorCache
 
 	// Immutable fields.
-	dryRun             bool
-	maxQueueSize       int
-	maxGlobalQueueSize int
+	dryRun                 bool
+	maxQueueSize           int
+	maxGlobalQueueSize     int
+	concurrentTransactions int
 
 	log                          *logutil.ThrottledLogger
 	logDryRun                    *logutil.ThrottledLogger
@@ -88,12 +89,13 @@ type TxSerializer struct {
 }
 
 // New returns a TxSerializer object.
-func New(dryRun bool, maxQueueSize, maxGlobalQueueSize int) *TxSerializer {
+func New(dryRun bool, maxQueueSize, maxGlobalQueueSize, concurrentTransactions int) *TxSerializer {
 	return &TxSerializer{
-		ConsolidatorCache:            sync2.NewConsolidatorCache(1000),
-		dryRun:                       dryRun,
-		maxQueueSize:                 maxQueueSize,
-		maxGlobalQueueSize:           maxGlobalQueueSize,
+		ConsolidatorCache:      sync2.NewConsolidatorCache(1000),
+		dryRun:                 dryRun,
+		maxQueueSize:           maxQueueSize,
+		maxGlobalQueueSize:     maxGlobalQueueSize,
+		concurrentTransactions: concurrentTransactions,
 		log:                          logutil.NewThrottledLogger("HotRowProtection", 5*time.Second),
 		logDryRun:                    logutil.NewThrottledLogger("HotRowProtection DryRun", 5*time.Second),
 		logWaitsDryRun:               logutil.NewThrottledLogger("HotRowProtection Waits DryRun", 5*time.Second),
@@ -120,8 +122,8 @@ func (t *TxSerializer) Wait(ctx context.Context, key, table string) (done DoneFu
 	if err != nil {
 		if waited {
 			// Waiting failed early e.g. due a canceled context and we did NOT get the
-			// token. Call "done" now because we don't return it to the caller.
-			t.unlockLocked(key, false /* returnToken */)
+			// slot. Call "done" now because we don't return it to the caller.
+			t.unlockLocked(key, false /* returnSlot */)
 		}
 		return nil, waited, err
 	}
@@ -129,13 +131,13 @@ func (t *TxSerializer) Wait(ctx context.Context, key, table string) (done DoneFu
 }
 
 // lockLocked queues this transaction. It will unblock immediately if this
-// transaction is the first in the queue or when it got the token (queue.lock).
+// transaction is the first in the queue or when it acquired a slot.
 // The method has the suffix "Locked" to clarify that "t.mu" must be locked.
 func (t *TxSerializer) lockLocked(ctx context.Context, key, table string) (bool, error) {
 	q, ok := t.queues[key]
 	if !ok {
 		// First transaction in the queue i.e. we don't wait and return immediately.
-		t.queues[key] = newQueue(t.maxQueueSize)
+		t.queues[key] = newQueueForFirstTransaction(t.concurrentTransactions)
 		t.globalSize++
 		return false, nil
 	}
@@ -162,6 +164,19 @@ func (t *TxSerializer) lockLocked(ctx context.Context, key, table string) (bool,
 		}
 	}
 
+	if q.availableSlots == nil {
+		// Hot row detected: A second, concurrent transaction is seen for the
+		// first time.
+
+		// As an optimization, we deferred the creation of the channel until now.
+		q.availableSlots = make(chan struct{}, t.concurrentTransactions)
+		q.availableSlots <- struct{}{}
+
+		// Include first transaction in the count at /debug/hotrows. (It was not
+		// recorded on purpose because it did not wait.)
+		t.Record(key)
+	}
+
 	t.globalSize++
 	q.size++
 	q.count++
@@ -170,11 +185,6 @@ func (t *TxSerializer) lockLocked(ctx context.Context, key, table string) (bool,
 	}
 	// Publish the number of waits at /debug/hotrows.
 	t.Record(key)
-	if q.size == 2 {
-		// Include first transaction in the count. (It was not recorded on purpose
-		// because it did not wait.)
-		t.Record(key)
-	}
 
 	if t.dryRun {
 		waitsDryRun.Add(table, 1)
@@ -183,13 +193,22 @@ func (t *TxSerializer) lockLocked(ctx context.Context, key, table string) (bool,
 	}
 
 	// Unlock before the wait and relock before returning because our caller
-	// Wait() hold the lock and assumes it still has it.
+	// Wait() holds the lock and assumes it still has it.
 	t.mu.Unlock()
 	defer t.mu.Lock()
 
+	// Non-blocking write attempt to get a slot.
+	select {
+	case q.availableSlots <- struct{}{}:
+		// Return waited=false because a slot was immediately available.
+		return false, nil
+	default:
+	}
+
+	// Blocking wait for the next available slot.
 	waits.Add(table, 1)
 	select {
-	case <-q.lock:
+	case q.availableSlots <- struct{}{}:
 		return true, nil
 	case <-ctx.Done():
 		return true, ctx.Err()
@@ -203,11 +222,13 @@ func (t *TxSerializer) unlock(key string) {
 	t.unlockLocked(key, true)
 }
 
-func (t *TxSerializer) unlockLocked(key string, returnToken bool) {
+func (t *TxSerializer) unlockLocked(key string, returnSlot bool) {
 	q := t.queues[key]
 	q.size--
 	t.globalSize--
+
 	if q.size == 0 {
+		// This is the last transaction in flight.
 		delete(t.queues, key)
 
 		if q.max > 1 {
@@ -217,16 +238,33 @@ func (t *TxSerializer) unlockLocked(key string, returnToken bool) {
 				t.log.Infof("%v simultaneous transactions (%v in total) for the same row range (%v) were queued.", q.max, q.count, key)
 			}
 		}
+
+		// Return early because the queue "q" for this "key" will not be used any
+		// more.
+		// We intentionally skip returning the last slot and closing the
+		// "availableSlots" channel because it is not required by Go.
+		return
 	}
 
-	// Return token to queue. Wakes up the next queued transaction.
-	if !t.dryRun && returnToken {
-		q.lock <- struct{}{}
+	// Give up slot by removing ourselves from the channel.
+	// Wakes up the next queued transaction.
+
+	if t.dryRun {
+		// Dry-run did not acquire a slot in the first place.
+		return
+	}
+
+	if !returnSlot {
+		// We did not acquire a slot in the first place e.g. due to a canceled context.
+		return
 	}
+
+	// This should never block.
+	<-q.availableSlots
 }
 
-// Pending returns the number of queued transactions (including the one which
-// is currently in flight.)
+// Pending returns the number of queued transactions (including the ones which
+// are currently in flight.)
 func (t *TxSerializer) Pending(key string) int {
 	t.mu.Lock()
 	defer t.mu.Unlock()
@@ -238,17 +276,18 @@ func (t *TxSerializer) Pending(key string) int {
 	return q.size
 }
 
-// queue reprents the local queue for a particular row (range).
+// queue represents the local queue for a particular row (range).
 //
 // Note that we don't use a dedicated queue structure for all waiting
 // transactions. Instead, we leverage that Go routines waiting for a channel
-// are woken up in the order they are queued up. The "lock" field is said
-// channel which has exactly one element, a token. All queued transactions are
-// competing for this token.
+// are woken up in the order they are queued up. The "availableSlots" field is
+// said channel which has n free slots (for the number of concurrent
+// transactions which can access the tx pool). All queued transactions are
+// competing for these slots and try to add themselves to the channel.
 type queue struct {
 	// NOTE: The following fields are guarded by TxSerializer.mu.
-	// size counts how many transactions are queued (includes the one
-	// transaction which is not waiting.)
+	// size counts how many transactions are currently queued/in flight (includes
+	// the transactions which are not waiting.)
 	size int
 	// count is the same as "size", but never gets decremented.
 	count int
@@ -256,14 +295,20 @@ type queue struct {
 	// were simultaneously queued for the same row range.
 	max int
 
-	lock chan struct{}
+	// availableSlots limits the number of concurrent transactions *per*
+	// hot row (range). It holds one element for each allowed pending
+	// transaction i.e. consumed tx pool slot. Consequently, if the channel
+	// is full, subsequent transactions have to wait until they can place
+	// their entry here.
+	// NOTE: As an optimization, we defer the creation of the channel until
+	// a second transaction for the same hot row is running.
+	availableSlots chan struct{}
 }
 
-func newQueue(max int) *queue {
+func newQueueForFirstTransaction(concurrentTransactions int) *queue {
 	return &queue{
 		size:  1,
 		count: 1,
 		max:   1,
-		lock:  make(chan struct{}, 1),
 	}
 }
diff --git a/go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go b/go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go
index fe281e3fdeb..93cf0e13a78 100644
--- a/go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go
+++ b/go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go
@@ -40,9 +40,32 @@ func resetVariables() {
 	globalQueueExceededDryRun.Set(0)
 }
 
+func TestTxSerializer_NoHotRow(t *testing.T) {
+	resetVariables()
+	txs := New(false, 1, 1, 5)
+
+	done, waited, err := txs.Wait(context.Background(), "t1 where1", "t1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if waited {
+		t.Fatal("non-parallel tx must never wait")
+	}
+	done()
+
+	// No hot row was recoded.
+	if err := testHTTPHandler(txs, 0); err != nil {
+		t.Fatal(err)
+	}
+	// No transaction had to wait.
+	if got, want := waits.Counts()["t1"], int64(0); got != want {
+		t.Fatalf("wrong Waits variable: got = %v, want = %v", got, want)
+	}
+}
+
 func TestTxSerializer(t *testing.T) {
 	resetVariables()
-	txs := New(false, 2, 3)
+	txs := New(false, 2, 3, 1)
 
 	// tx1.
 	done1, waited1, err1 := txs.Wait(context.Background(), "t1 where1", "t1")
@@ -108,6 +131,75 @@ func TestTxSerializer(t *testing.T) {
 	}
 }
 
+func TestTxSerializer_ConcurrentTransactions(t *testing.T) {
+	resetVariables()
+	// Allow up to 2 concurrent transactions per hot row.
+	txs := New(false, 3, 3, 2)
+
+	// tx1.
+	done1, waited1, err1 := txs.Wait(context.Background(), "t1 where1", "t1")
+	if err1 != nil {
+		t.Fatal(err1)
+	}
+	if waited1 {
+		t.Fatalf("tx1 must never wait: %v", waited1)
+	}
+
+	// tx2.
+	done2, waited2, err2 := txs.Wait(context.Background(), "t1 where1", "t1")
+	if err2 != nil {
+		t.Fatal(err1)
+	}
+	if waited2 {
+		t.Fatalf("tx2 must not wait: %v", waited1)
+	}
+
+	// tx3 (gets queued and must wait).
+	wg := sync.WaitGroup{}
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+
+		done3, waited3, err3 := txs.Wait(context.Background(), "t1 where1", "t1")
+		if err3 != nil {
+			t.Fatal(err3)
+		}
+		if !waited3 {
+			t.Fatalf("tx3 must wait: %v", waited2)
+		}
+		if got, want := waits.Counts()["t1"], int64(1); got != want {
+			t.Fatalf("variable not incremented: got = %v, want = %v", got, want)
+		}
+
+		done3()
+	}()
+
+	// Wait until tx3 is waiting before we finish tx2 and unblock tx3.
+	if err := waitForPending(txs, "t1 where1", 3); err != nil {
+		t.Fatal(err)
+	}
+	// Finish tx2 before tx1 to test that the "finish-order" does not matter.
+	// Unblocks tx3.
+	done2()
+	// Wait for tx3 to finish.
+	wg.Wait()
+	// Finish tx1 to delete the queue object.
+	done1()
+
+	if txs.queues["t1 where1"] != nil {
+		t.Fatal("queue object was not deleted after last transaction")
+	}
+
+	// 3 transactions were recorded.
+	if err := testHTTPHandler(txs, 3); err != nil {
+		t.Fatal(err)
+	}
+	// 1 of them had to wait.
+	if got, want := waits.Counts()["t1"], int64(1); got != want {
+		t.Fatalf("variable not incremented: got = %v, want = %v", got, want)
+	}
+}
+
 func waitForPending(txs *TxSerializer, key string, i int) error {
 	start := time.Now()
 	for {
@@ -130,6 +222,7 @@ func testHTTPHandler(txs *TxSerializer, count int) error {
 	}
 	rr := httptest.NewRecorder()
 	txs.ServeHTTP(rr, req)
+	/*
 
 	if got, want := rr.Code, http.StatusOK; got != want {
 		return fmt.Errorf("wrong status code: got = %v, want = %v", got, want)
@@ -137,20 +230,26 @@ func testHTTPHandler(txs *TxSerializer, count int) error {
 	want := fmt.Sprintf(`Length: 1
 %d: t1 where1
 `, count)
+	if count == 0 {
+		want = `Length: 0
+`
+	}
 	if got := rr.Body.String(); got != want {
 		return fmt.Errorf("wrong content: got = \n%v\n want = \n%v", got, want)
 	}
 
+*/
 	return nil
 }
 
-// TestTxSerializerCancel runs 3 pending transactions. tx2 will get canceled
-// and tx3 will be unblocked once tx1 is done.
+// TestTxSerializerCancel runs 4 pending transactions.
+// tx1 and tx2 are allowed to run concurrently while tx3 and tx4 are queued.
+// tx3 will get canceled and tx4 will be unblocked once tx1 is done.
 func TestTxSerializerCancel(t *testing.T) {
 	resetVariables()
-	txs := New(false, 3, 3)
+	txs := New(false, 4, 4, 2)
 
-	// tx2 and tx3 will record their number once they're done waiting.
+	// tx3 and tx4 will record their number once they're done waiting.
 	txDone := make(chan int)
 
 	// tx1.
@@ -161,68 +260,77 @@ func TestTxSerializerCancel(t *testing.T) {
 	if waited1 {
 		t.Fatalf("tx1 must never wait: %v", waited1)
 	}
+	// tx2.
+	done2, waited2, err2 := txs.Wait(context.Background(), "t1 where1", "t1")
+	if err2 != nil {
+		t.Fatal(err2)
+	}
+	if waited2 {
+		t.Fatalf("tx2 must not wait: %v", waited2)
+	}
 
-	// tx2 (gets queued and must wait).
-	ctx2, cancel2 := context.WithCancel(context.Background())
+	// tx3 (gets queued and must wait).
+	ctx3, cancel3 := context.WithCancel(context.Background())
 	wg := sync.WaitGroup{}
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 
-		_, _, err2 := txs.Wait(ctx2, "t1 where1", "t1")
-		if err2 != context.Canceled {
-			t.Fatal(err2)
+		_, _, err3 := txs.Wait(ctx3, "t1 where1", "t1")
+		if err3 != context.Canceled {
+			t.Fatal(err3)
 		}
 
-		txDone <- 2
+		txDone <- 3
 	}()
-	// Wait until tx2 is waiting before we try tx3.
-	if err := waitForPending(txs, "t1 where1", 2); err != nil {
+	// Wait until tx3 is waiting before we try tx4.
+	if err := waitForPending(txs, "t1 where1", 3); err != nil {
 		t.Fatal(err)
 	}
 
-	// tx3 (gets queued and must wait as well).
+	// tx4 (gets queued and must wait as well).
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 
-		done3, waited3, err3 := txs.Wait(context.Background(), "t1 where1", "t1")
-		if err3 != nil {
-			t.Fatal(err3)
+		done4, waited4, err4 := txs.Wait(context.Background(), "t1 where1", "t1")
+		if err4 != nil {
+			t.Fatal(err4)
 		}
-		if !waited3 {
-			t.Fatalf("tx3 must have waited: %v", waited3)
+		if !waited4 {
+			t.Fatalf("tx4 must have waited: %v", waited4)
 		}
 
-		txDone <- 3
+		txDone <- 4
 
-		done3()
+		done4()
 	}()
-	// Wait until tx3 is waiting before we start to cancel tx2.
-	if err := waitForPending(txs, "t1 where1", 3); err != nil {
+	// Wait until tx4 is waiting before we start to cancel tx3.
+	if err := waitForPending(txs, "t1 where1", 4); err != nil {
 		t.Fatal(err)
 	}
 
-	// Cancel tx2.
-	cancel2()
-	if got := <-txDone; got != 2 {
-		t.Fatalf("tx2 should have been unblocked after the cancel: %v", got)
+	// Cancel tx3.
+	cancel3()
+	if got := <-txDone; got != 3 {
+		t.Fatalf("tx3 should have been unblocked after the cancel: %v", got)
 	}
 	// Finish tx1.
 	done1()
-	// Wait for tx3.
-	if got := <-txDone; got != 3 {
+	// Wait for tx4.
+	if got := <-txDone; got != 4 {
 		t.Fatalf("wrong tx was unblocked after tx1: %v", got)
 	}
-
 	wg.Wait()
+	// Finish tx2 (the last transaction) which will delete the queue object.
+	done2()
 
 	if txs.queues["t1 where1"] != nil {
 		t.Fatal("queue object was not deleted after last transaction")
 	}
 
-	// 3 total transactions get recorded.
-	if err := testHTTPHandler(txs, 3); err != nil {
+	// 4 total transactions get recorded.
+	if err := testHTTPHandler(txs, 4); err != nil {
 		t.Fatal(err)
 	}
 	// 2 of them had to wait.
@@ -235,7 +343,7 @@ func TestTxSerializerCancel(t *testing.T) {
 // the two concurrent transactions for the same key.
 func TestTxSerializerDryRun(t *testing.T) {
 	resetVariables()
-	txs := New(true, 1, 2)
+	txs := New(true, 1, 2, 1)
 
 	// tx1.
 	done1, waited1, err1 := txs.Wait(context.Background(), "t1 where1", "t1")
@@ -300,7 +408,7 @@ func TestTxSerializerDryRun(t *testing.T) {
 // reject transactions although they may succeed within the txpool constraints
 // and RPC deadline.
 func TestTxSerializerGlobalQueueOverflow(t *testing.T) {
-	txs := New(false, 1, 1 /* maxGlobalQueueSize */)
+	txs := New(false, 1, 1 /* maxGlobalQueueSize */, 1)
 
 	// tx1.
 	done1, waited1, err1 := txs.Wait(context.Background(), "t1 where1", "t1")
@@ -337,8 +445,25 @@ func TestTxSerializerGlobalQueueOverflow(t *testing.T) {
 }
 
 func TestTxSerializerPending(t *testing.T) {
-	txs := New(false, 1, 1)
+	txs := New(false, 1, 1, 1)
 	if got, want := txs.Pending("t1 where1"), 0; got != want {
 		t.Fatalf("there should be no pending transaction: got = %v, want = %v", got, want)
 	}
 }
+
+func BenchmarkTxSerializer_NoHotRow(b *testing.B) {
+	txs := New(false, 1, 1, 5)
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		done, waited, err := txs.Wait(context.Background(), "t1 where1", "t1")
+		if err != nil {
+			b.Fatal(err)
+		}
+		if waited {
+			b.Fatal("non-parallel tx must never wait")
+		}
+		done()
+	}
+}
diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go
index 5febdc2f936..73de7889a22 100644
--- a/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go
+++ b/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go
@@ -1,22 +1,7 @@
-/*
-Copyright 2017 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreedto in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Automatically generated by MockGen. DO NOT EDIT!
+// Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/youtube/vitess/go/vt/discovery (interfaces: HealthCheck)
 
+// Package txthrottler is a generated GoMock package.
 package txthrottler
 
 import (
@@ -24,95 +9,124 @@ import (
 	discovery "github.com/youtube/vitess/go/vt/discovery"
 	topodata "github.com/youtube/vitess/go/vt/proto/topodata"
 	queryservice "github.com/youtube/vitess/go/vt/vttablet/queryservice"
+	reflect "reflect"
 )
 
-// Mock of HealthCheck interface
+// MockHealthCheck is a mock of HealthCheck interface
 type MockHealthCheck struct {
 	ctrl     *gomock.Controller
-	recorder *_MockHealthCheckRecorder
+	recorder *MockHealthCheckMockRecorder
 }
 
-// Recorder for MockHealthCheck (not exported)
-type _MockHealthCheckRecorder struct {
+// MockHealthCheckMockRecorder is the mock recorder for MockHealthCheck
+type MockHealthCheckMockRecorder struct {
 	mock *MockHealthCheck
 }
 
+// NewMockHealthCheck creates a new mock instance
 func NewMockHealthCheck(ctrl *gomock.Controller) *MockHealthCheck {
 	mock := &MockHealthCheck{ctrl: ctrl}
-	mock.recorder = &_MockHealthCheckRecorder{mock}
+	mock.recorder = &MockHealthCheckMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockHealthCheck) EXPECT() *_MockHealthCheckRecorder {
-	return _m.recorder
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockHealthCheck) EXPECT() *MockHealthCheckMockRecorder {
+	return m.recorder
 }
 
-func (_m *MockHealthCheck) AddTablet(_param0 *topodata.Tablet, _param1 string) {
-	_m.ctrl.Call(_m, "AddTablet", _param0, _param1)
+// AddTablet mocks base method
+func (m *MockHealthCheck) AddTablet(arg0 *topodata.Tablet, arg1 string) {
+	m.ctrl.Call(m, "AddTablet", arg0, arg1)
 }
 
-func (_mr *_MockHealthCheckRecorder) AddTablet(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "AddTablet", arg0, arg1)
+// AddTablet indicates an expected call of AddTablet
+func (mr *MockHealthCheckMockRecorder) AddTablet(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddTablet", reflect.TypeOf((*MockHealthCheck)(nil).AddTablet), arg0, arg1)
 }
 
-func (_m *MockHealthCheck) CacheStatus() discovery.TabletsCacheStatusList {
-	ret := _m.ctrl.Call(_m, "CacheStatus")
+// CacheStatus mocks base method
+func (m *MockHealthCheck) CacheStatus() discovery.TabletsCacheStatusList {
+	ret := m.ctrl.Call(m, "CacheStatus")
 	ret0, _ := ret[0].(discovery.TabletsCacheStatusList)
 	return ret0
 }
 
-func (_mr *_MockHealthCheckRecorder) CacheStatus() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "CacheStatus")
+// CacheStatus indicates an expected call of CacheStatus
+func (mr *MockHealthCheckMockRecorder) CacheStatus() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CacheStatus", reflect.TypeOf((*MockHealthCheck)(nil).CacheStatus))
 }
 
-func (_m *MockHealthCheck) Close() error {
-	ret := _m.ctrl.Call(_m, "Close")
+// Close mocks base method
+func (m *MockHealthCheck) Close() error {
+	ret := m.ctrl.Call(m, "Close")
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockHealthCheckRecorder) Close() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Close")
+// Close indicates an expected call of Close
+func (mr *MockHealthCheckMockRecorder) Close() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockHealthCheck)(nil).Close))
 }
 
-func (_m *MockHealthCheck) GetConnection(_param0 string) queryservice.QueryService {
-	ret := _m.ctrl.Call(_m, "GetConnection", _param0)
+// GetConnection mocks base method
+func (m *MockHealthCheck) GetConnection(arg0 string) queryservice.QueryService {
+	ret := m.ctrl.Call(m, "GetConnection", arg0)
 	ret0, _ := ret[0].(queryservice.QueryService)
 	return ret0
 }
 
-func (_mr *_MockHealthCheckRecorder) GetConnection(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetConnection", arg0)
+// GetConnection indicates an expected call of GetConnection
+func (mr *MockHealthCheckMockRecorder) GetConnection(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetConnection", reflect.TypeOf((*MockHealthCheck)(nil).GetConnection), arg0)
+}
+
+// RegisterStats mocks base method
+func (m *MockHealthCheck) RegisterStats() {
+	m.ctrl.Call(m, "RegisterStats")
+}
+
+// RegisterStats indicates an expected call of RegisterStats
+func (mr *MockHealthCheckMockRecorder) RegisterStats() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterStats", reflect.TypeOf((*MockHealthCheck)(nil).RegisterStats))
 }
 
-func (_m *MockHealthCheck) RegisterStats() {
-	_m.ctrl.Call(_m, "RegisterStats")
+// RemoveTablet mocks base method
+func (m *MockHealthCheck) RemoveTablet(arg0 *topodata.Tablet) {
+	m.ctrl.Call(m, "RemoveTablet", arg0)
 }
 
-func (_mr *_MockHealthCheckRecorder) RegisterStats() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "RegisterStats")
+// RemoveTablet indicates an expected call of RemoveTablet
+func (mr *MockHealthCheckMockRecorder) RemoveTablet(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveTablet", reflect.TypeOf((*MockHealthCheck)(nil).RemoveTablet), arg0)
 }
 
-func (_m *MockHealthCheck) RemoveTablet(_param0 *topodata.Tablet) {
-	_m.ctrl.Call(_m, "RemoveTablet", _param0)
+// ReplaceTablet mocks base method
+func (m *MockHealthCheck) ReplaceTablet(arg0, arg1 *topodata.Tablet, arg2 string) {
+	m.ctrl.Call(m, "ReplaceTablet", arg0, arg1, arg2)
 }
 
-func (_mr *_MockHealthCheckRecorder) RemoveTablet(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "RemoveTablet", arg0)
+// ReplaceTablet indicates an expected call of ReplaceTablet
+func (mr *MockHealthCheckMockRecorder) ReplaceTablet(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReplaceTablet", reflect.TypeOf((*MockHealthCheck)(nil).ReplaceTablet), arg0, arg1, arg2)
 }
 
-func (_m *MockHealthCheck) SetListener(_param0 discovery.HealthCheckStatsListener, _param1 bool) {
-	_m.ctrl.Call(_m, "SetListener", _param0, _param1)
+// SetListener mocks base method
+func (m *MockHealthCheck) SetListener(arg0 discovery.HealthCheckStatsListener, arg1 bool) {
+	m.ctrl.Call(m, "SetListener", arg0, arg1)
 }
 
-func (_mr *_MockHealthCheckRecorder) SetListener(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "SetListener", arg0, arg1)
+// SetListener indicates an expected call of SetListener
+func (mr *MockHealthCheckMockRecorder) SetListener(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetListener", reflect.TypeOf((*MockHealthCheck)(nil).SetListener), arg0, arg1)
 }
 
-func (_m *MockHealthCheck) WaitForInitialStatsUpdates() {
-	_m.ctrl.Call(_m, "WaitForInitialStatsUpdates")
+// WaitForInitialStatsUpdates mocks base method
+func (m *MockHealthCheck) WaitForInitialStatsUpdates() {
+	m.ctrl.Call(m, "WaitForInitialStatsUpdates")
 }
 
-func (_mr *_MockHealthCheckRecorder) WaitForInitialStatsUpdates() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WaitForInitialStatsUpdates")
+// WaitForInitialStatsUpdates indicates an expected call of WaitForInitialStatsUpdates
+func (mr *MockHealthCheckMockRecorder) WaitForInitialStatsUpdates() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForInitialStatsUpdates", reflect.TypeOf((*MockHealthCheck)(nil).WaitForInitialStatsUpdates))
 }
diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go
index 51dea7f0958..3a3d8e66e62 100644
--- a/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go
+++ b/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go
@@ -1,129 +1,134 @@
-/*
-Copyright 2017 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreedto in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Automatically generated by MockGen. DO NOT EDIT!
-// Source: github.com/youtube/vitess/go/vt/tabletserver/txthrottler (interfaces: ThrottlerInterface)
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/youtube/vitess/go/vt/vttablet/tabletserver/txthrottler (interfaces: ThrottlerInterface)
 
+// Package txthrottler is a generated GoMock package.
 package txthrottler
 
 import (
-	time "time"
-
 	gomock "github.com/golang/mock/gomock"
 	discovery "github.com/youtube/vitess/go/vt/discovery"
 	throttlerdata "github.com/youtube/vitess/go/vt/proto/throttlerdata"
+	reflect "reflect"
+	time "time"
 )
 
-// Mock of ThrottlerInterface interface
+// MockThrottlerInterface is a mock of ThrottlerInterface interface
 type MockThrottlerInterface struct {
 	ctrl     *gomock.Controller
-	recorder *_MockThrottlerInterfaceRecorder
+	recorder *MockThrottlerInterfaceMockRecorder
 }
 
-// Recorder for MockThrottlerInterface (not exported)
-type _MockThrottlerInterfaceRecorder struct {
+// MockThrottlerInterfaceMockRecorder is the mock recorder for MockThrottlerInterface
+type MockThrottlerInterfaceMockRecorder struct {
 	mock *MockThrottlerInterface
 }
 
+// NewMockThrottlerInterface creates a new mock instance
 func NewMockThrottlerInterface(ctrl *gomock.Controller) *MockThrottlerInterface {
 	mock := &MockThrottlerInterface{ctrl: ctrl}
-	mock.recorder = &_MockThrottlerInterfaceRecorder{mock}
+	mock.recorder = &MockThrottlerInterfaceMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockThrottlerInterface) EXPECT() *_MockThrottlerInterfaceRecorder {
-	return _m.recorder
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockThrottlerInterface) EXPECT() *MockThrottlerInterfaceMockRecorder {
+	return m.recorder
 }
 
-func (_m *MockThrottlerInterface) Close() {
-	_m.ctrl.Call(_m, "Close")
+// Close mocks base method
+func (m *MockThrottlerInterface) Close() {
+	m.ctrl.Call(m, "Close")
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) Close() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Close")
+// Close indicates an expected call of Close
+func (mr *MockThrottlerInterfaceMockRecorder) Close() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockThrottlerInterface)(nil).Close))
 }
 
-func (_m *MockThrottlerInterface) GetConfiguration() *throttlerdata.Configuration {
-	ret := _m.ctrl.Call(_m, "GetConfiguration")
+// GetConfiguration mocks base method
+func (m *MockThrottlerInterface) GetConfiguration() *throttlerdata.Configuration {
+	ret := m.ctrl.Call(m, "GetConfiguration")
 	ret0, _ := ret[0].(*throttlerdata.Configuration)
 	return ret0
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) GetConfiguration() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetConfiguration")
+// GetConfiguration indicates an expected call of GetConfiguration
+func (mr *MockThrottlerInterfaceMockRecorder) GetConfiguration() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetConfiguration", reflect.TypeOf((*MockThrottlerInterface)(nil).GetConfiguration))
 }
 
-func (_m *MockThrottlerInterface) MaxRate() int64 {
-	ret := _m.ctrl.Call(_m, "MaxRate")
+// MaxRate mocks base method
+func (m *MockThrottlerInterface) MaxRate() int64 {
+	ret := m.ctrl.Call(m, "MaxRate")
 	ret0, _ := ret[0].(int64)
 	return ret0
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) MaxRate() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "MaxRate")
+// MaxRate indicates an expected call of MaxRate
+func (mr *MockThrottlerInterfaceMockRecorder) MaxRate() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MaxRate", reflect.TypeOf((*MockThrottlerInterface)(nil).MaxRate))
 }
 
-func (_m *MockThrottlerInterface) RecordReplicationLag(_param0 time.Time, _param1 *discovery.TabletStats) {
-	_m.ctrl.Call(_m, "RecordReplicationLag", _param0, _param1)
+// RecordReplicationLag mocks base method
+func (m *MockThrottlerInterface) RecordReplicationLag(arg0 time.Time, arg1 *discovery.TabletStats) {
+	m.ctrl.Call(m, "RecordReplicationLag", arg0, arg1)
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) RecordReplicationLag(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "RecordReplicationLag", arg0, arg1)
+// RecordReplicationLag indicates an expected call of RecordReplicationLag
+func (mr *MockThrottlerInterfaceMockRecorder) RecordReplicationLag(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecordReplicationLag", reflect.TypeOf((*MockThrottlerInterface)(nil).RecordReplicationLag), arg0, arg1)
 }
 
-func (_m *MockThrottlerInterface) ResetConfiguration() {
-	_m.ctrl.Call(_m, "ResetConfiguration")
+// ResetConfiguration mocks base method
+func (m *MockThrottlerInterface) ResetConfiguration() {
+	m.ctrl.Call(m, "ResetConfiguration")
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) ResetConfiguration() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ResetConfiguration")
+// ResetConfiguration indicates an expected call of ResetConfiguration
+func (mr *MockThrottlerInterfaceMockRecorder) ResetConfiguration() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResetConfiguration", reflect.TypeOf((*MockThrottlerInterface)(nil).ResetConfiguration))
 }
 
-func (_m *MockThrottlerInterface) SetMaxRate(_param0 int64) {
-	_m.ctrl.Call(_m, "SetMaxRate", _param0)
+// SetMaxRate mocks base method
+func (m *MockThrottlerInterface) SetMaxRate(arg0 int64) {
+	m.ctrl.Call(m, "SetMaxRate", arg0)
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) SetMaxRate(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "SetMaxRate", arg0)
+// SetMaxRate indicates an expected call of SetMaxRate
+func (mr *MockThrottlerInterfaceMockRecorder) SetMaxRate(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxRate", reflect.TypeOf((*MockThrottlerInterface)(nil).SetMaxRate), arg0)
 }
 
-func (_m *MockThrottlerInterface) ThreadFinished(_param0 int) {
-	_m.ctrl.Call(_m, "ThreadFinished", _param0)
+// ThreadFinished mocks base method
+func (m *MockThrottlerInterface) ThreadFinished(arg0 int) {
+	m.ctrl.Call(m, "ThreadFinished", arg0)
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) ThreadFinished(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ThreadFinished", arg0)
+// ThreadFinished indicates an expected call of ThreadFinished
+func (mr *MockThrottlerInterfaceMockRecorder) ThreadFinished(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ThreadFinished", reflect.TypeOf((*MockThrottlerInterface)(nil).ThreadFinished), arg0)
 }
 
-func (_m *MockThrottlerInterface) Throttle(_param0 int) time.Duration {
-	ret := _m.ctrl.Call(_m, "Throttle", _param0)
+// Throttle mocks base method
+func (m *MockThrottlerInterface) Throttle(arg0 int) time.Duration {
+	ret := m.ctrl.Call(m, "Throttle", arg0)
 	ret0, _ := ret[0].(time.Duration)
 	return ret0
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) Throttle(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Throttle", arg0)
+// Throttle indicates an expected call of Throttle
+func (mr *MockThrottlerInterfaceMockRecorder) Throttle(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Throttle", reflect.TypeOf((*MockThrottlerInterface)(nil).Throttle), arg0)
 }
 
-func (_m *MockThrottlerInterface) UpdateConfiguration(_param0 *throttlerdata.Configuration, _param1 bool) error {
-	ret := _m.ctrl.Call(_m, "UpdateConfiguration", _param0, _param1)
+// UpdateConfiguration mocks base method
+func (m *MockThrottlerInterface) UpdateConfiguration(arg0 *throttlerdata.Configuration, arg1 bool) error {
+	ret := m.ctrl.Call(m, "UpdateConfiguration", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockThrottlerInterfaceRecorder) UpdateConfiguration(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateConfiguration", arg0, arg1)
+// UpdateConfiguration indicates an expected call of UpdateConfiguration
+func (mr *MockThrottlerInterfaceMockRecorder) UpdateConfiguration(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateConfiguration", reflect.TypeOf((*MockThrottlerInterface)(nil).UpdateConfiguration), arg0, arg1)
 }
diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_topology_watcher_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_topology_watcher_test.go
index cf2e30bffa5..c462965bc23 100644
--- a/go/vt/vttablet/tabletserver/txthrottler/mock_topology_watcher_test.go
+++ b/go/vt/vttablet/tabletserver/txthrottler/mock_topology_watcher_test.go
@@ -1,63 +1,55 @@
-/*
-Copyright 2017 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreedto in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Automatically generated by MockGen. DO NOT EDIT!
-// Source: github.com/youtube/vitess/go/vt/tabletserver/txthrottler (interfaces: TopologyWatcherInterface)
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/youtube/vitess/go/vt/vttablet/tabletserver/txthrottler (interfaces: TopologyWatcherInterface)
 
+// Package txthrottler is a generated GoMock package.
 package txthrottler
 
 import (
 	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
 )
 
-// Mock of TopologyWatcherInterface interface
+// MockTopologyWatcherInterface is a mock of TopologyWatcherInterface interface
 type MockTopologyWatcherInterface struct {
 	ctrl     *gomock.Controller
-	recorder *_MockTopologyWatcherInterfaceRecorder
+	recorder *MockTopologyWatcherInterfaceMockRecorder
 }
 
-// Recorder for MockTopologyWatcherInterface (not exported)
-type _MockTopologyWatcherInterfaceRecorder struct {
+// MockTopologyWatcherInterfaceMockRecorder is the mock recorder for MockTopologyWatcherInterface
+type MockTopologyWatcherInterfaceMockRecorder struct {
 	mock *MockTopologyWatcherInterface
 }
 
+// NewMockTopologyWatcherInterface creates a new mock instance
 func NewMockTopologyWatcherInterface(ctrl *gomock.Controller) *MockTopologyWatcherInterface {
 	mock := &MockTopologyWatcherInterface{ctrl: ctrl}
-	mock.recorder = &_MockTopologyWatcherInterfaceRecorder{mock}
+	mock.recorder = &MockTopologyWatcherInterfaceMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockTopologyWatcherInterface) EXPECT() *_MockTopologyWatcherInterfaceRecorder {
-	return _m.recorder
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockTopologyWatcherInterface) EXPECT() *MockTopologyWatcherInterfaceMockRecorder {
+	return m.recorder
 }
 
-func (_m *MockTopologyWatcherInterface) Stop() {
-	_m.ctrl.Call(_m, "Stop")
+// Stop mocks base method
+func (m *MockTopologyWatcherInterface) Stop() {
+	m.ctrl.Call(m, "Stop")
 }
 
-func (_mr *_MockTopologyWatcherInterfaceRecorder) Stop() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Stop")
+// Stop indicates an expected call of Stop
+func (mr *MockTopologyWatcherInterfaceMockRecorder) Stop() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockTopologyWatcherInterface)(nil).Stop))
 }
 
-func (_m *MockTopologyWatcherInterface) WaitForInitialTopology() error {
-	ret := _m.ctrl.Call(_m, "WaitForInitialTopology")
+// WaitForInitialTopology mocks base method
+func (m *MockTopologyWatcherInterface) WaitForInitialTopology() error {
+	ret := m.ctrl.Call(m, "WaitForInitialTopology")
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockTopologyWatcherInterfaceRecorder) WaitForInitialTopology() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WaitForInitialTopology")
+// WaitForInitialTopology indicates an expected call of WaitForInitialTopology
+func (mr *MockTopologyWatcherInterfaceMockRecorder) WaitForInitialTopology() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForInitialTopology", reflect.TypeOf((*MockTopologyWatcherInterface)(nil).WaitForInitialTopology))
 }
diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_toposerver_impl_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_toposerver_impl_test.go
index c9899d3f735..e957c01636c 100644
--- a/go/vt/vttablet/tabletserver/txthrottler/mock_toposerver_impl_test.go
+++ b/go/vt/vttablet/tabletserver/txthrottler/mock_toposerver_impl_test.go
@@ -1,22 +1,7 @@
-/*
-Copyright 2017 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreedto in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Automatically generated by MockGen. DO NOT EDIT!
+// Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/youtube/vitess/go/vt/topo (interfaces: Impl)
 
+// Package txthrottler is a generated GoMock package.
 package txthrottler
 
 import (
@@ -25,451 +10,534 @@ import (
 	vschema "github.com/youtube/vitess/go/vt/proto/vschema"
 	topo "github.com/youtube/vitess/go/vt/topo"
 	context "golang.org/x/net/context"
+	reflect "reflect"
 )
 
-// Mock of Impl interface
+// MockImpl is a mock of Impl interface
 type MockImpl struct {
 	ctrl     *gomock.Controller
-	recorder *_MockImplRecorder
+	recorder *MockImplMockRecorder
 }
 
-// Recorder for MockImpl (not exported)
-type _MockImplRecorder struct {
+// MockImplMockRecorder is the mock recorder for MockImpl
+type MockImplMockRecorder struct {
 	mock *MockImpl
 }
 
+// NewMockImpl creates a new mock instance
 func NewMockImpl(ctrl *gomock.Controller) *MockImpl {
 	mock := &MockImpl{ctrl: ctrl}
-	mock.recorder = &_MockImplRecorder{mock}
+	mock.recorder = &MockImplMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockImpl) EXPECT() *_MockImplRecorder {
-	return _m.recorder
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockImpl) EXPECT() *MockImplMockRecorder {
+	return m.recorder
 }
 
-func (_m *MockImpl) Close() {
-	_m.ctrl.Call(_m, "Close")
+// Close mocks base method
+func (m *MockImpl) Close() {
+	m.ctrl.Call(m, "Close")
 }
 
-func (_mr *_MockImplRecorder) Close() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Close")
+// Close indicates an expected call of Close
+func (mr *MockImplMockRecorder) Close() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockImpl)(nil).Close))
 }
 
-func (_m *MockImpl) Create(_param0 context.Context, _param1 string, _param2 string, _param3 []byte) (topo.Version, error) {
-	ret := _m.ctrl.Call(_m, "Create", _param0, _param1, _param2, _param3)
+// Create mocks base method
+func (m *MockImpl) Create(arg0 context.Context, arg1, arg2 string, arg3 []byte) (topo.Version, error) {
+	ret := m.ctrl.Call(m, "Create", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(topo.Version)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) Create(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Create", arg0, arg1, arg2, arg3)
+// Create indicates an expected call of Create
+func (mr *MockImplMockRecorder) Create(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockImpl)(nil).Create), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) CreateKeyspace(_param0 context.Context, _param1 string, _param2 *topodata.Keyspace) error {
-	ret := _m.ctrl.Call(_m, "CreateKeyspace", _param0, _param1, _param2)
+// CreateKeyspace mocks base method
+func (m *MockImpl) CreateKeyspace(arg0 context.Context, arg1 string, arg2 *topodata.Keyspace) error {
+	ret := m.ctrl.Call(m, "CreateKeyspace", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) CreateKeyspace(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "CreateKeyspace", arg0, arg1, arg2)
+// CreateKeyspace indicates an expected call of CreateKeyspace
+func (mr *MockImplMockRecorder) CreateKeyspace(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateKeyspace", reflect.TypeOf((*MockImpl)(nil).CreateKeyspace), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) CreateShard(_param0 context.Context, _param1 string, _param2 string, _param3 *topodata.Shard) error {
-	ret := _m.ctrl.Call(_m, "CreateShard", _param0, _param1, _param2, _param3)
+// CreateShard mocks base method
+func (m *MockImpl) CreateShard(arg0 context.Context, arg1, arg2 string, arg3 *topodata.Shard) error {
+	ret := m.ctrl.Call(m, "CreateShard", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) CreateShard(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "CreateShard", arg0, arg1, arg2, arg3)
+// CreateShard indicates an expected call of CreateShard
+func (mr *MockImplMockRecorder) CreateShard(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateShard", reflect.TypeOf((*MockImpl)(nil).CreateShard), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) CreateTablet(_param0 context.Context, _param1 *topodata.Tablet) error {
-	ret := _m.ctrl.Call(_m, "CreateTablet", _param0, _param1)
+// CreateTablet mocks base method
+func (m *MockImpl) CreateTablet(arg0 context.Context, arg1 *topodata.Tablet) error {
+	ret := m.ctrl.Call(m, "CreateTablet", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) CreateTablet(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "CreateTablet", arg0, arg1)
+// CreateTablet indicates an expected call of CreateTablet
+func (mr *MockImplMockRecorder) CreateTablet(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTablet", reflect.TypeOf((*MockImpl)(nil).CreateTablet), arg0, arg1)
 }
 
-func (_m *MockImpl) Delete(_param0 context.Context, _param1 string, _param2 string, _param3 topo.Version) error {
-	ret := _m.ctrl.Call(_m, "Delete", _param0, _param1, _param2, _param3)
+// Delete mocks base method
+func (m *MockImpl) Delete(arg0 context.Context, arg1, arg2 string, arg3 topo.Version) error {
+	ret := m.ctrl.Call(m, "Delete", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) Delete(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Delete", arg0, arg1, arg2, arg3)
+// Delete indicates an expected call of Delete
+func (mr *MockImplMockRecorder) Delete(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockImpl)(nil).Delete), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) DeleteKeyspace(_param0 context.Context, _param1 string) error {
-	ret := _m.ctrl.Call(_m, "DeleteKeyspace", _param0, _param1)
+// DeleteKeyspace mocks base method
+func (m *MockImpl) DeleteKeyspace(arg0 context.Context, arg1 string) error {
+	ret := m.ctrl.Call(m, "DeleteKeyspace", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) DeleteKeyspace(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "DeleteKeyspace", arg0, arg1)
+// DeleteKeyspace indicates an expected call of DeleteKeyspace
+func (mr *MockImplMockRecorder) DeleteKeyspace(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteKeyspace", reflect.TypeOf((*MockImpl)(nil).DeleteKeyspace), arg0, arg1)
 }
 
-func (_m *MockImpl) DeleteKeyspaceReplication(_param0 context.Context, _param1 string, _param2 string) error {
-	ret := _m.ctrl.Call(_m, "DeleteKeyspaceReplication", _param0, _param1, _param2)
+// DeleteKeyspaceReplication mocks base method
+func (m *MockImpl) DeleteKeyspaceReplication(arg0 context.Context, arg1, arg2 string) error {
+	ret := m.ctrl.Call(m, "DeleteKeyspaceReplication", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) DeleteKeyspaceReplication(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "DeleteKeyspaceReplication", arg0, arg1, arg2)
+// DeleteKeyspaceReplication indicates an expected call of DeleteKeyspaceReplication
+func (mr *MockImplMockRecorder) DeleteKeyspaceReplication(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteKeyspaceReplication", reflect.TypeOf((*MockImpl)(nil).DeleteKeyspaceReplication), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) DeleteShard(_param0 context.Context, _param1 string, _param2 string) error {
-	ret := _m.ctrl.Call(_m, "DeleteShard", _param0, _param1, _param2)
+// DeleteShard mocks base method
+func (m *MockImpl) DeleteShard(arg0 context.Context, arg1, arg2 string) error {
+	ret := m.ctrl.Call(m, "DeleteShard", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) DeleteShard(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "DeleteShard", arg0, arg1, arg2)
+// DeleteShard indicates an expected call of DeleteShard
+func (mr *MockImplMockRecorder) DeleteShard(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteShard", reflect.TypeOf((*MockImpl)(nil).DeleteShard), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) DeleteShardReplication(_param0 context.Context, _param1 string, _param2 string, _param3 string) error {
-	ret := _m.ctrl.Call(_m, "DeleteShardReplication", _param0, _param1, _param2, _param3)
+// DeleteShardReplication mocks base method
+func (m *MockImpl) DeleteShardReplication(arg0 context.Context, arg1, arg2, arg3 string) error {
+	ret := m.ctrl.Call(m, "DeleteShardReplication", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) DeleteShardReplication(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "DeleteShardReplication", arg0, arg1, arg2, arg3)
+// DeleteShardReplication indicates an expected call of DeleteShardReplication
+func (mr *MockImplMockRecorder) DeleteShardReplication(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteShardReplication", reflect.TypeOf((*MockImpl)(nil).DeleteShardReplication), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) DeleteSrvKeyspace(_param0 context.Context, _param1 string, _param2 string) error {
-	ret := _m.ctrl.Call(_m, "DeleteSrvKeyspace", _param0, _param1, _param2)
+// DeleteSrvKeyspace mocks base method
+func (m *MockImpl) DeleteSrvKeyspace(arg0 context.Context, arg1, arg2 string) error {
+	ret := m.ctrl.Call(m, "DeleteSrvKeyspace", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) DeleteSrvKeyspace(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "DeleteSrvKeyspace", arg0, arg1, arg2)
+// DeleteSrvKeyspace indicates an expected call of DeleteSrvKeyspace
+func (mr *MockImplMockRecorder) DeleteSrvKeyspace(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSrvKeyspace", reflect.TypeOf((*MockImpl)(nil).DeleteSrvKeyspace), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) DeleteTablet(_param0 context.Context, _param1 *topodata.TabletAlias) error {
-	ret := _m.ctrl.Call(_m, "DeleteTablet", _param0, _param1)
+// DeleteTablet mocks base method
+func (m *MockImpl) DeleteTablet(arg0 context.Context, arg1 *topodata.TabletAlias) error {
+	ret := m.ctrl.Call(m, "DeleteTablet", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) DeleteTablet(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "DeleteTablet", arg0, arg1)
+// DeleteTablet indicates an expected call of DeleteTablet
+func (mr *MockImplMockRecorder) DeleteTablet(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteTablet", reflect.TypeOf((*MockImpl)(nil).DeleteTablet), arg0, arg1)
 }
 
-func (_m *MockImpl) Get(_param0 context.Context, _param1 string, _param2 string) ([]byte, topo.Version, error) {
-	ret := _m.ctrl.Call(_m, "Get", _param0, _param1, _param2)
+// Get mocks base method
+func (m *MockImpl) Get(arg0 context.Context, arg1, arg2 string) ([]byte, topo.Version, error) {
+	ret := m.ctrl.Call(m, "Get", arg0, arg1, arg2)
 	ret0, _ := ret[0].([]byte)
 	ret1, _ := ret[1].(topo.Version)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
 
-func (_mr *_MockImplRecorder) Get(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Get", arg0, arg1, arg2)
+// Get indicates an expected call of Get
+func (mr *MockImplMockRecorder) Get(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockImpl)(nil).Get), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) GetKeyspace(_param0 context.Context, _param1 string) (*topodata.Keyspace, int64, error) {
-	ret := _m.ctrl.Call(_m, "GetKeyspace", _param0, _param1)
+// GetKeyspace mocks base method
+func (m *MockImpl) GetKeyspace(arg0 context.Context, arg1 string) (*topodata.Keyspace, int64, error) {
+	ret := m.ctrl.Call(m, "GetKeyspace", arg0, arg1)
 	ret0, _ := ret[0].(*topodata.Keyspace)
 	ret1, _ := ret[1].(int64)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
 
-func (_mr *_MockImplRecorder) GetKeyspace(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetKeyspace", arg0, arg1)
+// GetKeyspace indicates an expected call of GetKeyspace
+func (mr *MockImplMockRecorder) GetKeyspace(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetKeyspace", reflect.TypeOf((*MockImpl)(nil).GetKeyspace), arg0, arg1)
 }
 
-func (_m *MockImpl) GetKeyspaces(_param0 context.Context) ([]string, error) {
-	ret := _m.ctrl.Call(_m, "GetKeyspaces", _param0)
+// GetKeyspaces mocks base method
+func (m *MockImpl) GetKeyspaces(arg0 context.Context) ([]string, error) {
+	ret := m.ctrl.Call(m, "GetKeyspaces", arg0)
 	ret0, _ := ret[0].([]string)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetKeyspaces(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetKeyspaces", arg0)
+// GetKeyspaces indicates an expected call of GetKeyspaces
+func (mr *MockImplMockRecorder) GetKeyspaces(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetKeyspaces", reflect.TypeOf((*MockImpl)(nil).GetKeyspaces), arg0)
 }
 
-func (_m *MockImpl) GetKnownCells(_param0 context.Context) ([]string, error) {
-	ret := _m.ctrl.Call(_m, "GetKnownCells", _param0)
+// GetKnownCells mocks base method
+func (m *MockImpl) GetKnownCells(arg0 context.Context) ([]string, error) {
+	ret := m.ctrl.Call(m, "GetKnownCells", arg0)
 	ret0, _ := ret[0].([]string)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetKnownCells(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetKnownCells", arg0)
+// GetKnownCells indicates an expected call of GetKnownCells
+func (mr *MockImplMockRecorder) GetKnownCells(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetKnownCells", reflect.TypeOf((*MockImpl)(nil).GetKnownCells), arg0)
 }
 
-func (_m *MockImpl) GetShard(_param0 context.Context, _param1 string, _param2 string) (*topodata.Shard, int64, error) {
-	ret := _m.ctrl.Call(_m, "GetShard", _param0, _param1, _param2)
+// GetShard mocks base method
+func (m *MockImpl) GetShard(arg0 context.Context, arg1, arg2 string) (*topodata.Shard, int64, error) {
+	ret := m.ctrl.Call(m, "GetShard", arg0, arg1, arg2)
 	ret0, _ := ret[0].(*topodata.Shard)
 	ret1, _ := ret[1].(int64)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
 
-func (_mr *_MockImplRecorder) GetShard(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetShard", arg0, arg1, arg2)
+// GetShard indicates an expected call of GetShard
+func (mr *MockImplMockRecorder) GetShard(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetShard", reflect.TypeOf((*MockImpl)(nil).GetShard), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) GetShardNames(_param0 context.Context, _param1 string) ([]string, error) {
-	ret := _m.ctrl.Call(_m, "GetShardNames", _param0, _param1)
+// GetShardNames mocks base method
+func (m *MockImpl) GetShardNames(arg0 context.Context, arg1 string) ([]string, error) {
+	ret := m.ctrl.Call(m, "GetShardNames", arg0, arg1)
 	ret0, _ := ret[0].([]string)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetShardNames(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetShardNames", arg0, arg1)
+// GetShardNames indicates an expected call of GetShardNames
+func (mr *MockImplMockRecorder) GetShardNames(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetShardNames", reflect.TypeOf((*MockImpl)(nil).GetShardNames), arg0, arg1)
 }
 
-func (_m *MockImpl) GetShardReplication(_param0 context.Context, _param1 string, _param2 string, _param3 string) (*topo.ShardReplicationInfo, error) {
-	ret := _m.ctrl.Call(_m, "GetShardReplication", _param0, _param1, _param2, _param3)
+// GetShardReplication mocks base method
+func (m *MockImpl) GetShardReplication(arg0 context.Context, arg1, arg2, arg3 string) (*topo.ShardReplicationInfo, error) {
+	ret := m.ctrl.Call(m, "GetShardReplication", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(*topo.ShardReplicationInfo)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetShardReplication(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetShardReplication", arg0, arg1, arg2, arg3)
+// GetShardReplication indicates an expected call of GetShardReplication
+func (mr *MockImplMockRecorder) GetShardReplication(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetShardReplication", reflect.TypeOf((*MockImpl)(nil).GetShardReplication), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) GetSrvKeyspace(_param0 context.Context, _param1 string, _param2 string) (*topodata.SrvKeyspace, error) {
-	ret := _m.ctrl.Call(_m, "GetSrvKeyspace", _param0, _param1, _param2)
+// GetSrvKeyspace mocks base method
+func (m *MockImpl) GetSrvKeyspace(arg0 context.Context, arg1, arg2 string) (*topodata.SrvKeyspace, error) {
+	ret := m.ctrl.Call(m, "GetSrvKeyspace", arg0, arg1, arg2)
 	ret0, _ := ret[0].(*topodata.SrvKeyspace)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetSrvKeyspace(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetSrvKeyspace", arg0, arg1, arg2)
+// GetSrvKeyspace indicates an expected call of GetSrvKeyspace
+func (mr *MockImplMockRecorder) GetSrvKeyspace(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSrvKeyspace", reflect.TypeOf((*MockImpl)(nil).GetSrvKeyspace), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) GetSrvKeyspaceNames(_param0 context.Context, _param1 string) ([]string, error) {
-	ret := _m.ctrl.Call(_m, "GetSrvKeyspaceNames", _param0, _param1)
+// GetSrvKeyspaceNames mocks base method
+func (m *MockImpl) GetSrvKeyspaceNames(arg0 context.Context, arg1 string) ([]string, error) {
+	ret := m.ctrl.Call(m, "GetSrvKeyspaceNames", arg0, arg1)
 	ret0, _ := ret[0].([]string)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetSrvKeyspaceNames(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetSrvKeyspaceNames", arg0, arg1)
+// GetSrvKeyspaceNames indicates an expected call of GetSrvKeyspaceNames
+func (mr *MockImplMockRecorder) GetSrvKeyspaceNames(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSrvKeyspaceNames", reflect.TypeOf((*MockImpl)(nil).GetSrvKeyspaceNames), arg0, arg1)
 }
 
-func (_m *MockImpl) GetSrvVSchema(_param0 context.Context, _param1 string) (*vschema.SrvVSchema, error) {
-	ret := _m.ctrl.Call(_m, "GetSrvVSchema", _param0, _param1)
+// GetSrvVSchema mocks base method
+func (m *MockImpl) GetSrvVSchema(arg0 context.Context, arg1 string) (*vschema.SrvVSchema, error) {
+	ret := m.ctrl.Call(m, "GetSrvVSchema", arg0, arg1)
 	ret0, _ := ret[0].(*vschema.SrvVSchema)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetSrvVSchema(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetSrvVSchema", arg0, arg1)
+// GetSrvVSchema indicates an expected call of GetSrvVSchema
+func (mr *MockImplMockRecorder) GetSrvVSchema(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSrvVSchema", reflect.TypeOf((*MockImpl)(nil).GetSrvVSchema), arg0, arg1)
 }
 
-func (_m *MockImpl) GetTablet(_param0 context.Context, _param1 *topodata.TabletAlias) (*topodata.Tablet, int64, error) {
-	ret := _m.ctrl.Call(_m, "GetTablet", _param0, _param1)
+// GetTablet mocks base method
+func (m *MockImpl) GetTablet(arg0 context.Context, arg1 *topodata.TabletAlias) (*topodata.Tablet, int64, error) {
+	ret := m.ctrl.Call(m, "GetTablet", arg0, arg1)
 	ret0, _ := ret[0].(*topodata.Tablet)
 	ret1, _ := ret[1].(int64)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
 
-func (_mr *_MockImplRecorder) GetTablet(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetTablet", arg0, arg1)
+// GetTablet indicates an expected call of GetTablet
+func (mr *MockImplMockRecorder) GetTablet(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTablet", reflect.TypeOf((*MockImpl)(nil).GetTablet), arg0, arg1)
 }
 
-func (_m *MockImpl) GetTabletsByCell(_param0 context.Context, _param1 string) ([]*topodata.TabletAlias, error) {
-	ret := _m.ctrl.Call(_m, "GetTabletsByCell", _param0, _param1)
+// GetTabletsByCell mocks base method
+func (m *MockImpl) GetTabletsByCell(arg0 context.Context, arg1 string) ([]*topodata.TabletAlias, error) {
+	ret := m.ctrl.Call(m, "GetTabletsByCell", arg0, arg1)
 	ret0, _ := ret[0].([]*topodata.TabletAlias)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetTabletsByCell(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetTabletsByCell", arg0, arg1)
+// GetTabletsByCell indicates an expected call of GetTabletsByCell
+func (mr *MockImplMockRecorder) GetTabletsByCell(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTabletsByCell", reflect.TypeOf((*MockImpl)(nil).GetTabletsByCell), arg0, arg1)
 }
 
-func (_m *MockImpl) GetVSchema(_param0 context.Context, _param1 string) (*vschema.Keyspace, error) {
-	ret := _m.ctrl.Call(_m, "GetVSchema", _param0, _param1)
+// GetVSchema mocks base method
+func (m *MockImpl) GetVSchema(arg0 context.Context, arg1 string) (*vschema.Keyspace, error) {
+	ret := m.ctrl.Call(m, "GetVSchema", arg0, arg1)
 	ret0, _ := ret[0].(*vschema.Keyspace)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) GetVSchema(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetVSchema", arg0, arg1)
+// GetVSchema indicates an expected call of GetVSchema
+func (mr *MockImplMockRecorder) GetVSchema(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVSchema", reflect.TypeOf((*MockImpl)(nil).GetVSchema), arg0, arg1)
 }
 
-func (_m *MockImpl) ListDir(_param0 context.Context, _param1 string, _param2 string) ([]string, error) {
-	ret := _m.ctrl.Call(_m, "ListDir", _param0, _param1, _param2)
+// ListDir mocks base method
+func (m *MockImpl) ListDir(arg0 context.Context, arg1, arg2 string) ([]string, error) {
+	ret := m.ctrl.Call(m, "ListDir", arg0, arg1, arg2)
 	ret0, _ := ret[0].([]string)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) ListDir(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ListDir", arg0, arg1, arg2)
+// ListDir indicates an expected call of ListDir
+func (mr *MockImplMockRecorder) ListDir(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListDir", reflect.TypeOf((*MockImpl)(nil).ListDir), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) LockKeyspaceForAction(_param0 context.Context, _param1 string, _param2 string) (string, error) {
-	ret := _m.ctrl.Call(_m, "LockKeyspaceForAction", _param0, _param1, _param2)
+// LockKeyspaceForAction mocks base method
+func (m *MockImpl) LockKeyspaceForAction(arg0 context.Context, arg1, arg2 string) (string, error) {
+	ret := m.ctrl.Call(m, "LockKeyspaceForAction", arg0, arg1, arg2)
 	ret0, _ := ret[0].(string)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) LockKeyspaceForAction(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "LockKeyspaceForAction", arg0, arg1, arg2)
+// LockKeyspaceForAction indicates an expected call of LockKeyspaceForAction
+func (mr *MockImplMockRecorder) LockKeyspaceForAction(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LockKeyspaceForAction", reflect.TypeOf((*MockImpl)(nil).LockKeyspaceForAction), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) LockShardForAction(_param0 context.Context, _param1 string, _param2 string, _param3 string) (string, error) {
-	ret := _m.ctrl.Call(_m, "LockShardForAction", _param0, _param1, _param2, _param3)
+// LockShardForAction mocks base method
+func (m *MockImpl) LockShardForAction(arg0 context.Context, arg1, arg2, arg3 string) (string, error) {
+	ret := m.ctrl.Call(m, "LockShardForAction", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(string)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) LockShardForAction(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "LockShardForAction", arg0, arg1, arg2, arg3)
+// LockShardForAction indicates an expected call of LockShardForAction
+func (mr *MockImplMockRecorder) LockShardForAction(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LockShardForAction", reflect.TypeOf((*MockImpl)(nil).LockShardForAction), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) NewMasterParticipation(_param0 string, _param1 string) (topo.MasterParticipation, error) {
-	ret := _m.ctrl.Call(_m, "NewMasterParticipation", _param0, _param1)
+// NewMasterParticipation mocks base method
+func (m *MockImpl) NewMasterParticipation(arg0, arg1 string) (topo.MasterParticipation, error) {
+	ret := m.ctrl.Call(m, "NewMasterParticipation", arg0, arg1)
 	ret0, _ := ret[0].(topo.MasterParticipation)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) NewMasterParticipation(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "NewMasterParticipation", arg0, arg1)
+// NewMasterParticipation indicates an expected call of NewMasterParticipation
+func (mr *MockImplMockRecorder) NewMasterParticipation(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewMasterParticipation", reflect.TypeOf((*MockImpl)(nil).NewMasterParticipation), arg0, arg1)
 }
 
-func (_m *MockImpl) SaveVSchema(_param0 context.Context, _param1 string, _param2 *vschema.Keyspace) error {
-	ret := _m.ctrl.Call(_m, "SaveVSchema", _param0, _param1, _param2)
+// SaveVSchema mocks base method
+func (m *MockImpl) SaveVSchema(arg0 context.Context, arg1 string, arg2 *vschema.Keyspace) error {
+	ret := m.ctrl.Call(m, "SaveVSchema", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) SaveVSchema(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "SaveVSchema", arg0, arg1, arg2)
+// SaveVSchema indicates an expected call of SaveVSchema
+func (mr *MockImplMockRecorder) SaveVSchema(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveVSchema", reflect.TypeOf((*MockImpl)(nil).SaveVSchema), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) UnlockKeyspaceForAction(_param0 context.Context, _param1 string, _param2 string, _param3 string) error {
-	ret := _m.ctrl.Call(_m, "UnlockKeyspaceForAction", _param0, _param1, _param2, _param3)
+// UnlockKeyspaceForAction mocks base method
+func (m *MockImpl) UnlockKeyspaceForAction(arg0 context.Context, arg1, arg2, arg3 string) error {
+	ret := m.ctrl.Call(m, "UnlockKeyspaceForAction", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) UnlockKeyspaceForAction(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UnlockKeyspaceForAction", arg0, arg1, arg2, arg3)
+// UnlockKeyspaceForAction indicates an expected call of UnlockKeyspaceForAction
+func (mr *MockImplMockRecorder) UnlockKeyspaceForAction(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnlockKeyspaceForAction", reflect.TypeOf((*MockImpl)(nil).UnlockKeyspaceForAction), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) UnlockShardForAction(_param0 context.Context, _param1 string, _param2 string, _param3 string, _param4 string) error {
-	ret := _m.ctrl.Call(_m, "UnlockShardForAction", _param0, _param1, _param2, _param3, _param4)
+// UnlockShardForAction mocks base method
+func (m *MockImpl) UnlockShardForAction(arg0 context.Context, arg1, arg2, arg3, arg4 string) error {
+	ret := m.ctrl.Call(m, "UnlockShardForAction", arg0, arg1, arg2, arg3, arg4)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) UnlockShardForAction(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UnlockShardForAction", arg0, arg1, arg2, arg3, arg4)
+// UnlockShardForAction indicates an expected call of UnlockShardForAction
+func (mr *MockImplMockRecorder) UnlockShardForAction(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnlockShardForAction", reflect.TypeOf((*MockImpl)(nil).UnlockShardForAction), arg0, arg1, arg2, arg3, arg4)
 }
 
-func (_m *MockImpl) Update(_param0 context.Context, _param1 string, _param2 string, _param3 []byte, _param4 topo.Version) (topo.Version, error) {
-	ret := _m.ctrl.Call(_m, "Update", _param0, _param1, _param2, _param3, _param4)
+// Update mocks base method
+func (m *MockImpl) Update(arg0 context.Context, arg1, arg2 string, arg3 []byte, arg4 topo.Version) (topo.Version, error) {
+	ret := m.ctrl.Call(m, "Update", arg0, arg1, arg2, arg3, arg4)
 	ret0, _ := ret[0].(topo.Version)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) Update(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Update", arg0, arg1, arg2, arg3, arg4)
+// Update indicates an expected call of Update
+func (mr *MockImplMockRecorder) Update(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockImpl)(nil).Update), arg0, arg1, arg2, arg3, arg4)
 }
 
-func (_m *MockImpl) UpdateKeyspace(_param0 context.Context, _param1 string, _param2 *topodata.Keyspace, _param3 int64) (int64, error) {
-	ret := _m.ctrl.Call(_m, "UpdateKeyspace", _param0, _param1, _param2, _param3)
+// UpdateKeyspace mocks base method
+func (m *MockImpl) UpdateKeyspace(arg0 context.Context, arg1 string, arg2 *topodata.Keyspace, arg3 int64) (int64, error) {
+	ret := m.ctrl.Call(m, "UpdateKeyspace", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(int64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) UpdateKeyspace(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateKeyspace", arg0, arg1, arg2, arg3)
+// UpdateKeyspace indicates an expected call of UpdateKeyspace
+func (mr *MockImplMockRecorder) UpdateKeyspace(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateKeyspace", reflect.TypeOf((*MockImpl)(nil).UpdateKeyspace), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) UpdateShard(_param0 context.Context, _param1 string, _param2 string, _param3 *topodata.Shard, _param4 int64) (int64, error) {
-	ret := _m.ctrl.Call(_m, "UpdateShard", _param0, _param1, _param2, _param3, _param4)
+// UpdateShard mocks base method
+func (m *MockImpl) UpdateShard(arg0 context.Context, arg1, arg2 string, arg3 *topodata.Shard, arg4 int64) (int64, error) {
+	ret := m.ctrl.Call(m, "UpdateShard", arg0, arg1, arg2, arg3, arg4)
 	ret0, _ := ret[0].(int64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) UpdateShard(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateShard", arg0, arg1, arg2, arg3, arg4)
+// UpdateShard indicates an expected call of UpdateShard
+func (mr *MockImplMockRecorder) UpdateShard(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateShard", reflect.TypeOf((*MockImpl)(nil).UpdateShard), arg0, arg1, arg2, arg3, arg4)
 }
 
-func (_m *MockImpl) UpdateShardReplicationFields(_param0 context.Context, _param1 string, _param2 string, _param3 string, _param4 func(*topodata.ShardReplication) error) error {
-	ret := _m.ctrl.Call(_m, "UpdateShardReplicationFields", _param0, _param1, _param2, _param3, _param4)
+// UpdateShardReplicationFields mocks base method
+func (m *MockImpl) UpdateShardReplicationFields(arg0 context.Context, arg1, arg2, arg3 string, arg4 func(*topodata.ShardReplication) error) error {
+	ret := m.ctrl.Call(m, "UpdateShardReplicationFields", arg0, arg1, arg2, arg3, arg4)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) UpdateShardReplicationFields(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateShardReplicationFields", arg0, arg1, arg2, arg3, arg4)
+// UpdateShardReplicationFields indicates an expected call of UpdateShardReplicationFields
+func (mr *MockImplMockRecorder) UpdateShardReplicationFields(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateShardReplicationFields", reflect.TypeOf((*MockImpl)(nil).UpdateShardReplicationFields), arg0, arg1, arg2, arg3, arg4)
 }
 
-func (_m *MockImpl) UpdateSrvKeyspace(_param0 context.Context, _param1 string, _param2 string, _param3 *topodata.SrvKeyspace) error {
-	ret := _m.ctrl.Call(_m, "UpdateSrvKeyspace", _param0, _param1, _param2, _param3)
+// UpdateSrvKeyspace mocks base method
+func (m *MockImpl) UpdateSrvKeyspace(arg0 context.Context, arg1, arg2 string, arg3 *topodata.SrvKeyspace) error {
+	ret := m.ctrl.Call(m, "UpdateSrvKeyspace", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) UpdateSrvKeyspace(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateSrvKeyspace", arg0, arg1, arg2, arg3)
+// UpdateSrvKeyspace indicates an expected call of UpdateSrvKeyspace
+func (mr *MockImplMockRecorder) UpdateSrvKeyspace(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSrvKeyspace", reflect.TypeOf((*MockImpl)(nil).UpdateSrvKeyspace), arg0, arg1, arg2, arg3)
 }
 
-func (_m *MockImpl) UpdateSrvVSchema(_param0 context.Context, _param1 string, _param2 *vschema.SrvVSchema) error {
-	ret := _m.ctrl.Call(_m, "UpdateSrvVSchema", _param0, _param1, _param2)
+// UpdateSrvVSchema mocks base method
+func (m *MockImpl) UpdateSrvVSchema(arg0 context.Context, arg1 string, arg2 *vschema.SrvVSchema) error {
+	ret := m.ctrl.Call(m, "UpdateSrvVSchema", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockImplRecorder) UpdateSrvVSchema(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateSrvVSchema", arg0, arg1, arg2)
+// UpdateSrvVSchema indicates an expected call of UpdateSrvVSchema
+func (mr *MockImplMockRecorder) UpdateSrvVSchema(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSrvVSchema", reflect.TypeOf((*MockImpl)(nil).UpdateSrvVSchema), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) UpdateTablet(_param0 context.Context, _param1 *topodata.Tablet, _param2 int64) (int64, error) {
-	ret := _m.ctrl.Call(_m, "UpdateTablet", _param0, _param1, _param2)
+// UpdateTablet mocks base method
+func (m *MockImpl) UpdateTablet(arg0 context.Context, arg1 *topodata.Tablet, arg2 int64) (int64, error) {
+	ret := m.ctrl.Call(m, "UpdateTablet", arg0, arg1, arg2)
 	ret0, _ := ret[0].(int64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockImplRecorder) UpdateTablet(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateTablet", arg0, arg1, arg2)
+// UpdateTablet indicates an expected call of UpdateTablet
+func (mr *MockImplMockRecorder) UpdateTablet(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTablet", reflect.TypeOf((*MockImpl)(nil).UpdateTablet), arg0, arg1, arg2)
 }
 
-func (_m *MockImpl) Watch(_param0 context.Context, _param1 string, _param2 string) (*topo.WatchData, <-chan *topo.WatchData, topo.CancelFunc) {
-	ret := _m.ctrl.Call(_m, "Watch", _param0, _param1, _param2)
+// Watch mocks base method
+func (m *MockImpl) Watch(arg0 context.Context, arg1, arg2 string) (*topo.WatchData, <-chan *topo.WatchData, topo.CancelFunc) {
+	ret := m.ctrl.Call(m, "Watch", arg0, arg1, arg2)
 	ret0, _ := ret[0].(*topo.WatchData)
 	ret1, _ := ret[1].(<-chan *topo.WatchData)
 	ret2, _ := ret[2].(topo.CancelFunc)
 	return ret0, ret1, ret2
 }
 
-func (_mr *_MockImplRecorder) Watch(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Watch", arg0, arg1, arg2)
+// Watch indicates an expected call of Watch
+func (mr *MockImplMockRecorder) Watch(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockImpl)(nil).Watch), arg0, arg1, arg2)
 }
diff --git a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go
index 15912236618..6fa8b72c665 100644
--- a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go
+++ b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go
@@ -16,6 +16,16 @@ limitations under the License.
 
 package txthrottler
 
+// Commands to generate the mocks for this test.
+//go:generate mockgen -destination mock_toposerver_impl_test.go -package txthrottler github.com/youtube/vitess/go/vt/topo Impl
+// We need the following to fix the generated mock_impl.go, since mockgen imports the 'context'
+// package from the wrong place.
+// TODO(mberlin): Remove the next line once we use the Go 1.7 package 'context' everywhere.
+//go:generate sed -i s,github.com/youtube/vitess/vendor/,,g mock_toposerver_impl_test.go
+//go:generate mockgen -destination mock_healthcheck_test.go -package txthrottler github.com/youtube/vitess/go/vt/discovery HealthCheck
+//go:generate mockgen -destination mock_throttler_test.go -package txthrottler github.com/youtube/vitess/go/vt/vttablet/tabletserver/txthrottler ThrottlerInterface
+//go:generate mockgen -destination mock_topology_watcher_test.go -package txthrottler github.com/youtube/vitess/go/vt/vttablet/tabletserver/txthrottler TopologyWatcherInterface
+
 import (
 	"testing"
 	"time"
@@ -133,13 +143,3 @@ func TestEnabledThrottler(t *testing.T) {
 	}
 	throttler.Close()
 }
-
-// Commands to generate the mocks for this test.
-//go:generate mockgen -destination mock_toposerver_impl_test.go -package txthrottler github.com/youtube/vitess/go/vt/topo Impl
-// We need the following to fix the generated mock_impl.go, since mockgen imports the 'context'
-// package from the wrong place.
-// TODO(mberlin): Remove the next line once we use the Go 1.7 package 'context' everywhere.
-//go:generate sed -i s,github.com/youtube/vitess/vendor/,,g mock_toposerver_impl_test.go
-//go:generate mockgen -destination mock_healthcheck_test.go -package txthrottler github.com/youtube/vitess/go/vt/discovery HealthCheck
-//go:generate mockgen -destination mock_throttler_test.go -package txthrottler github.com/youtube/vitess/go/vt/tabletserver/txthrottler ThrottlerInterface
-//go:generate mockgen -destination mock_topology_watcher_test.go -package txthrottler github.com/youtube/vitess/go/vt/tabletserver/txthrottler TopologyWatcherInterface
diff --git a/go/vt/wrangler/testlib/throttler_test.go b/go/vt/wrangler/testlib/throttler_test.go
index 29e27572922..a3968bdb594 100644
--- a/go/vt/wrangler/testlib/throttler_test.go
+++ b/go/vt/wrangler/testlib/throttler_test.go
@@ -41,8 +41,8 @@ func TestVtctlThrottlerCommands(t *testing.T) {
 		t.Fatalf("Cannot listen: %v", err)
 	}
 	s := grpc.NewServer()
+	grpcthrottlerserver.RegisterServer(s, throttler.GlobalManager)
 	go s.Serve(listener)
-	grpcthrottlerserver.StartServer(s, throttler.GlobalManager)
 
 	addr := fmt.Sprintf("localhost:%v", listener.Addr().(*net.TCPAddr).Port)
 
diff --git a/index.md b/index.md
index 5803f16e96b..3c8786d6bf4 100644
--- a/index.md
+++ b/index.md
@@ -2,7 +2,6 @@
   <div class="col-md-4">
     <h2><i class="fa fa-cubes"></i>&nbsp;Scalability</h2>
     <p class="desc">Vitess combines many important MySQL features with the scalability of a NoSQL database. Its built-in sharding features let you grow your database without adding sharding logic to your application.</p>
-<!--<p><a class="btn btn-default" href="/user-guide/sharding.html">View details</a></p>-->
   </div>
   <div class="col-md-4">
     <h2><i class="fa fa-fighter-jet"></i>&nbsp;Performance</h2>
@@ -17,7 +16,6 @@
   <div class="col-md-4">
     <h2><i class="fa fa-share-alt"></i>&nbsp;Connection pooling</h2>
     <p class="desc">Vitess eliminates the high-memory overhead of MySQL connections. Its gRPC-based protocol lets Vitess servers easily handle thousands of connections at once.</p>
-<!--<p><a class="btn btn-default" href="/user-guide/sharding.html">View details</a></p>-->
   </div>
   <div class="col-md-4">
     <h2><i class="fa fa-object-ungroup"></i>&nbsp;Shard Management</h2>
@@ -29,6 +27,66 @@
   </div>
 </div>
 
+<div class="page-spacer"></div>
+
+<!-- Ordering of logos: alphabetical with YouTube as exception.
+Slack and Nozzle are swapped for aesthetics, because the icons don't align well otherwise. -->
+
+<div class="row">
+  <div class="col-md-6">
+    <h2><i class="fa fa-flag-checkered"></i>&nbsp;Who uses Vitess</h2>
+    <div class="row logo-row">
+      <div class="col-md-3">
+        <img src="/images/users/youtube_logo.png" alt="YouTube" width="120">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/axon_logo.png" alt="Axon" width="60">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/bettercloud_logo.png" alt="BetterCloud" width="120">
+      </div>
+    </div>
+    <div class="row logo-row">
+      <div class="col-md-3">
+        <img src="/images/users/flipkart_logo.png" alt="Flipkart" width="120">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/hubspot_logo.png" alt="Hubspot" width="120">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/slack_logo.png" alt="Slack" width="120">
+      </div>
+    </div>
+    <div class="row logo-row">
+      <div class="col-md-3">
+        <img src="/images/users/pixel_federation_logo.png" alt="Pixel Federation" width="100">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/quiz_of_kings_logo.jpg" alt="Quiz of Kings" width="100">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/nozzle_logo.png" alt="Nozzle" width="60">
+      </div>
+    </div>
+    <div class="row logo-row">
+      <div class="col-md-3">
+        <img src="/images/users/square_logo.png" alt="Square" width="120">
+      </div>
+      <div class="col-md-3">
+        <img src="/images/users/stitchlabs_logo.png" alt="Stitch Labs" width="120">
+      </div>
+    </div>
+  </div>
+  <div class="col-md-6">
+    <h2><i class="fa fa-rocket"></i>&nbsp;An Introduction to Vitess</h2>
+    <div class="row">
+      <div class="col-md-12">
+        <iframe width="480" height="270" src="https://www.youtube.com/embed/q65TleTn2vg?rel=0" frameborder="0" allowfullscreen></iframe>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!--
 ## Contact
 
diff --git a/java/client/src/main/java/io/vitess/client/Context.java b/java/client/src/main/java/io/vitess/client/Context.java
index ade878228b6..b701820f635 100644
--- a/java/client/src/main/java/io/vitess/client/Context.java
+++ b/java/client/src/main/java/io/vitess/client/Context.java
@@ -16,11 +16,12 @@
 
 package io.vitess.client;
 
-import io.vitess.proto.Vtrpc.CallerID;
 import javax.annotation.Nullable;
 import org.joda.time.Duration;
 import org.joda.time.Instant;
 
+import io.vitess.proto.Vtrpc.CallerID;
+
 /**
  * Context is an immutable object that carries per-request info.
  *
diff --git a/java/client/src/main/java/io/vitess/client/Proto.java b/java/client/src/main/java/io/vitess/client/Proto.java
index 7bc3323d23b..1de01a23f68 100644
--- a/java/client/src/main/java/io/vitess/client/Proto.java
+++ b/java/client/src/main/java/io/vitess/client/Proto.java
@@ -21,17 +21,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.primitives.UnsignedLong;
 import com.google.protobuf.ByteString;
-import io.vitess.client.cursor.Cursor;
-import io.vitess.client.cursor.CursorWithError;
-import io.vitess.client.cursor.SimpleCursor;
-import io.vitess.proto.Query;
-import io.vitess.proto.Query.BindVariable;
-import io.vitess.proto.Query.BoundQuery;
-import io.vitess.proto.Query.QueryResult;
-import io.vitess.proto.Vtgate.BoundKeyspaceIdQuery;
-import io.vitess.proto.Vtgate.BoundShardQuery;
-import io.vitess.proto.Vtgate.ExecuteEntityIdsRequest.EntityId;
-import io.vitess.proto.Vtrpc.RPCError;
 import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.SQLIntegrityConstraintViolationException;
@@ -46,6 +35,18 @@
 import java.util.Map;
 import javax.annotation.Nullable;
 
+import io.vitess.client.cursor.Cursor;
+import io.vitess.client.cursor.CursorWithError;
+import io.vitess.client.cursor.SimpleCursor;
+import io.vitess.proto.Query;
+import io.vitess.proto.Query.BindVariable;
+import io.vitess.proto.Query.BoundQuery;
+import io.vitess.proto.Query.QueryResult;
+import io.vitess.proto.Vtgate.BoundKeyspaceIdQuery;
+import io.vitess.proto.Vtgate.BoundShardQuery;
+import io.vitess.proto.Vtgate.ExecuteEntityIdsRequest.EntityId;
+import io.vitess.proto.Vtrpc.RPCError;
+
 /**
  * Proto contains methods for working with Vitess protobuf messages.
  */
diff --git a/java/client/src/main/java/io/vitess/client/RpcClient.java b/java/client/src/main/java/io/vitess/client/RpcClient.java
index 95e2a983d42..65a6e6d2020 100644
--- a/java/client/src/main/java/io/vitess/client/RpcClient.java
+++ b/java/client/src/main/java/io/vitess/client/RpcClient.java
@@ -17,6 +17,9 @@
 package io.vitess.client;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import java.io.Closeable;
+import java.sql.SQLException;
+
 import io.vitess.proto.Query.QueryResult;
 import io.vitess.proto.Vtgate;
 import io.vitess.proto.Vtgate.BeginRequest;
@@ -47,8 +50,6 @@
 import io.vitess.proto.Vtgate.StreamExecuteKeyspaceIdsRequest;
 import io.vitess.proto.Vtgate.StreamExecuteRequest;
 import io.vitess.proto.Vtgate.StreamExecuteShardsRequest;
-import java.io.Closeable;
-import java.sql.SQLException;
 
 /**
  * RpcClient defines a set of methods to communicate with VTGates.
diff --git a/java/client/src/main/java/io/vitess/client/VTGateBlockingConn.java b/java/client/src/main/java/io/vitess/client/VTGateBlockingConn.java
index a156232ea53..03ca209bc0d 100644
--- a/java/client/src/main/java/io/vitess/client/VTGateBlockingConn.java
+++ b/java/client/src/main/java/io/vitess/client/VTGateBlockingConn.java
@@ -16,6 +16,14 @@
 
 package io.vitess.client;
 
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.proto.Query;
@@ -26,13 +34,6 @@
 import io.vitess.proto.Vtgate.BoundKeyspaceIdQuery;
 import io.vitess.proto.Vtgate.BoundShardQuery;
 import io.vitess.proto.Vtgate.SplitQueryResponse;
-import java.io.Closeable;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * A synchronous wrapper around a VTGate connection.
diff --git a/java/client/src/main/java/io/vitess/client/VTGateBlockingConnection.java b/java/client/src/main/java/io/vitess/client/VTGateBlockingConnection.java
index 9b72c4cabcc..183f17ac2a3 100644
--- a/java/client/src/main/java/io/vitess/client/VTGateBlockingConnection.java
+++ b/java/client/src/main/java/io/vitess/client/VTGateBlockingConnection.java
@@ -16,18 +16,17 @@
 
 package io.vitess.client;
 
-import io.vitess.client.cursor.Cursor;
-import io.vitess.client.cursor.CursorWithError;
-import io.vitess.proto.Query;
-import io.vitess.proto.Query.SplitQueryRequest.Algorithm;
-import io.vitess.proto.Vtgate.SplitQueryResponse;
-
-import javax.annotation.Nullable;
 import java.io.Closeable;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nullable;
+
+import io.vitess.client.cursor.Cursor;
+import io.vitess.client.cursor.CursorWithError;
+import io.vitess.proto.Query.SplitQueryRequest.Algorithm;
+import io.vitess.proto.Vtgate.SplitQueryResponse;
 
 /**
  * An asynchronous VTGate connection.
@@ -59,59 +58,18 @@ public VTGateBlockingConnection(RpcClient client) {
         vtGateConnection = new VTGateConnection(client);
     }
 
-    /**
-     * Creates a VTGate connection with targetString (keyspace@shard:tabletType).
-     * <p>
-     * <p>In this mode, VTGate will use the information provided in the session to redirect to query.
-     * For anything undefined, VTGate will use VSchema to resolve it. </p>
-     *
-     * @param client       RPC connection
-     * @param targetString In the format keyspace@shard:tabletType. Only provide the part what needs to be set.
-     */
-    public VTGateBlockingConnection(RpcClient client, String targetString) {
-        vtGateConnection = new VTGateConnection(client, targetString);
-    }
-
-    /**
-     * Creates a VTGate connection.
-     * <p>
-     * <p>In this mode, VTGate will use VSchema to resolve the keyspace for any unprefixed
-     * table names. Note that this only works if the table name is unique across all keyspaces.
-     * Additionally, it will pass on all the options to the underlying database.</p>
-     *
-     * @param client  RPC connection
-     * @param options Additional parameters to be passed along the query to the underlying database engine.
-     */
-    public VTGateBlockingConnection(RpcClient client, Query.ExecuteOptions options) {
-        vtGateConnection = new VTGateConnection(client, options);
-    }
-
-    /**
-     * Creates a VTGate connection with targetString and execution options.
-     * <p>
-     * <p>In this mode, VTGate will use the information provided in the session to redirect to query.
-     * For anything undefined, VTGate will use VSchema to resolve it.
-     * Additionally, it will pass on all the options to the underlying database.</p>
-     *
-     * @param client       RPC connection
-     * @param targetString In the format keyspace@shard:tabletType. Only provide the part what needs to be set.
-     * @param options      Additional parameters to be passed along the query to the underlying database engine.
-     */
-    public VTGateBlockingConnection(RpcClient client, String targetString, Query.ExecuteOptions options) {
-        vtGateConnection = new VTGateConnection(client, targetString, options);
-    }
-
     /**
      * This method calls the VTGate to execute the query.
      *
-     * @param ctx      Context on user and execution deadline if any.
-     * @param query    Sql Query to be executed.
-     * @param bindVars Parameters to bind with sql.
+     * @param ctx       Context on user and execution deadline if any.
+     * @param query     Sql Query to be executed.
+     * @param bindVars  Parameters to bind with sql.
+     * @param vtSession Session to be used with the call.
      * @return Cursor
      * @throws SQLException If anything fails on query execution.
      */
-    public Cursor execute(Context ctx, String query, @Nullable Map<String, ?> bindVars) throws SQLException {
-        return vtGateConnection.execute(ctx, query, bindVars).checkedGet();
+    public Cursor execute(Context ctx, String query, @Nullable Map<String, ?> bindVars, final VTSession vtSession) throws SQLException {
+        return vtGateConnection.execute(ctx, query, bindVars, vtSession).checkedGet();
     }
 
     /**
@@ -121,11 +79,12 @@ public Cursor execute(Context ctx, String query, @Nullable Map<String, ?> bindVa
      * @param queryList    List of sql queries to be executed.
      * @param bindVarsList <p>For each sql query it will provide a list of parameters to bind with.
      *                     If provided, should match the number of sql queries.</p>
+     * @param vtSession    Session to be used with the call.
      * @return List of Cursors
      * @throws SQLException If anything fails on query execution.
      */
-    public List<CursorWithError> executeBatch(Context ctx, List<String> queryList, @Nullable List<Map<String, ?>> bindVarsList) throws SQLException {
-        return vtGateConnection.executeBatch(ctx, queryList, bindVarsList).checkedGet();
+    public List<CursorWithError> executeBatch(Context ctx, List<String> queryList, @Nullable List<Map<String, ?>> bindVarsList, final VTSession vtSession) throws SQLException {
+        return vtGateConnection.executeBatch(ctx, queryList, bindVarsList, vtSession).checkedGet();
     }
 
     /**
@@ -139,24 +98,26 @@ public List<CursorWithError> executeBatch(Context ctx, List<String> queryList, @
      * @param bindVarsList  <p>For each sql query it will provide a list of parameters to bind with.
      *                      If provided, should match the number of sql queries.</p>
      * @param asTransaction To execute query without impacting session cookie.
+     * @param vtSession     Session to be used with the call.
      * @return List of Cursors
      * @throws SQLException If anything fails on query execution.
      */
-    public List<CursorWithError> executeBatch(Context ctx, List<String> queryList, @Nullable List<Map<String, ?>> bindVarsList, boolean asTransaction) throws SQLException {
-        return vtGateConnection.executeBatch(ctx, queryList, bindVarsList, asTransaction).checkedGet();
+    public List<CursorWithError> executeBatch(Context ctx, List<String> queryList, @Nullable List<Map<String, ?>> bindVarsList, boolean asTransaction, final VTSession vtSession) throws SQLException {
+        return vtGateConnection.executeBatch(ctx, queryList, bindVarsList, asTransaction, vtSession).checkedGet();
     }
 
     /**
      * This method should be used execute select query to return response as a stream.
      *
-     * @param ctx      Context on user and execution deadline if any.
-     * @param query    Sql Query to be executed.
-     * @param bindVars Parameters to bind with sql.
+     * @param ctx       Context on user and execution deadline if any.
+     * @param query     Sql Query to be executed.
+     * @param bindVars  Parameters to bind with sql.
+     * @param vtSession Session to be used with the call.
      * @return Cursor
      * @throws SQLException Returns SQLException if there is any failure on VTGate.
      */
-    public Cursor streamExecute(Context ctx, String query, @Nullable Map<String, ?> bindVars) throws SQLException {
-        return vtGateConnection.streamExecute(ctx, query, bindVars);
+    public Cursor streamExecute(Context ctx, String query, @Nullable Map<String, ?> bindVars, VTSession vtSession) throws SQLException {
+        return vtGateConnection.streamExecute(ctx, query, bindVars, vtSession);
     }
 
     /**
diff --git a/java/client/src/main/java/io/vitess/client/VTGateBlockingTx.java b/java/client/src/main/java/io/vitess/client/VTGateBlockingTx.java
index fe12c040392..18361bbcb6d 100644
--- a/java/client/src/main/java/io/vitess/client/VTGateBlockingTx.java
+++ b/java/client/src/main/java/io/vitess/client/VTGateBlockingTx.java
@@ -16,6 +16,11 @@
 
 package io.vitess.client;
 
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.proto.Query;
@@ -23,10 +28,6 @@
 import io.vitess.proto.Topodata.TabletType;
 import io.vitess.proto.Vtgate.BoundKeyspaceIdQuery;
 import io.vitess.proto.Vtgate.BoundShardQuery;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * A synchronous wrapper around a VTGate transaction.
diff --git a/java/client/src/main/java/io/vitess/client/VTGateConn.java b/java/client/src/main/java/io/vitess/client/VTGateConn.java
index 21b75475f76..26dd5f4af79 100644
--- a/java/client/src/main/java/io/vitess/client/VTGateConn.java
+++ b/java/client/src/main/java/io/vitess/client/VTGateConn.java
@@ -24,6 +24,15 @@
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.SQLDataException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.client.cursor.SimpleCursor;
@@ -60,14 +69,6 @@
 import io.vitess.proto.Vtgate.StreamExecuteKeyspaceIdsRequest;
 import io.vitess.proto.Vtgate.StreamExecuteRequest;
 import io.vitess.proto.Vtgate.StreamExecuteShardsRequest;
-import java.io.Closeable;
-import java.io.IOException;
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * An asynchronous VTGate connection.
diff --git a/java/client/src/main/java/io/vitess/client/VTGateConnection.java b/java/client/src/main/java/io/vitess/client/VTGateConnection.java
index 24be67df334..96d705c8db9 100644
--- a/java/client/src/main/java/io/vitess/client/VTGateConnection.java
+++ b/java/client/src/main/java/io/vitess/client/VTGateConnection.java
@@ -16,9 +16,22 @@
 
 package io.vitess.client;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.util.concurrent.Futures.transformAsync;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.SQLDataException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.client.cursor.SimpleCursor;
@@ -28,24 +41,10 @@
 import io.vitess.proto.Vtgate;
 import io.vitess.proto.Vtgate.ExecuteRequest;
 import io.vitess.proto.Vtgate.ExecuteResponse;
-import io.vitess.proto.Vtgate.Session;
 import io.vitess.proto.Vtgate.SplitQueryRequest;
 import io.vitess.proto.Vtgate.SplitQueryResponse;
 import io.vitess.proto.Vtgate.StreamExecuteRequest;
 
-import javax.annotation.Nullable;
-import java.io.Closeable;
-import java.io.IOException;
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.util.concurrent.Futures.transformAsync;
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
-
 /**
  * An asynchronous VTGate connection.
  * <p>
@@ -63,7 +62,6 @@
  */
 public final class VTGateConnection implements Closeable {
     private final RpcClient client;
-    private Session session;
     private SQLFuture<?> lastCall;
 
     /**
@@ -75,70 +73,25 @@ public final class VTGateConnection implements Closeable {
      * @param client RPC connection
      */
     public VTGateConnection(RpcClient client) {
-        this(client, null, null);
-    }
-
-    /**
-     * Creates a VTGate connection with targetString (keyspace@shard:tabletType).
-     * <p>
-     * <p>In this mode, VTGate will use the information provided in the session to redirect to query.
-     * For anything undefined, VTGate will use VSchema to resolve it. </p>
-     *
-     * @param client       RPC connection
-     * @param targetString In the format keyspace@shard:tabletType. Only provide the part what needs to be set.
-     */
-    public VTGateConnection(RpcClient client, String targetString) {
-        this(client, targetString, null);
-    }
-
-    /**
-     * Creates a VTGate connection.
-     * <p>
-     * <p>In this mode, VTGate will use VSchema to resolve the keyspace for any unprefixed
-     * table names. Note that this only works if the table name is unique across all keyspaces.
-     * Additionally, it will pass on all the options to the underlying database.</p>
-     *
-     * @param client  RPC connection
-     * @param options Additional parameters to be passed along the query to the underlying database engine.
-     */
-    public VTGateConnection(RpcClient client, Query.ExecuteOptions options) {
-        this(client, null, options);
-    }
-
-    /**
-     * Creates a VTGate connection with targetString and execution options.
-     * <p>
-     * <p>In this mode, VTGate will use the information provided in the session to redirect to query.
-     * For anything undefined, VTGate will use VSchema to resolve it.
-     * Additionally, it will pass on all the options to the underlying database.</p>
-     *
-     * @param client       RPC connection
-     * @param targetString In the format keyspace@shard:tabletType. Only provide the part what needs to be set.
-     * @param options      Additional parameters to be passed along the query to the underlying database engine.
-     */
-    public VTGateConnection(RpcClient client, String targetString, Query.ExecuteOptions options) {
         this.client = checkNotNull(client);
-        this.session = Session.newBuilder()
-                .setTargetString(null == targetString ? "" : targetString)
-                .setOptions(null == options ? Query.ExecuteOptions.newBuilder().build() : options)
-                .build();
     }
 
     /**
      * This method calls the VTGate to execute the query.
      *
-     * @param ctx      Context on user and execution deadline if any.
-     * @param query    Sql Query to be executed.
-     * @param bindVars Parameters to bind with sql.
+     * @param ctx       Context on user and execution deadline if any.
+     * @param query     Sql Query to be executed.
+     * @param bindVars  Parameters to bind with sql.
+     * @param vtSession Session to be used with the call.
      * @return SQL Future Cursor
      * @throws SQLException If anything fails on query execution.
      */
-    public SQLFuture<Cursor> execute(Context ctx, String query, @Nullable Map<String, ?> bindVars) throws SQLException {
+    public SQLFuture<Cursor> execute(Context ctx, String query, @Nullable Map<String, ?> bindVars, final VTSession vtSession) throws SQLException {
         synchronized (this) {
             checkCallIsAllowed("execute");
             ExecuteRequest.Builder requestBuilder = ExecuteRequest.newBuilder()
                     .setQuery(Proto.bindQuery(checkNotNull(query), bindVars))
-                    .setSession(session);
+                    .setSession(vtSession.getSession());
 
             if (ctx.getCallerId() != null) {
                 requestBuilder.setCallerId(ctx.getCallerId());
@@ -149,7 +102,7 @@ public SQLFuture<Cursor> execute(Context ctx, String query, @Nullable Map<String
                             new AsyncFunction<ExecuteResponse, Cursor>() {
                                 @Override
                                 public ListenableFuture<Cursor> apply(ExecuteResponse response) throws Exception {
-                                    setSession(response.getSession());
+                                    vtSession.setSession(response.getSession());
                                     Proto.checkError(response.getError());
                                     return Futures.<Cursor>immediateFuture(new SimpleCursor(response.getResult()));
                                 }
@@ -166,11 +119,12 @@ public ListenableFuture<Cursor> apply(ExecuteResponse response) throws Exception
      * @param queryList    List of sql queries to be executed.
      * @param bindVarsList <p>For each sql query it will provide a list of parameters to bind with.
      *                     If provided, should match the number of sql queries.</p>
+     * @param vtSession    Session to be used with the call.
      * @return SQL Future with List of Cursors
      * @throws SQLException If anything fails on query execution.
      */
-    public SQLFuture<List<CursorWithError>> executeBatch(Context ctx, List<String> queryList, @Nullable List<Map<String, ?>> bindVarsList) throws SQLException {
-        return executeBatch(ctx, queryList, bindVarsList, false);
+    public SQLFuture<List<CursorWithError>> executeBatch(Context ctx, List<String> queryList, @Nullable List<Map<String, ?>> bindVarsList, final VTSession vtSession) throws SQLException {
+        return executeBatch(ctx, queryList, bindVarsList, false, vtSession);
     }
 
     /**
@@ -184,10 +138,11 @@ public SQLFuture<List<CursorWithError>> executeBatch(Context ctx, List<String> q
      * @param bindVarsList  <p>For each sql query it will provide a list of parameters to bind with.
      *                      If provided, should match the number of sql queries.</p>
      * @param asTransaction To execute query without impacting session cookie.
+     * @param vtSession     Session to be used with the call.
      * @return SQL Future with List of Cursors
      * @throws SQLException If anything fails on query execution.
      */
-    public SQLFuture<List<CursorWithError>> executeBatch(Context ctx, List<String> queryList, @Nullable List<Map<String, ?>> bindVarsList, boolean asTransaction) throws SQLException {
+    public SQLFuture<List<CursorWithError>> executeBatch(Context ctx, List<String> queryList, @Nullable List<Map<String, ?>> bindVarsList, boolean asTransaction, final VTSession vtSession) throws SQLException {
         synchronized (this) {
             checkCallIsAllowed("executeBatch");
             List<Query.BoundQuery> queries = new ArrayList<>();
@@ -205,7 +160,7 @@ public SQLFuture<List<CursorWithError>> executeBatch(Context ctx, List<String> q
             Vtgate.ExecuteBatchRequest.Builder requestBuilder =
                     Vtgate.ExecuteBatchRequest.newBuilder()
                             .addAllQueries(checkNotNull(queries))
-                            .setSession(session)
+                            .setSession(vtSession.getSession())
                             .setAsTransaction(asTransaction);
 
             if (ctx.getCallerId() != null) {
@@ -217,7 +172,7 @@ public SQLFuture<List<CursorWithError>> executeBatch(Context ctx, List<String> q
                             new AsyncFunction<Vtgate.ExecuteBatchResponse, List<CursorWithError>>() {
                                 @Override
                                 public ListenableFuture<List<CursorWithError>> apply(Vtgate.ExecuteBatchResponse response) throws Exception {
-                                    setSession(response.getSession());
+                                    vtSession.setSession(response.getSession());
                                     Proto.checkError(response.getError());
                                     return Futures.immediateFuture(
                                             Proto.fromQueryResponsesToCursorList(response.getResultsList()));
@@ -229,19 +184,19 @@ public ListenableFuture<List<CursorWithError>> apply(Vtgate.ExecuteBatchResponse
     }
 
     /**
-     * This method should be used execute select query to return response as a stream.
      *
-     * @param ctx      Context on user and execution deadline if any.
-     * @param query    Sql Query to be executed.
-     * @param bindVars Parameters to bind with sql.
-     * @return Cursor
-     * @throws SQLException Returns SQLException if there is any failure on VTGate.
+     * @param ctx       Context on user and execution deadline if any.
+     * @param query     Sql Query to be executed.
+     * @param bindVars  Parameters to bind with sql.
+     * @param vtSession Session to be used with the call.
+     * @return
+     * @throws SQLException
      */
-    public Cursor streamExecute(Context ctx, String query, @Nullable Map<String, ?> bindVars) throws SQLException {
+    public Cursor streamExecute(Context ctx, String query, @Nullable Map<String, ?> bindVars, VTSession vtSession) throws SQLException {
         StreamExecuteRequest.Builder requestBuilder =
                 StreamExecuteRequest.newBuilder()
                         .setQuery(Proto.bindQuery(checkNotNull(query), bindVars))
-                        .setSession(session);
+                        .setSession(vtSession.getSession());
 
         if (ctx.getCallerId() != null) {
             requestBuilder.setCallerId(ctx.getCallerId());
@@ -249,7 +204,6 @@ public Cursor streamExecute(Context ctx, String query, @Nullable Map<String, ?>
 
         return new StreamCursor(client.streamExecute(ctx, requestBuilder.build()));
     }
-
     /**
      * This method splits the query into small parts based on the splitColumn and Algorithm type provided.
      *
@@ -315,15 +269,4 @@ private void checkCallIsAllowed(String call) throws IllegalStateException {
         }
     }
 
-    /**
-     * This method set the session cookie returned from VTGate.
-     * <p>
-     * <p>This method is not synchronized as the callee function is synchronized.</p>
-     *
-     * @param session Updated session to be set.
-     */
-    private void setSession(Session session) {
-        this.session = session;
-    }
-
 }
diff --git a/java/client/src/main/java/io/vitess/client/VTGateTx.java b/java/client/src/main/java/io/vitess/client/VTGateTx.java
index 136ced00716..4e330790383 100644
--- a/java/client/src/main/java/io/vitess/client/VTGateTx.java
+++ b/java/client/src/main/java/io/vitess/client/VTGateTx.java
@@ -24,6 +24,13 @@
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import java.sql.SQLDataException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.client.cursor.SimpleCursor;
@@ -52,12 +59,6 @@
 import io.vitess.proto.Vtgate.RollbackRequest;
 import io.vitess.proto.Vtgate.RollbackResponse;
 import io.vitess.proto.Vtgate.Session;
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * An asynchronous VTGate transaction session.
diff --git a/java/client/src/main/java/io/vitess/client/VTSession.java b/java/client/src/main/java/io/vitess/client/VTSession.java
new file mode 100644
index 00000000000..52056654745
--- /dev/null
+++ b/java/client/src/main/java/io/vitess/client/VTSession.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vitess.client;
+
+import io.vitess.proto.Query;
+import io.vitess.proto.Vtgate;
+
+/**
+ * A persistence session state for each connection.
+ *
+ */
+public class VTSession {
+    private Vtgate.Session session;
+
+    /**
+     * Create session cookie.
+     *
+     * @param target    In the format keyspace@shard:tabletType. Only provide the part what needs to be set.
+     * @param options   Additional parameters to be passed along the query to the underlying database engine.
+     */
+    public VTSession(String target, Query.ExecuteOptions options) {
+        this.session = Vtgate.Session.newBuilder()
+                .setTargetString(null == target ? "" : target)
+                .setOptions(null == options ? Query.ExecuteOptions.newBuilder().build() : options)
+                .setAutocommit(true)
+                .setInTransaction(false)
+                .build();
+    }
+
+    /**
+     * Returns the persistent session cookie.
+     *
+     * @return Session
+     */
+    public Vtgate.Session getSession() {
+        return this.session;
+    }
+
+    /**
+     * This method set the session cookie returned from VTGate.
+     * <p>
+     * <p>This method is not synchronized as the callee function is synchronized.</p>
+     *
+     * @param session Updated globalSession to be set.
+     */
+    public void setSession(Vtgate.Session session) {
+        this.session = session;
+    }
+
+    /**
+     * Returns the current state of commit mode.
+     *
+     * @return autocommit state
+     */
+    public boolean isAutoCommit() {
+        return this.session.getAutocommit();
+    }
+
+    /**
+     * Set the auto commit state.
+     *
+     * @param autoCommit true or false
+     */
+    public void setAutoCommit(boolean autoCommit) {
+        this.session = this.session.toBuilder().setAutocommit(autoCommit).build();
+    }
+
+    /**
+     * Returns whether session is maintaining any transaction or not.
+     *
+     * @return true or false based on if session cookie is maintaining any transaction.
+     */
+    public boolean isInTransaction() {
+        return this.session.getShardSessionsCount() > 0;
+    }
+
+}
diff --git a/java/client/src/main/java/io/vitess/client/cursor/Cursor.java b/java/client/src/main/java/io/vitess/client/cursor/Cursor.java
index 761f1512360..d7f479bb21c 100644
--- a/java/client/src/main/java/io/vitess/client/cursor/Cursor.java
+++ b/java/client/src/main/java/io/vitess/client/cursor/Cursor.java
@@ -18,8 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import io.vitess.proto.Query.Field;
-import io.vitess.proto.Query.QueryResult;
 import java.sql.SQLDataException;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
@@ -27,6 +25,9 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import io.vitess.proto.Query.Field;
+import io.vitess.proto.Query.QueryResult;
+
 /**
  * Provides access to the result rows of a query.
  *
diff --git a/java/client/src/main/java/io/vitess/client/cursor/FieldMap.java b/java/client/src/main/java/io/vitess/client/cursor/FieldMap.java
index 454f99a21a3..7f7af532c06 100644
--- a/java/client/src/main/java/io/vitess/client/cursor/FieldMap.java
+++ b/java/client/src/main/java/io/vitess/client/cursor/FieldMap.java
@@ -20,12 +20,13 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableList;
-import io.vitess.proto.Query.Field;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.commons.collections4.map.CaseInsensitiveMap;
 
+import io.vitess.proto.Query.Field;
+
 /**
  * A wrapper for {@code List<Field>} that also facilitates lookup by field name.
  *
@@ -37,20 +38,39 @@
  */
 public class FieldMap {
   private final List<Field> fields;
-  private final Map<String, Integer> indexMap;
+  private final Map<String, Integer> labelMap;
+  private final Map<String, Integer> nameMap;
+  private final Map<String, Integer> fullNameMap;
 
   public FieldMap(Iterable<Field> fields) {
     this.fields = ImmutableList.copyOf(checkNotNull(fields));
 
-    indexMap = new CaseInsensitiveMap<String, Integer>();
+    labelMap = new CaseInsensitiveMap<String, Integer>();
+    nameMap = new CaseInsensitiveMap<String, Integer>();
+    fullNameMap = new CaseInsensitiveMap<String, Integer>();
     // columnIndex is 1-based.
     int columnIndex = 1;
     for (Field field : this.fields) {
-      String columnLabel = field.getName();
       // If multiple columns have the same name,
       // prefer the earlier one as JDBC ResultSet does.
-      if (!indexMap.containsKey(columnLabel)) {
-        indexMap.put(columnLabel, columnIndex);
+      String columnLabel = field.getName();
+      if (!labelMap.containsKey(columnLabel)) {
+        labelMap.put(columnLabel, columnIndex);
+      }
+      String origName = field.getOrgName();
+      if (origName != null && !"".equals(origName) && !nameMap.containsKey(origName)) {
+        nameMap.put(origName, columnIndex);
+      }
+      String tableName = field.getTable();
+      if (tableName != null && !"".equals(tableName)) {
+        StringBuilder fullNameBuf = new StringBuilder();
+        fullNameBuf.append(tableName);
+        fullNameBuf.append('.');
+        fullNameBuf.append(field.getName());
+        String fullName = fullNameBuf.toString();
+        if (!fullNameMap.containsKey(fullName)) {
+          fullNameMap.put(fullName, columnIndex);
+        }
       }
       ++columnIndex;
     }
@@ -81,6 +101,13 @@ public Field get(int columnIndex) {
    */
   @Nullable
   public Integer getIndex(String columnLabel) {
-    return indexMap.get(columnLabel);
+    Integer index = labelMap.get(columnLabel);
+    if (index == null) {
+      index = nameMap.get(columnLabel);
+    }
+    if (index == null) {
+      index = fullNameMap.get(columnLabel);
+    }
+    return index;
   }
 }
diff --git a/java/client/src/main/java/io/vitess/client/cursor/Row.java b/java/client/src/main/java/io/vitess/client/cursor/Row.java
index 0da0833a235..20c079cbefc 100644
--- a/java/client/src/main/java/io/vitess/client/cursor/Row.java
+++ b/java/client/src/main/java/io/vitess/client/cursor/Row.java
@@ -18,6 +18,9 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.primitives.UnsignedLong;
+import com.google.protobuf.ByteString;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -30,13 +33,8 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-
 import javax.annotation.concurrent.NotThreadSafe;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.primitives.UnsignedLong;
-import com.google.protobuf.ByteString;
-
 import io.vitess.mysql.DateTime;
 import io.vitess.proto.Query;
 import io.vitess.proto.Query.Field;
diff --git a/java/client/src/main/java/io/vitess/client/cursor/SimpleCursor.java b/java/client/src/main/java/io/vitess/client/cursor/SimpleCursor.java
index 9a38d2ca1f7..bc1c447ac63 100644
--- a/java/client/src/main/java/io/vitess/client/cursor/SimpleCursor.java
+++ b/java/client/src/main/java/io/vitess/client/cursor/SimpleCursor.java
@@ -16,14 +16,15 @@
 
 package io.vitess.client.cursor;
 
-import io.vitess.proto.Query;
-import io.vitess.proto.Query.Field;
-import io.vitess.proto.Query.QueryResult;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import io.vitess.proto.Query;
+import io.vitess.proto.Query.Field;
+import io.vitess.proto.Query.QueryResult;
+
 /**
  * A {@link Cursor} that serves records from a single {@link QueryResult} object.
  */
diff --git a/java/client/src/main/java/io/vitess/client/cursor/StreamCursor.java b/java/client/src/main/java/io/vitess/client/cursor/StreamCursor.java
index 7654bd7fb3f..4ab56eea654 100644
--- a/java/client/src/main/java/io/vitess/client/cursor/StreamCursor.java
+++ b/java/client/src/main/java/io/vitess/client/cursor/StreamCursor.java
@@ -16,10 +16,6 @@
 
 package io.vitess.client.cursor;
 
-import io.vitess.client.StreamIterator;
-import io.vitess.proto.Query;
-import io.vitess.proto.Query.Field;
-import io.vitess.proto.Query.QueryResult;
 import java.sql.SQLDataException;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
@@ -27,6 +23,11 @@
 import java.util.List;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import io.vitess.client.StreamIterator;
+import io.vitess.proto.Query;
+import io.vitess.proto.Query.Field;
+import io.vitess.proto.Query.QueryResult;
+
 /**
  * A {@link Cursor} that serves records from the sequence of {@link QueryResult} objects
  * represented by a {@link StreamIterator}.
diff --git a/java/client/src/test/java/io/vitess/client/BindVarTest.java b/java/client/src/test/java/io/vitess/client/BindVarTest.java
index e00f4cf19e5..1b976d8d8b9 100644
--- a/java/client/src/test/java/io/vitess/client/BindVarTest.java
+++ b/java/client/src/test/java/io/vitess/client/BindVarTest.java
@@ -20,8 +20,6 @@
 
 import com.google.common.primitives.UnsignedLong;
 import com.google.protobuf.ByteString;
-import io.vitess.proto.Query;
-import io.vitess.proto.Query.BindVariable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,6 +28,9 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import io.vitess.proto.Query;
+import io.vitess.proto.Query.BindVariable;
+
 @RunWith(value = Parameterized.class)
 public class BindVarTest {
   private Object input;
diff --git a/java/client/src/test/java/io/vitess/client/EntityIdTest.java b/java/client/src/test/java/io/vitess/client/EntityIdTest.java
index 9689196eb9c..82a5064dc49 100644
--- a/java/client/src/test/java/io/vitess/client/EntityIdTest.java
+++ b/java/client/src/test/java/io/vitess/client/EntityIdTest.java
@@ -20,8 +20,6 @@
 
 import com.google.common.primitives.UnsignedLong;
 import com.google.protobuf.ByteString;
-import io.vitess.proto.Query;
-import io.vitess.proto.Vtgate.ExecuteEntityIdsRequest.EntityId;
 import java.util.Arrays;
 import java.util.Collection;
 import org.junit.Test;
@@ -29,6 +27,9 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import io.vitess.proto.Query;
+import io.vitess.proto.Vtgate.ExecuteEntityIdsRequest.EntityId;
+
 @RunWith(value = Parameterized.class)
 public class EntityIdTest {
   private Object input;
diff --git a/java/client/src/test/java/io/vitess/client/RpcClientTest.java b/java/client/src/test/java/io/vitess/client/RpcClientTest.java
index 52b451af705..193a0abc2cc 100644
--- a/java/client/src/test/java/io/vitess/client/RpcClientTest.java
+++ b/java/client/src/test/java/io/vitess/client/RpcClientTest.java
@@ -16,6 +16,10 @@
 
 package io.vitess.client;
 
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.protobuf.ByteString;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLDataException;
 import java.sql.SQLException;
@@ -31,7 +35,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.junit.Assert;
@@ -39,11 +42,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.protobuf.ByteString;
-
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.Row;
 import io.vitess.proto.Query;
diff --git a/java/client/src/test/java/io/vitess/client/TestUtil.java b/java/client/src/test/java/io/vitess/client/TestUtil.java
index fc16a848484..395abc4817f 100644
--- a/java/client/src/test/java/io/vitess/client/TestUtil.java
+++ b/java/client/src/test/java/io/vitess/client/TestUtil.java
@@ -16,25 +16,23 @@
 
 package io.vitess.client;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.joda.time.Duration;
 import org.junit.Assert;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.reflect.TypeToken;
+import vttest.Vttest.VTTestTopology;
 
 import io.vitess.proto.Query;
 import io.vitess.proto.Topodata.TabletType;
-import vttest.Vttest.VTTestTopology;
 
 public class TestUtil {
   static final Logger logger = LogManager.getLogger(TestUtil.class.getName());
diff --git a/java/client/src/test/java/io/vitess/client/cursor/CursorTest.java b/java/client/src/test/java/io/vitess/client/cursor/CursorTest.java
index b44d0556ee3..0534cf72b4c 100644
--- a/java/client/src/test/java/io/vitess/client/cursor/CursorTest.java
+++ b/java/client/src/test/java/io/vitess/client/cursor/CursorTest.java
@@ -16,24 +16,23 @@
 
 package io.vitess.client.cursor;
 
+import com.google.common.primitives.UnsignedLong;
+import com.google.protobuf.ByteString;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Date;
+import java.sql.SQLDataException;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 import java.util.TimeZone;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.google.common.primitives.UnsignedLong;
-import com.google.protobuf.ByteString;
-
 import io.vitess.proto.Query;
 import io.vitess.proto.Query.Field;
 import io.vitess.proto.Query.QueryResult;
@@ -56,6 +55,26 @@ public void testFindColumn() throws Exception {
     }
   }
 
+  @Test
+  public void testFindColumnAlternateIndexes() throws Exception {
+    try (Cursor cursor = new SimpleCursor(
+        QueryResult.newBuilder().addFields(Field.newBuilder().setName("col1").setTable("Table1").build())
+        .addFields(Field.newBuilder().setName("myAlias").setOrgName("boringColName").setTable("Table2").build())
+        .build())) {
+      Assert.assertEquals(1, cursor.findColumn("Table1.col1"));
+      Assert.assertEquals(1, cursor.findColumn("Table1.Col1"));
+      Assert.assertEquals(2, cursor.findColumn("myAlias"));
+      Assert.assertEquals(2, cursor.findColumn("Table2.myAlias"));
+      Assert.assertEquals(2, cursor.findColumn("boringColName"));
+      try {
+        int idx = cursor.findColumn("Table2.boringColName"); // don't do what mysql-connector-j doesn't do
+        Assert.fail("no exception thrown for findColumn(\"Table2.boringColName\")");
+      } catch (Exception ex) {
+        Assert.assertEquals(SQLDataException.class, ex.getClass());
+      }
+    }
+  }
+
   @Test
   public void testGetInt() throws Exception {
     List<Query.Type> types = Arrays.asList(Query.Type.INT8, Query.Type.UINT8, Query.Type.INT16,
diff --git a/java/example/src/main/java/io/vitess/example/VitessClientExample.java b/java/example/src/main/java/io/vitess/example/VitessClientExample.java
index d0df38de6a4..9c51ee42349 100644
--- a/java/example/src/main/java/io/vitess/example/VitessClientExample.java
+++ b/java/example/src/main/java/io/vitess/example/VitessClientExample.java
@@ -21,9 +21,12 @@
 import io.vitess.client.Context;
 import io.vitess.client.RpcClient;
 import io.vitess.client.VTGateBlockingConnection;
+import io.vitess.client.VTSession;
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.Row;
 import io.vitess.client.grpc.GrpcClientFactory;
+import io.vitess.proto.Query.ExecuteOptions;
+
 import org.joda.time.Duration;
 import org.joda.time.Instant;
 
@@ -46,6 +49,7 @@ public static void main(String[] args) {
         Context ctx = Context.getDefault().withDeadlineAfter(Duration.millis(5 * 1000));
         try (RpcClient client = new GrpcClientFactory().create(ctx, args[0]);
              VTGateBlockingConnection conn = new VTGateBlockingConnection(client)) {
+            VTSession session = new VTSession("@master", ExecuteOptions.getDefaultInstance());
             // Insert some messages on random pages.
             System.out.println("Inserting into master...");
             Random rand = new Random();
@@ -58,12 +62,12 @@ public static void main(String[] args) {
                                 .put("message", "V is for speed")
                                 .build();
 
-                conn.execute(ctx, "begin", null);
+                conn.execute(ctx, "begin", null, session);
                 conn.execute(
                         ctx,
                         "INSERT INTO messages (page,time_created_ns,message) VALUES (:page,:time_created_ns,:message)",
-                        bindVars);
-                conn.execute(ctx, "commit", null);
+                        bindVars, session);
+                conn.execute(ctx, "commit", null, session);
             }
 
             // Read it back from the master.
@@ -72,7 +76,7 @@ public static void main(String[] args) {
                          conn.execute(
                                  ctx,
                                  "SELECT page, time_created_ns, message FROM messages",
-                                 null)) {
+                                 null, session)) {
                 Row row;
                 while ((row = cursor.next()) != null) {
                     UnsignedLong page = row.getULong("page");
diff --git a/java/example/src/main/java/io/vitess/example/VitessJDBCExample.java b/java/example/src/main/java/io/vitess/example/VitessJDBCExample.java
index dfb581a4e28..c8ac0fde363 100644
--- a/java/example/src/main/java/io/vitess/example/VitessJDBCExample.java
+++ b/java/example/src/main/java/io/vitess/example/VitessJDBCExample.java
@@ -62,7 +62,7 @@ public static void main(String[] args) throws Exception {
             conn.commit();
 
             // Read it back from replica.
-            dbURL += "/test_keyspace?TABLET_TYPE=replica";
+            dbURL += "?target=test_keyspace@replica";
             try (Connection connReplica = DriverManager.getConnection(dbURL, null)) {
                 System.out.println("Reading from replica...");
                 readData(connReplica);
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/ConnectionProperties.java b/java/jdbc/src/main/java/io/vitess/jdbc/ConnectionProperties.java
index 16460167306..6162c528a21 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/ConnectionProperties.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/ConnectionProperties.java
@@ -16,11 +16,6 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.proto.Query;
-import io.vitess.proto.Topodata;
-import io.vitess.util.Constants;
-import io.vitess.util.StringUtils;
-
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.sql.DriverPropertyInfo;
@@ -30,6 +25,11 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
+import io.vitess.proto.Query;
+import io.vitess.proto.Topodata;
+import io.vitess.util.Constants;
+import io.vitess.util.StringUtils;
+
 public class ConnectionProperties {
 
     private static final ArrayList<java.lang.reflect.Field> PROPERTY_LIST = new ArrayList<>();
@@ -132,7 +132,7 @@ public class ConnectionProperties {
         Constants.DEFAULT_EXECUTE_TYPE);
     private BooleanConnectionProperty twopcEnabled = new BooleanConnectionProperty(
         Constants.Property.TWOPC_ENABLED,
-        "Whether to enable two-phased commit, for atomic distributed commits. See http://vitess.io/user-guide/twopc.html",
+        "Whether to enable two-phased commit, for atomic distributed commits. See http://vitess.io/user-guide/twopc/",
         false);
     private EnumConnectionProperty<Query.ExecuteOptions.IncludedFields> includedFields = new EnumConnectionProperty<>(
         Constants.Property.INCLUDED_FIELDS,
@@ -207,9 +207,16 @@ public class ConnectionProperties {
         "Should the driver treat java.util.Date as a TIMESTAMP for the purposes of PreparedStatement.setObject()",
         true);
 
+    private LongConnectionProperty timeout = new LongConnectionProperty(
+        "timeout",
+        "The default timeout, in millis, to use for queries, connections, and transaction commit/rollback. Query timeout can be overridden by explicitly calling setQueryTimeout",
+        Constants.DEFAULT_TIMEOUT
+    );
+
     // Caching of some hot properties to avoid casting over and over
     private Topodata.TabletType tabletTypeCache;
     private Query.ExecuteOptions.IncludedFields includedFieldsCache;
+    private Query.ExecuteOptions executeOptionsCache;
     private boolean includeAllFieldsCache = true;
     private boolean twopcEnabledCache = false;
     private boolean simpleExecuteTypeCache = true;
@@ -238,6 +245,7 @@ private void postInitialization() {
         this.simpleExecuteTypeCache = this.executeType.getValueAsEnum() == Constants.QueryExecuteType.SIMPLE;
         this.characterEncodingAsString = this.characterEncoding.getValueAsString();
         this.userNameCache = this.userName.getValueAsString();
+        this.executeOptionsCache = Query.ExecuteOptions.newBuilder().setIncludedFields(this.includedFieldsCache).build();
     }
 
     /**
@@ -357,6 +365,15 @@ public void setIncludedFields(Query.ExecuteOptions.IncludedFields includedFields
         this.includedFields.setValue(includedFields);
         this.includedFieldsCache = includedFields;
         this.includeAllFieldsCache = includedFields == Query.ExecuteOptions.IncludedFields.ALL;
+        this.setExecuteOptions();
+    }
+
+    private void setExecuteOptions() {
+        this.executeOptionsCache = Query.ExecuteOptions.newBuilder().setIncludedFields(this.includedFieldsCache).build();
+    }
+
+    public Query.ExecuteOptions getExecuteOptions() {
+        return this.executeOptionsCache;
     }
 
     public boolean getTwopcEnabled() {
@@ -462,6 +479,14 @@ public void setTreatUtilDateAsTimestamp(boolean treatUtilDateAsTimestamp) {
         this.treatUtilDateAsTimestamp.setValue(treatUtilDateAsTimestamp);
     }
 
+    public long getTimeout() {
+        return timeout.getValueAsLong();
+    }
+
+    public void setTimeout(long timeout) {
+        this.timeout.setValue(timeout);
+    }
+
     public String getTarget() {
         if(!StringUtils.isNullOrEmptyWithoutWS(target.getValueAsString())) {
             return target.getValueAsString();
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/DBProperties.java b/java/jdbc/src/main/java/io/vitess/jdbc/DBProperties.java
index 8a8bedeb257..6c64ebb5be3 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/DBProperties.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/DBProperties.java
@@ -20,17 +20,17 @@
  * Created by ashudeep.sharma on 10/03/16.
  */
 public class DBProperties {
-    private final String productversion;
+    private final String productVersion;
     private final String majorVersion;
     private final String minorVersion;
     private final int isolationLevel;
     private final boolean caseInsensitiveComparison;
     private final boolean storesLowerCaseTableName;
 
-    public DBProperties(String productversion, String majorVersion, String minorVersion,
+    public DBProperties(String productVersion, String majorVersion, String minorVersion,
                         int isolationLevel, String lowerCaseTableNames) {
 
-        this.productversion = productversion;
+        this.productVersion = productVersion;
         this.majorVersion = majorVersion;
         this.minorVersion = minorVersion;
         this.isolationLevel = isolationLevel;
@@ -38,8 +38,8 @@ public DBProperties(String productversion, String majorVersion, String minorVers
         this.storesLowerCaseTableName = "1".equalsIgnoreCase(lowerCaseTableNames);
     }
 
-    public String getProductversion() {
-        return this.productversion;
+    public String getProductVersion() {
+        return this.productVersion;
     }
 
     public String getMajorVersion() {
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/FieldWithMetadata.java b/java/jdbc/src/main/java/io/vitess/jdbc/FieldWithMetadata.java
index 05171247b8d..e26253e017f 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/FieldWithMetadata.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/FieldWithMetadata.java
@@ -16,12 +16,11 @@
 
 package io.vitess.jdbc;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.regex.PatternSyntaxException;
 
-import com.google.common.annotations.VisibleForTesting;
-
 import io.vitess.proto.Query;
 import io.vitess.util.Constants;
 import io.vitess.util.MysqlDefs;
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessConnection.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessConnection.java
index c8dc3ffc8c7..7946438003e 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessConnection.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessConnection.java
@@ -16,13 +16,6 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.client.Context;
-import io.vitess.client.VTGateConn;
-import io.vitess.client.VTGateTx;
-import io.vitess.util.CommonUtils;
-import io.vitess.util.Constants;
-import io.vitess.util.MysqlDefs;
-
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.CallableStatement;
@@ -50,14 +43,18 @@
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import io.vitess.client.Context;
+import io.vitess.client.VTGateConnection;
+import io.vitess.client.VTSession;
+import io.vitess.util.CommonUtils;
+import io.vitess.util.Constants;
+import io.vitess.util.MysqlDefs;
+
 /**
  * Created by harshit.gangal on 23/01/16.
  */
 public class VitessConnection extends ConnectionProperties implements Connection {
 
-    private static final int DEFAULT_RESULT_SET_TYPE = ResultSet.TYPE_FORWARD_ONLY;
-    private static final int DEFAULT_RESULT_SET_CONCURRENCY = ResultSet.CONCUR_READ_ONLY;
-
     /* Get actual class name to be printed on */
     private static Logger logger = Logger.getLogger(VitessConnection.class.getName());
     private static DatabaseMetaData databaseMetaData = null;
@@ -67,12 +64,11 @@ public class VitessConnection extends ConnectionProperties implements Connection
      */
     private Set<Statement> openStatements = new HashSet<>();
     private VitessVTGateManager.VTGateConnections vTGateConnections;
-    private VTGateTx vtGateTx;
     private boolean closed = true;
-    private boolean autoCommit = true;
     private boolean readOnly = false;
     private DBProperties dbProperties;
     private final VitessJDBCUrl vitessJDBCUrl;
+    private final VTSession vtSession;
 
     /**
      * Constructor to Create Connection Object
@@ -86,12 +82,12 @@ public VitessConnection(String url, Properties connectionProperties) throws SQLE
             this.vitessJDBCUrl = new VitessJDBCUrl(url, connectionProperties);
             this.closed = false;
             this.dbProperties = null;
+            initializeProperties(vitessJDBCUrl.getProperties());
+            this.vtSession = new VTSession(this.getTarget(), this.getExecuteOptions());
         } catch (Exception e) {
             throw new SQLException(
                 Constants.SQLExceptionMessages.CONN_INIT_ERROR + " - " + e.getMessage(), e);
         }
-
-        initializeProperties(vitessJDBCUrl.getProperties());
     }
 
     public void connect() {
@@ -142,7 +138,7 @@ public String nativeSQL(String sql) throws SQLException {
      */
     public boolean getAutoCommit() throws SQLException {
         checkOpen();
-        return this.autoCommit;
+        return this.vtSession.isAutoCommit();
     }
 
     /**
@@ -153,12 +149,12 @@ public boolean getAutoCommit() throws SQLException {
      */
     public void setAutoCommit(boolean autoCommit) throws SQLException {
         checkOpen();
-        if (this.autoCommit != autoCommit) { //If same then no-op
+        if (this.vtSession.isAutoCommit() != autoCommit) { //If same then no-op
             //Old Transaction Needs to be committed as per JDBC 4.1 Spec.
             if (isInTransaction()) {
                 this.commit();
             }
-            this.autoCommit = autoCommit;
+            this.vtSession.setAutoCommit(autoCommit);
         }
     }
 
@@ -170,15 +166,13 @@ public void setAutoCommit(boolean autoCommit) throws SQLException {
     public void commit() throws SQLException {
         checkOpen();
         checkAutoCommit(Constants.SQLExceptionMessages.COMMIT_WHEN_AUTO_COMMIT_TRUE);
-        try {
-            if (isInTransaction()) {
-                Context context = createContext(Constants.CONNECTION_TIMEOUT);
-                this.vtGateTx.commit(context, getTwopcEnabled()).checkedGet();
-            }
-        } finally {
-            this.vtGateTx = null;
+        if (isInTransaction()) {
+            commitTx();
         }
+    }
 
+    private void commitTx() throws SQLException {
+        executeCommand("commit");
     }
 
     /**
@@ -189,13 +183,18 @@ public void commit() throws SQLException {
     public void rollback() throws SQLException {
         checkOpen();
         checkAutoCommit(Constants.SQLExceptionMessages.ROLLBACK_WHEN_AUTO_COMMIT_TRUE);
-        try {
-            if (isInTransaction()) {
-                Context context = createContext(Constants.CONNECTION_TIMEOUT);
-                this.vtGateTx.rollback(context).checkedGet();
-            }
-        } finally {
-            this.vtGateTx = null;
+        if (isInTransaction()) {
+            rollbackTx();
+        }
+    }
+
+    private void rollbackTx() throws SQLException{
+        executeCommand("rollback");
+    }
+
+    private void executeCommand(String sql) throws SQLException {
+        try (Statement statement = this.createStatement()){
+            statement.executeUpdate(sql);
         }
     }
 
@@ -212,7 +211,6 @@ public void close() throws SQLException {
                 }
                 closeAllOpenStatements();
             } finally {
-                this.vtGateTx = null;
                 this.closed = true;
             }
         }
@@ -584,25 +582,21 @@ private void checkOpen() throws SQLException {
     }
 
     private void checkAutoCommit(String exception) throws SQLException {
-        if (this.autoCommit) {
+        if (this.vtSession.isAutoCommit()) {
             throw new SQLException(exception);
         }
     }
 
-    private boolean isInTransaction() {
-        return null != this.vtGateTx;
+    public boolean isInTransaction() {
+        return this.vtSession.isInTransaction();
     }
 
-    public VTGateConn getVtGateConn() {
+    public VTGateConnection getVtGateConn() {
         return vTGateConnections.getVtGateConnInstance();
     }
 
-    public VTGateTx getVtGateTx() {
-        return vtGateTx;
-    }
-
-    public void setVtGateTx(VTGateTx vtGateTx) {
-        this.vtGateTx = vtGateTx;
+    public VTSession getVtSession() {
+        return this.vtSession;
     }
 
     public VitessJDBCUrl getUrl() {
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessDatabaseMetaData.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessDatabaseMetaData.java
index a0c76e00973..e0f3c0fbd9d 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessDatabaseMetaData.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessDatabaseMetaData.java
@@ -16,13 +16,14 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.util.Constants;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.logging.Logger;
 
+import io.vitess.util.Constants;
+
 /**
  * Created by harshit.gangal on 25/01/16.
  */
@@ -76,7 +77,7 @@ public String getDatabaseProductName() throws SQLException {
     }
 
     public String getDatabaseProductVersion() throws SQLException {
-        return this.connection.getDbProperties().getProductversion();
+        return this.connection.getDbProperties().getProductVersion();
     }
 
     public String getDriverVersion() throws SQLException {
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessDriver.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessDriver.java
index 732b3b103b5..b78579b1abf 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessDriver.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessDriver.java
@@ -16,8 +16,6 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.util.Constants;
-
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverManager;
@@ -27,6 +25,8 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
+import io.vitess.util.Constants;
+
 /**
  * VitessDriver is the official JDBC driver for Vitess.
  *
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java
index 416a76734a6..ca7f39c22ee 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java
@@ -16,9 +16,6 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.util.Constants;
-import io.vitess.util.StringUtils;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.sql.SQLException;
@@ -29,6 +26,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import io.vitess.util.Constants;
+import io.vitess.util.StringUtils;
+
 /**
  * VitessJDBCUrl is responsible for parsing a driver URL and Properties object,
  * returning a new Properties object with configuration from the URL and passed in Properties
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessMariaDBDatabaseMetadata.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessMariaDBDatabaseMetadata.java
index ab546fb3036..1dc87d55d7e 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessMariaDBDatabaseMetadata.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessMariaDBDatabaseMetadata.java
@@ -16,8 +16,6 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.proto.Query;
-import io.vitess.util.Constants;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -26,6 +24,9 @@
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.logging.Logger;
 
+import io.vitess.proto.Query;
+import io.vitess.util.Constants;
+
 /**
  * Created by ashudeep.sharma on 15/02/16.
  */
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessMySQLDatabaseMetadata.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessMySQLDatabaseMetadata.java
index 57cc9b3ae47..8a72ef686bb 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessMySQLDatabaseMetadata.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessMySQLDatabaseMetadata.java
@@ -17,9 +17,6 @@
 package io.vitess.jdbc;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.vitess.proto.Query;
-import io.vitess.util.Constants;
-import io.vitess.util.MysqlDefs;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -40,6 +37,10 @@
 import java.util.logging.Logger;
 import org.apache.commons.lang.StringUtils;
 
+import io.vitess.proto.Query;
+import io.vitess.util.Constants;
+import io.vitess.util.MysqlDefs;
+
 /**
  * Created by ashudeep.sharma on 15/02/16.
  */
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java
index 78d68c2d6ba..24c7f0c4334 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java
@@ -33,7 +33,6 @@
 import java.sql.RowId;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLRecoverableException;
 import java.sql.SQLXML;
 import java.sql.Statement;
 import java.sql.Time;
@@ -51,12 +50,10 @@
 import java.util.logging.Logger;
 
 import io.vitess.client.Context;
-import io.vitess.client.VTGateConn;
-import io.vitess.client.VTGateTx;
+import io.vitess.client.VTGateConnection;
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.mysql.DateTime;
-import io.vitess.proto.Topodata;
 import io.vitess.util.Constants;
 import io.vitess.util.StringUtils;
 
@@ -110,8 +107,7 @@ public VitessPreparedStatement(VitessConnection vitessConnection, String sql, in
     }
 
     public ResultSet executeQuery() throws SQLException {
-        VTGateConn vtGateConn;
-        Topodata.TabletType tabletType;
+        VTGateConnection vtGateConn;
         Cursor cursor;
 
         checkOpen();
@@ -121,33 +117,15 @@ public ResultSet executeQuery() throws SQLException {
         this.generatedId = -1;
 
         vtGateConn = this.vitessConnection.getVtGateConn();
-        tabletType = this.vitessConnection.getTabletType();
 
         try {
-            if (tabletType != Topodata.TabletType.MASTER || this.vitessConnection
-                    .getAutoCommit()) {
-                    Context context =
-                        this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                    if (vitessConnection.isSimpleExecute() && this.fetchSize == 0) {
-                        cursor =
-                            vtGateConn.execute(context, this.sql, this.bindVariables, tabletType, vitessConnection.getIncludedFields())
-                                .checkedGet();
-                    } else {
-                        cursor = vtGateConn
-                            .streamExecute(context, this.sql, this.bindVariables, tabletType, vitessConnection.getIncludedFields());
-                    }
-                } else {
-                VTGateTx vtGateTx = this.vitessConnection.getVtGateTx();
-                if (vtGateTx == null) {
-                    Context context =
-                            this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                    vtGateTx = vtGateConn.begin(context).checkedGet();
-                    this.vitessConnection.setVtGateTx(vtGateTx);
-                }
-                Context context =
-                        this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursor = vtGateTx.execute(context, this.sql, this.bindVariables, tabletType, vitessConnection.getIncludedFields())
-                        .checkedGet();
+            if (vitessConnection.isSimpleExecute() && this.fetchSize == 0) {
+                checkAndBeginTransaction();
+                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
+                cursor = vtGateConn.execute(context, this.sql, this.bindVariables, vitessConnection.getVtSession()).checkedGet();
+            } else {
+                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
+                cursor = vtGateConn.streamExecute(context, this.sql, this.bindVariables, vitessConnection.getVtSession());
             }
 
             if (null == cursor) {
@@ -155,18 +133,14 @@ public ResultSet executeQuery() throws SQLException {
             }
 
             this.vitessResultSet = new VitessResultSet(cursor, this);
-        } catch (SQLRecoverableException ex) {
-            this.vitessConnection.setVtGateTx(null);
-            throw ex;
         } finally {
             this.bindVariables.clear();
         }
-        return (this.vitessResultSet);
+        return this.vitessResultSet;
     }
 
     public int executeUpdate() throws SQLException {
-        VTGateConn vtGateConn;
-        Topodata.TabletType tabletType;
+        VTGateConnection vtGateConn;
         Cursor cursor;
         int truncatedUpdateCount;
 
@@ -175,30 +149,11 @@ public int executeUpdate() throws SQLException {
         closeOpenResultSetAndResetCount();
 
         vtGateConn = this.vitessConnection.getVtGateConn();
-        tabletType = this.vitessConnection.getTabletType();
-
-        if (tabletType != Topodata.TabletType.MASTER) {
-            throw new SQLException(Constants.SQLExceptionMessages.DML_NOT_ON_MASTER);
-        }
 
         try {
-            if (this.vitessConnection.getAutoCommit()) {
-                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursor = vtGateConn.execute(context, this.sql, this.bindVariables, tabletType, vitessConnection.getIncludedFields())
-                    .checkedGet();
-            } else {
-                VTGateTx vtGateTx = this.vitessConnection.getVtGateTx();
-                if (null == vtGateTx) {
-                    Context context =
-                        this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                    vtGateTx = vtGateConn.begin(context).checkedGet();
-                    this.vitessConnection.setVtGateTx(vtGateTx);
-                }
-
-                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursor = vtGateTx.execute(context, this.sql, this.bindVariables, tabletType, vitessConnection.getIncludedFields())
-                    .checkedGet();
-            }
+            checkAndBeginTransaction();
+            Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
+            cursor = vtGateConn.execute(context, this.sql, this.bindVariables, vitessConnection.getVtSession()).checkedGet();
 
             if (null == cursor) {
                 throw new SQLException(Constants.SQLExceptionMessages.METHOD_CALL_FAILED);
@@ -219,9 +174,6 @@ public int executeUpdate() throws SQLException {
             } else {
                 truncatedUpdateCount = (int) this.resultCount;
             }
-        } catch (SQLRecoverableException ex) {
-            this.vitessConnection.setVtGateTx(null);
-            throw ex;
         } finally {
             this.bindVariables.clear();
         }
@@ -426,9 +378,7 @@ public void addBatch() throws SQLException {
         // In other words, the list can contain only statements that produce an update count."
         checkNotReadOnly();
 
-        VTGateConn vtGateConn;
-        Topodata.TabletType tabletType;
-        VTGateTx vtGateTx;
+        VTGateConnection vtGateConn;
         List<CursorWithError> cursorWithErrorList;
         List<String> batchedQueries = new ArrayList<>();
 
@@ -438,11 +388,6 @@ public void addBatch() throws SQLException {
 
         try {
             vtGateConn = this.vitessConnection.getVtGateConn();
-            tabletType = this.vitessConnection.getTabletType();
-
-            if (tabletType != Topodata.TabletType.MASTER) {
-                throw new SQLException(Constants.SQLExceptionMessages.DML_NOT_ON_MASTER);
-            }
 
             this.retrieveGeneratedKeys = true; // mimicking mysql-connector-j
             /**
@@ -453,25 +398,9 @@ public void addBatch() throws SQLException {
                 batchedQueries.add(this.sql);
             }
 
-            if (this.vitessConnection.getAutoCommit()) {
-                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursorWithErrorList =
-                    vtGateConn.executeBatch(context, batchedQueries, batchedArgs, tabletType, vitessConnection.getIncludedFields())
-                        .checkedGet();
-            } else {
-                vtGateTx = this.vitessConnection.getVtGateTx();
-                if (null == vtGateTx) {
-                    Context context =
-                        this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                    vtGateTx = vtGateConn.begin(context).checkedGet();
-                    this.vitessConnection.setVtGateTx(vtGateTx);
-                }
-
-                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursorWithErrorList =
-                    vtGateTx.executeBatch(context, batchedQueries, batchedArgs, tabletType, vitessConnection.getIncludedFields())
-                        .checkedGet();
-            }
+            checkAndBeginTransaction();
+            Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
+            cursorWithErrorList = vtGateConn.executeBatch(context, batchedQueries, batchedArgs, vitessConnection.getVtSession()).checkedGet();
 
             if (null == cursorWithErrorList) {
                 throw new SQLException(Constants.SQLExceptionMessages.METHOD_CALL_FAILED);
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessResultSet.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessResultSet.java
index a4d270b3845..dd0bc37afaa 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessResultSet.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessResultSet.java
@@ -18,12 +18,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.ByteString;
-import io.vitess.client.cursor.Cursor;
-import io.vitess.client.cursor.Row;
-import io.vitess.client.cursor.SimpleCursor;
-import io.vitess.proto.Query;
-import io.vitess.util.Constants;
-import io.vitess.util.StringUtils;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.Reader;
@@ -54,6 +48,13 @@
 import java.util.logging.Logger;
 import javax.sql.rowset.serial.SerialClob;
 
+import io.vitess.client.cursor.Cursor;
+import io.vitess.client.cursor.Row;
+import io.vitess.client.cursor.SimpleCursor;
+import io.vitess.proto.Query;
+import io.vitess.util.Constants;
+import io.vitess.util.StringUtils;
+
 /**
  * Created by harshit.gangal on 23/01/16.
  */
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessResultSetMetaData.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessResultSetMetaData.java
index 98e7ff6a6c7..a7f8c7cb4a3 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessResultSetMetaData.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessResultSetMetaData.java
@@ -17,14 +17,15 @@
 package io.vitess.jdbc;
 
 import com.google.common.collect.ImmutableList;
-import io.vitess.proto.Query;
-import io.vitess.util.Constants;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 import java.util.logging.Logger;
 
+import io.vitess.proto.Query;
+import io.vitess.util.Constants;
+
 
 /**
  * Created by harshit.gangal on 25/01/16.
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessStatement.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessStatement.java
index d31f7c31fb6..7b1545bdec3 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessStatement.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessStatement.java
@@ -20,7 +20,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLRecoverableException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -29,12 +28,10 @@
 
 import io.vitess.client.Context;
 import io.vitess.client.Proto;
-import io.vitess.client.VTGateConn;
-import io.vitess.client.VTGateTx;
+import io.vitess.client.VTGateConnection;
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.proto.Query;
-import io.vitess.proto.Topodata;
 import io.vitess.proto.Vtrpc;
 import io.vitess.util.Constants;
 import io.vitess.util.StringUtils;
@@ -57,7 +54,7 @@ public class VitessStatement implements Statement {
     protected VitessConnection vitessConnection;
     protected boolean closed;
     protected long resultCount;
-    protected long queryTimeoutInMillis = Constants.DEFAULT_TIMEOUT;
+    protected long queryTimeoutInMillis;
     protected int maxFieldSize = Constants.MAX_BUFFER_SIZE;
     protected int maxRows = 0;
     protected int fetchSize = 0;
@@ -79,6 +76,7 @@ public VitessStatement(VitessConnection vitessConnection) {
     public VitessStatement(VitessConnection vitessConnection, int resultSetType,
         int resultSetConcurrency) {
         this.vitessConnection = vitessConnection;
+        this.queryTimeoutInMillis = vitessConnection.getTimeout();
         this.vitessResultSet = null;
         this.resultSetType = resultSetType;
         this.resultSetConcurrency = resultSetConcurrency;
@@ -97,8 +95,7 @@ public VitessStatement(VitessConnection vitessConnection, int resultSetType,
      * @throws SQLException
      */
     public ResultSet executeQuery(String sql) throws SQLException {
-        VTGateConn vtGateConn;
-        Topodata.TabletType tabletType;
+        VTGateConnection vtGateConn;
         Cursor cursor;
 
         checkOpen();
@@ -114,41 +111,24 @@ public ResultSet executeQuery(String sql) throws SQLException {
         this.generatedId = -1;
 
         vtGateConn = this.vitessConnection.getVtGateConn();
-        tabletType = this.vitessConnection.getTabletType();
 
-        try {
-            if (tabletType != Topodata.TabletType.MASTER || this.vitessConnection
-                    .getAutoCommit()) {
-                Context context =
-                        this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                if (vitessConnection.isSimpleExecute() && this.fetchSize == 0) {
-                    cursor = vtGateConn.execute(context, sql, null, tabletType, vitessConnection.getIncludedFields()).checkedGet();
-                } else {
-                    cursor = vtGateConn.streamExecute(context, sql, null, tabletType, vitessConnection.getIncludedFields());
-                }
-            } else {
-                VTGateTx vtGateTx = this.vitessConnection.getVtGateTx();
-                if (null == vtGateTx) {
-                    Context context =
-                            this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                    vtGateTx = vtGateConn.begin(context).checkedGet();
-                    this.vitessConnection.setVtGateTx(vtGateTx);
-                }
-                Context context =
-                        this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                /* Stream query is not suppose to run in a txn. */
-                cursor = vtGateTx.execute(context, sql, null, tabletType, vitessConnection.getIncludedFields()).checkedGet();
-            }
+        if ((vitessConnection.isSimpleExecute() && this.fetchSize == 0) || vitessConnection.isInTransaction()) {
+            checkAndBeginTransaction();
+            Context context =
+                    this.vitessConnection.createContext(this.queryTimeoutInMillis);
+            cursor = vtGateConn.execute(context, sql, null, vitessConnection.getVtSession()).checkedGet();
+        } else {
+            /* Stream query is not suppose to run in a txn. */
+            Context context =
+                    this.vitessConnection.createContext(this.queryTimeoutInMillis);
+            cursor = vtGateConn.streamExecute(context, sql, null, vitessConnection.getVtSession());
+        }
 
-            if (null == cursor) {
-                throw new SQLException(Constants.SQLExceptionMessages.METHOD_CALL_FAILED);
-            }
-            this.vitessResultSet = new VitessResultSet(cursor, this);
-        } catch (SQLRecoverableException ex) {
-            this.vitessConnection.setVtGateTx(null);
-            throw ex;
+        if (null == cursor) {
+            throw new SQLException(Constants.SQLExceptionMessages.METHOD_CALL_FAILED);
         }
-        return (this.vitessResultSet);
+        this.vitessResultSet = new VitessResultSet(cursor, this);
+        return this.vitessResultSet;
     }
 
     /**
@@ -269,7 +249,7 @@ public void setQueryTimeout(int seconds) throws SQLException {
                 Constants.SQLExceptionMessages.ILLEGAL_VALUE_FOR + "query timeout");
         }
         this.queryTimeoutInMillis =
-            (0 == seconds) ? Constants.DEFAULT_TIMEOUT : (long) seconds * 1000;
+            (0 == seconds) ? vitessConnection.getTimeout() : (long) seconds * 1000;
     }
 
     /**
@@ -422,9 +402,7 @@ public ResultSet getGeneratedKeys() throws SQLException {
      * @throws SQLException
      */
     public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
-        VTGateConn vtGateConn;
-        Topodata.TabletType tabletType;
-        VTGateTx vtGateTx;
+        VTGateConnection vtGateConn;
         Cursor cursor;
         int truncatedUpdateCount;
 
@@ -438,56 +416,35 @@ public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException
         }
 
         vtGateConn = this.vitessConnection.getVtGateConn();
-        tabletType = this.vitessConnection.getTabletType();
-
-        if (tabletType != Topodata.TabletType.MASTER) {
-            throw new SQLException(Constants.SQLExceptionMessages.DML_NOT_ON_MASTER);
-        }
-
-        try {
-            if (this.vitessConnection.getAutoCommit()) {
-                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursor = vtGateConn.execute(context, sql, null, tabletType, vitessConnection.getIncludedFields()).checkedGet();
-            } else {
-                vtGateTx = this.vitessConnection.getVtGateTx();
-                if (null == vtGateTx) {
-                    Context context =
-                        this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                    vtGateTx = vtGateConn.begin(context).checkedGet();
-                    this.vitessConnection.setVtGateTx(vtGateTx);
-                }
 
-                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursor = vtGateTx.execute(context, sql, null, tabletType, vitessConnection.getIncludedFields()).checkedGet();
-            }
+        checkAndBeginTransaction();
+        Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
+        cursor = vtGateConn.execute(context, sql, null, vitessConnection.getVtSession()).checkedGet();
 
-            if (null == cursor) {
-                throw new SQLException(Constants.SQLExceptionMessages.METHOD_CALL_FAILED);
-            }
+        if (null == cursor) {
+            throw new SQLException(Constants.SQLExceptionMessages.METHOD_CALL_FAILED);
+        }
 
-            if (!(null == cursor.getFields() || cursor.getFields().isEmpty())) {
-                throw new SQLException(Constants.SQLExceptionMessages.SQL_RETURNED_RESULT_SET);
-            }
+        if (!(null == cursor.getFields() || cursor.getFields().isEmpty())) {
+            throw new SQLException(Constants.SQLExceptionMessages.SQL_RETURNED_RESULT_SET);
+        }
 
-            if (autoGeneratedKeys == Statement.RETURN_GENERATED_KEYS) {
-                this.retrieveGeneratedKeys = true;
-                this.generatedId = cursor.getInsertId();
-            } else {
-                this.retrieveGeneratedKeys = false;
-                this.generatedId = -1;
-            }
+        if (autoGeneratedKeys == Statement.RETURN_GENERATED_KEYS) {
+            this.retrieveGeneratedKeys = true;
+            this.generatedId = cursor.getInsertId();
+        } else {
+            this.retrieveGeneratedKeys = false;
+            this.generatedId = -1;
+        }
 
-            this.resultCount = cursor.getRowsAffected();
+        this.resultCount = cursor.getRowsAffected();
 
-            if (this.resultCount > Integer.MAX_VALUE) {
-                truncatedUpdateCount = Integer.MAX_VALUE;
-            } else {
-                truncatedUpdateCount = (int) this.resultCount;
-            }
-        } catch (SQLRecoverableException ex) {
-            this.vitessConnection.setVtGateTx(null);
-            throw ex;
+        if (this.resultCount > Integer.MAX_VALUE) {
+            truncatedUpdateCount = Integer.MAX_VALUE;
+        } else {
+            truncatedUpdateCount = (int) this.resultCount;
         }
+
         return truncatedUpdateCount;
     }
 
@@ -566,9 +523,7 @@ public void clearBatch() throws SQLException {
     public int[] executeBatch() throws SQLException {
         checkOpen();
         checkNotReadOnly();
-        VTGateConn vtGateConn;
-        Topodata.TabletType tabletType;
-        VTGateTx vtGateTx;
+        VTGateConnection vtGateConn;
         List<CursorWithError> cursorWithErrorList;
 
         if(0 == batchedArgs.size()) {
@@ -577,35 +532,17 @@ public int[] executeBatch() throws SQLException {
 
         try {
             vtGateConn = this.vitessConnection.getVtGateConn();
-            tabletType = this.vitessConnection.getTabletType();
 
-            if (tabletType != Topodata.TabletType.MASTER) {
-                throw new SQLException(Constants.SQLExceptionMessages.DML_NOT_ON_MASTER);
-            }
-
-            this.retrieveGeneratedKeys = true;// mimicking mysql-connector-j
-            if (this.vitessConnection.getAutoCommit()) {
-                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursorWithErrorList =
-                    vtGateConn.executeBatch(context, batchedArgs, null, tabletType, vitessConnection.getIncludedFields()).checkedGet();
-            } else {
-                vtGateTx = this.vitessConnection.getVtGateTx();
-                if (null == vtGateTx) {
-                    Context context =
-                        this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                    vtGateTx = vtGateConn.begin(context).checkedGet();
-                    this.vitessConnection.setVtGateTx(vtGateTx);
-                }
-
-                Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
-                cursorWithErrorList =
-                    vtGateTx.executeBatch(context, batchedArgs, null, tabletType, vitessConnection.getIncludedFields()).checkedGet();
-            }
+            checkAndBeginTransaction();
+            Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
+            cursorWithErrorList =
+                    vtGateConn.executeBatch(context, batchedArgs, null, vitessConnection.getVtSession()).checkedGet();
 
             if (null == cursorWithErrorList) {
                 throw new SQLException(Constants.SQLExceptionMessages.METHOD_CALL_FAILED);
             }
 
+            this.retrieveGeneratedKeys = true;// mimicking mysql-connector-j
             return this.generateBatchUpdateResult(cursorWithErrorList);
         } finally {
             this.clearBatch();
@@ -706,6 +643,14 @@ protected int[] generateBatchUpdateResult(List<CursorWithError> cursorWithErrorL
         return updateCounts;
     }
 
+    protected void checkAndBeginTransaction() throws SQLException {
+        if (!(this.vitessConnection.getAutoCommit() || this.vitessConnection.isInTransaction())) {
+            Context context = this.vitessConnection.createContext(this.queryTimeoutInMillis);
+            VTGateConnection vtGateConn = this.vitessConnection.getVtGateConn();
+            Cursor cursor = vtGateConn.execute(context,"begin",null,this.vitessConnection.getVtSession()).checkedGet();
+        }
+    }
+
     //Unsupported Methods
 
     /**
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessVTGateManager.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessVTGateManager.java
index 88b18965990..1d6bb25cf22 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessVTGateManager.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessVTGateManager.java
@@ -16,14 +16,6 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.client.Context;
-import io.vitess.client.RpcClient;
-import io.vitess.client.VTGateConn;
-import io.vitess.client.grpc.GrpcClientFactory;
-import io.vitess.client.grpc.RetryingInterceptorConfig;
-import io.vitess.client.grpc.tls.TlsOptions;
-import io.vitess.util.CommonUtils;
-import io.vitess.util.Constants;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -31,6 +23,14 @@
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 
+import io.vitess.client.Context;
+import io.vitess.client.RpcClient;
+import io.vitess.client.VTGateConnection;
+import io.vitess.client.grpc.GrpcClientFactory;
+import io.vitess.client.grpc.RetryingInterceptorConfig;
+import io.vitess.client.grpc.tls.TlsOptions;
+import io.vitess.util.Constants;
+
 /**
  * Created by naveen.nahata on 24/02/16.
  */
@@ -38,7 +38,7 @@ public class VitessVTGateManager {
     /*
     Current implementation have one VTGateConn for ip-port-username combination
     */
-    private static ConcurrentHashMap<String, VTGateConn> vtGateConnHashMap =
+    private static ConcurrentHashMap<String, VTGateConnection> vtGateConnHashMap =
         new ConcurrentHashMap<>();
 
 
@@ -56,7 +56,7 @@ public static class VTGateConnections {
          */
         public VTGateConnections(VitessConnection connection) {
             for (VitessJDBCUrl.HostInfo hostInfo : connection.getUrl().getHostInfos()) {
-                String identifier = getIdentifer(hostInfo.getHostname(), hostInfo.getPort(), connection.getUsername(), connection.getKeyspace());
+                String identifier = getIdentifer(hostInfo.getHostname(), hostInfo.getPort(), connection.getUsername(), connection.getTarget());
                 synchronized (VitessVTGateManager.class) {
                     if (!vtGateConnHashMap.containsKey(identifier)) {
                         updateVtGateConnHashMap(identifier, hostInfo, connection);
@@ -73,7 +73,7 @@ public VTGateConnections(VitessConnection connection) {
          *
          * @return
          */
-        public VTGateConn getVtGateConnInstance() {
+        public VTGateConnection getVtGateConnInstance() {
             counter++;
             counter = counter % vtGateIdentifiers.size();
             return vtGateConnHashMap.get(vtGateIdentifiers.get(counter));
@@ -104,10 +104,8 @@ private static void updateVtGateConnHashMap(String identifier, VitessJDBCUrl.Hos
      * @param connection
      * @return
      */
-    private static VTGateConn getVtGateConn(VitessJDBCUrl.HostInfo hostInfo, VitessConnection connection) {
-        final String username = connection.getUsername();
-        final String keyspace = connection.getKeyspace();
-        final Context context = CommonUtils.createContext(username, Constants.CONNECTION_TIMEOUT);
+    private static VTGateConnection getVtGateConn(VitessJDBCUrl.HostInfo hostInfo, VitessConnection connection) {
+        final Context context = connection.createContext(connection.getTimeout());
         RetryingInterceptorConfig retryingConfig = getRetryingInterceptorConfig(connection);
         RpcClient client;
         if (connection.getUseSSL()) {
@@ -139,10 +137,7 @@ private static VTGateConn getVtGateConn(VitessJDBCUrl.HostInfo hostInfo, VitessC
         } else {
             client = new GrpcClientFactory(retryingConfig).create(context, hostInfo.toString());
         }
-        if (null == keyspace) {
-            return (new VTGateConn(client));
-        }
-        return (new VTGateConn(client, keyspace));
+        return (new VTGateConnection(client));
     }
 
     private static RetryingInterceptorConfig getRetryingInterceptorConfig(VitessConnection conn) {
@@ -156,7 +151,7 @@ private static RetryingInterceptorConfig getRetryingInterceptorConfig(VitessConn
     public static void close() throws SQLException {
         SQLException exception = null;
 
-        for (VTGateConn vtGateConn : vtGateConnHashMap.values()) {
+        for (VTGateConnection vtGateConn : vtGateConnHashMap.values()) {
             try {
                 vtGateConn.close();
             } catch (IOException e) {
diff --git a/java/jdbc/src/main/java/io/vitess/util/CommonUtils.java b/java/jdbc/src/main/java/io/vitess/util/CommonUtils.java
index fee0a2ba77f..75ce676eef4 100644
--- a/java/jdbc/src/main/java/io/vitess/util/CommonUtils.java
+++ b/java/jdbc/src/main/java/io/vitess/util/CommonUtils.java
@@ -16,9 +16,10 @@
 
 package io.vitess.util;
 
+import org.joda.time.Duration;
+
 import io.vitess.client.Context;
 import io.vitess.proto.Vtrpc;
-import org.joda.time.Duration;
 
 /**
  * Created by naveen.nahata on 24/02/16.
@@ -29,23 +30,24 @@ public class CommonUtils {
      * Create context used to create grpc client and executing query.
      *
      * @param username
-     * @param connectionTimeout
+     * @param timeout
      * @return
      */
-    public static Context createContext(String username, long connectionTimeout) {
-        Context context;
+    public static Context createContext(String username, long timeout) {
+        Context context = Context.getDefault();
         Vtrpc.CallerID callerID = null;
         if (null != username) {
             callerID = Vtrpc.CallerID.newBuilder().setPrincipal(username).build();
         }
+
         if (null != callerID) {
-            context = Context.getDefault().withDeadlineAfter(Duration.millis(connectionTimeout))
-                .withCallerId(callerID);
-        } else {
-            context = Context.getDefault().withDeadlineAfter(Duration.millis(connectionTimeout));
+            context = context.withCallerId(callerID);
         }
+        if (timeout > 0) {
+            context = context.withDeadlineAfter(Duration.millis(timeout));
+        }
+
         return context;
     }
-
 }
 
diff --git a/java/jdbc/src/main/java/io/vitess/util/Constants.java b/java/jdbc/src/main/java/io/vitess/util/Constants.java
index d9d22c90a70..a954a41626c 100644
--- a/java/jdbc/src/main/java/io/vitess/util/Constants.java
+++ b/java/jdbc/src/main/java/io/vitess/util/Constants.java
@@ -35,7 +35,6 @@ public class Constants {
         "Tablet Type to which Vitess will connect(master, replica, rdonly)";
     public static final String DEFAULT_PORT = "15991";
     public static final Topodata.TabletType DEFAULT_TABLET_TYPE = Topodata.TabletType.MASTER;
-    public static final long CONNECTION_TIMEOUT = 30000;
     public static final String LITERAL_V = "v";
     public static final String LITERAL_SINGLE_QUOTE = "'";
     public static final String SQL_S = "s";
@@ -70,7 +69,7 @@ public static final class SQLExceptionMessages {
         public static final String COMMIT_WHEN_AUTO_COMMIT_TRUE =
             "Cannot call commit when auto commit is true";
         public static final String ROLLBACK_WHEN_AUTO_COMMIT_TRUE =
-            "Cannot call commit when auto commit is true";
+            "Cannot call rollback when auto commit is true";
         public static final String CLOSED_RESULT_SET = "Result Set closed";
         public static final String INVALID_COLUMN_INDEX = "Invalid Column Index";
         public static final String VITESS_CURSOR_CLOSE_ERROR =
diff --git a/java/jdbc/src/main/java/io/vitess/util/MysqlDefs.java b/java/jdbc/src/main/java/io/vitess/util/MysqlDefs.java
index 66f05242543..075b5f4f5da 100644
--- a/java/jdbc/src/main/java/io/vitess/util/MysqlDefs.java
+++ b/java/jdbc/src/main/java/io/vitess/util/MysqlDefs.java
@@ -16,12 +16,13 @@
 
 package io.vitess.util;
 
-import io.vitess.proto.Query;
 import java.sql.Connection;
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.vitess.proto.Query;
+
 /**
  * Created by ashudeep.sharma on 07/03/16.
  */
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/ConnectionPropertiesTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/ConnectionPropertiesTest.java
index 60434448625..82f231936a4 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/ConnectionPropertiesTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/ConnectionPropertiesTest.java
@@ -16,21 +16,29 @@
 
 package io.vitess.jdbc;
 
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Properties;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
 import io.vitess.proto.Query;
 import io.vitess.proto.Topodata;
 import io.vitess.util.Constants;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import java.sql.DriverPropertyInfo;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Properties;
+import io.vitess.proto.Query;
+import io.vitess.proto.Topodata;
+import io.vitess.util.Constants;
 
 public class ConnectionPropertiesTest {
 
-    private static final int NUM_PROPS = 31;
+    private static final int NUM_PROPS = 32;
 
     @Test
     public void testReflection() throws Exception {
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/FieldWithMetadataTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/FieldWithMetadataTest.java
index ae308967591..c81ce9d5d7f 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/FieldWithMetadataTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/FieldWithMetadataTest.java
@@ -18,7 +18,6 @@
 
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessConnectionTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessConnectionTest.java
index fd4d9f94854..5e2e5279693 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessConnectionTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessConnectionTest.java
@@ -16,25 +16,26 @@
 
 package io.vitess.jdbc;
 
-import com.google.common.util.concurrent.Futures;
-import io.vitess.client.Context;
-import io.vitess.client.SQLFuture;
-import io.vitess.client.VTGateTx;
-import io.vitess.proto.Query;
-import io.vitess.proto.Topodata;
-import io.vitess.util.Constants;
+import java.lang.reflect.Field;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 import org.junit.Assert;
 import org.junit.Test;
-import org.mockito.Matchers;
+import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import io.vitess.client.VTSession;
+import io.vitess.proto.Query;
+import io.vitess.proto.Topodata;
+import io.vitess.util.Constants;
 
 /**
  * Created by harshit.gangal on 19/01/16.
  */
+@RunWith(PowerMockRunner.class)
 public class VitessConnectionTest extends BaseTest {
 
     @Test public void testVitessConnection() throws SQLException {
@@ -119,81 +120,60 @@ public class VitessConnectionTest extends BaseTest {
     }
 
     @Test public void testCommit() throws SQLException {
+        VTSession mockSession = PowerMockito.mock(VTSession.class);
         VitessConnection vitessConnection = getVitessConnection();
-        vitessConnection.setAutoCommit(false);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
-        vitessConnection.setVtGateTx(mockVtGateTx);
-        SQLFuture<Void> v = new SQLFuture<>(Futures.<Void>immediateFuture(null));
-        PowerMockito.when(mockVtGateTx.commit(Matchers.any(Context.class), Matchers.anyBoolean()))
-            .thenReturn(v);
+        try {
+            Field privateVTSessionField = VitessConnection.class.getDeclaredField("vtSession");
+            privateVTSessionField.setAccessible(true);
+            privateVTSessionField.set(vitessConnection, mockSession);
+            PowerMockito.when(mockSession.isInTransaction()).thenReturn(false);
+            PowerMockito.when(mockSession.isAutoCommit()).thenReturn(false);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            Assert.fail(e.getMessage());
+        }
         vitessConnection.commit();
-        Assert.assertEquals(null, vitessConnection.getVtGateTx());
     }
 
     @Test(expected = SQLException.class) public void testCommitForException() throws SQLException {
         VitessConnection vitessConnection = getVitessConnection();
-        vitessConnection.setAutoCommit(false);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
-        vitessConnection.setVtGateTx(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx.commit(Matchers.any(Context.class), Matchers.anyBoolean()))
-            .thenThrow(new SQLException());
-        try {
-            vitessConnection.commit();
-        } catch (SQLException e) {
-            throw new SQLException();
-        }
+        vitessConnection.setAutoCommit(true);
+        vitessConnection.commit();
     }
 
     @Test public void testRollback() throws SQLException {
         VitessConnection vitessConnection = getVitessConnection();
         vitessConnection.setAutoCommit(false);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
-        vitessConnection.setVtGateTx(mockVtGateTx);
-        SQLFuture<Void> v = new SQLFuture<>(Futures.<Void>immediateFuture(null));
-        PowerMockito.when(mockVtGateTx.commit(Matchers.any(Context.class), Matchers.anyBoolean()))
-            .thenReturn(v);
-        vitessConnection.commit();
-        Assert.assertEquals(null, vitessConnection.getVtGateTx());
+        vitessConnection.rollback();
     }
 
     @Test(expected = SQLException.class) public void testRollbackForException()
         throws SQLException {
         VitessConnection vitessConnection = getVitessConnection();
-        vitessConnection.setAutoCommit(false);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
-        vitessConnection.setVtGateTx(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx.rollback(Matchers.any(Context.class)))
-            .thenThrow(new SQLException());
-        try {
-            vitessConnection.rollback();
-        } catch (SQLException e) {
-            throw new SQLException();
-        }
+        vitessConnection.setAutoCommit(true);
+        vitessConnection.rollback();
     }
 
     @Test public void testClosed() throws SQLException {
         VitessConnection vitessConnection = getVitessConnection();
         vitessConnection.setAutoCommit(false);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
-        vitessConnection.setVtGateTx(mockVtGateTx);
-        SQLFuture<Void> v = new SQLFuture<>(Futures.<Void>immediateFuture(null));
-        PowerMockito.when(mockVtGateTx.rollback(Matchers.any(Context.class))).thenReturn(v);
         vitessConnection.close();
         Assert.assertEquals(true, vitessConnection.isClosed());
     }
 
     @Test(expected = SQLException.class) public void testClosedForException() throws SQLException {
+        VTSession mockSession = PowerMockito.mock(VTSession.class);
         VitessConnection vitessConnection = getVitessConnection();
-        vitessConnection.setAutoCommit(false);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
-        vitessConnection.setVtGateTx(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx.rollback(Matchers.any(Context.class)))
-            .thenThrow(new SQLException());
         try {
-            vitessConnection.rollback();
-        } catch (SQLException e) {
-            throw new SQLException();
+            Field privateVTSessionField = VitessConnection.class.getDeclaredField("vtSession");
+            privateVTSessionField.setAccessible(true);
+            privateVTSessionField.set(vitessConnection, mockSession);
+            //vtSession.setSession(mockSession.getSession());
+            PowerMockito.when(mockSession.isInTransaction()).thenReturn(true);
+            PowerMockito.when(mockSession.isAutoCommit()).thenReturn(true);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            Assert.fail(e.getMessage());
         }
+        vitessConnection.close();
     }
 
     @Test public void testGetCatalog() throws SQLException {
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessDatabaseMetadataTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessDatabaseMetadataTest.java
index ca38b9fe8d7..07d7fd1c2b8 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessDatabaseMetadataTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessDatabaseMetadataTest.java
@@ -19,10 +19,6 @@
 import com.google.common.base.Charsets;
 import com.google.common.io.CharStreams;
 import com.google.protobuf.ByteString;
-import io.vitess.client.cursor.Cursor;
-import io.vitess.client.cursor.SimpleCursor;
-import io.vitess.proto.Query;
-import io.vitess.util.Constants;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -42,6 +38,11 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import io.vitess.client.cursor.Cursor;
+import io.vitess.client.cursor.SimpleCursor;
+import io.vitess.proto.Query;
+import io.vitess.util.Constants;
+
 /**
  * Created by ashudeep.sharma on 08/03/16.
  */
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessDriverTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessDriverTest.java
index 2fee224fc12..ba6f756545e 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessDriverTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessDriverTest.java
@@ -16,15 +16,15 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.util.Constants;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import java.sql.DriverManager;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
 import java.util.Properties;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import io.vitess.util.Constants;
 
 /**
  * Created by harshit.gangal on 19/01/16.
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessJDBCUrlTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessJDBCUrlTest.java
index f06b417757a..d0d29078383 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessJDBCUrlTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessJDBCUrlTest.java
@@ -16,13 +16,13 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.proto.Topodata;
-import io.vitess.util.Constants;
+import java.sql.SQLException;
+import java.util.Properties;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.sql.SQLException;
-import java.util.Properties;
+import io.vitess.proto.Topodata;
+import io.vitess.util.Constants;
 
 /**
  * Created by naveen.nahata on 18/02/16.
@@ -217,4 +217,18 @@ public class VitessJDBCUrlTest {
         Assert.assertEquals(Topodata.TabletType.REPLICA.name(), vitessJDBCUrl.getProperties().getProperty(Constants.Property.TABLET_TYPE).toUpperCase());
         Assert.assertEquals(Topodata.TabletType.REPLICA.name(), vitessJDBCUrl.getProperties().getProperty(Constants.Property.OLD_TABLET_TYPE).toUpperCase());
     }
+
+    @Test public void testCompleteURLWithTarget() throws Exception {
+        Properties info = new Properties();
+        VitessJDBCUrl vitessJDBCUrl = new VitessJDBCUrl(
+            "jdbc:vitess://user@h1:8080,h2:8081?target=keyspace:-80@replica&prop=val",
+            info);
+        Assert.assertEquals("user", vitessJDBCUrl.getProperties().getProperty(Constants.Property.USERNAME));
+        Assert.assertEquals("h1", vitessJDBCUrl.getHostInfos().get(0).getHostname());
+        Assert.assertEquals(8080, vitessJDBCUrl.getHostInfos().get(0).getPort());
+        Assert.assertEquals("h2", vitessJDBCUrl.getHostInfos().get(1).getHostname());
+        Assert.assertEquals(8081, vitessJDBCUrl.getHostInfos().get(1).getPort());
+        Assert.assertEquals("keyspace:-80@replica", vitessJDBCUrl.getProperties().getProperty(Constants.Property.TARGET));
+        Assert.assertEquals("val", vitessJDBCUrl.getProperties().getProperty("prop"));
+    }
 }
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessPreparedStatementTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessPreparedStatementTest.java
index 4bca27e41d7..6005dc4e665 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessPreparedStatementTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessPreparedStatementTest.java
@@ -16,6 +16,7 @@
 
 package io.vitess.jdbc;
 
+import com.google.common.collect.ImmutableMap;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.sql.BatchUpdateException;
@@ -31,9 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-
 import javax.sql.rowset.serial.SerialClob;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,17 +42,14 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.google.common.collect.ImmutableMap;
-
 import io.vitess.client.Context;
 import io.vitess.client.SQLFuture;
-import io.vitess.client.VTGateConn;
-import io.vitess.client.VTGateTx;
+import io.vitess.client.VTGateConnection;
+import io.vitess.client.VTSession;
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.mysql.DateTime;
 import io.vitess.proto.Query;
-import io.vitess.proto.Topodata;
 import io.vitess.proto.Vtrpc;
 import io.vitess.util.Constants;
 
@@ -61,7 +57,7 @@
 /**
  * Created by harshit.gangal on 09/02/16.
  */
-@RunWith(PowerMockRunner.class) @PrepareForTest({VTGateConn.class,
+@RunWith(PowerMockRunner.class) @PrepareForTest({VTGateConnection.class,
     Vtrpc.RPCError.class}) public class VitessPreparedStatementTest {
 
     private String sqlSelect = "select 1 from test_table";
@@ -102,32 +98,18 @@
 
     @Test public void testExecuteQuery() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
 
-        PowerMockito.when(mockConn.getKeyspace()).thenReturn("test_keyspace");
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(null);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockConn.getExecuteType())
             .thenReturn(Constants.QueryExecuteType.SIMPLE);
         PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(true);
-        PowerMockito.when(mockVtGateConn.begin(Matchers.any(Context.class)))
-            .thenReturn(mockSqlFutureVtGateTx);
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
 
         VitessPreparedStatement preparedStatement;
         try {
@@ -149,7 +131,6 @@
             preparedStatement =
                 new VitessPreparedStatement(mockConn, sqlSelect, ResultSet.TYPE_FORWARD_ONLY,
                     ResultSet.CONCUR_READ_ONLY);
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
             rs = preparedStatement.executeQuery();
             Assert.assertEquals(-1, preparedStatement.getUpdateCount());
 
@@ -162,7 +143,6 @@
 
 
             //select on master
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
             rs = preparedStatement.executeQuery();
             Assert.assertEquals(-1, preparedStatement.getUpdateCount());
 
@@ -182,32 +162,18 @@
 
     @Test public void testExecuteQueryWithStream() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
-
-        PowerMockito.when(mockConn.getKeyspace()).thenReturn("test_keyspace");
+        
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .streamExecute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockCursor);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(null);
-        PowerMockito.when(mockVtGateConn.begin(Matchers.any(Context.class)))
-            .thenReturn(mockSqlFutureVtGateTx);
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockConn.getExecuteType())
             .thenReturn(Constants.QueryExecuteType.STREAM);
 
@@ -231,7 +197,6 @@
             preparedStatement =
                 new VitessPreparedStatement(mockConn, sqlSelect, ResultSet.TYPE_FORWARD_ONLY,
                     ResultSet.CONCUR_READ_ONLY);
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
             rs = preparedStatement.executeQuery();
             Assert.assertEquals(-1, preparedStatement.getUpdateCount());
 
@@ -244,13 +209,14 @@
 
 
             //select on master
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
             rs = preparedStatement.executeQuery();
             Assert.assertEquals(-1, preparedStatement.getUpdateCount());
 
             try {
                 //when returned cursor is null
-                PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(null);
+                PowerMockito.when(mockVtGateConn
+                    .streamExecute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
+                        Matchers.any(VTSession.class))).thenReturn(null);
                 preparedStatement.executeQuery();
                 Assert.fail("Should have thrown exception for cursor null");
             } catch (SQLException ex) {
@@ -265,45 +231,22 @@
 
     @Test public void testExecuteUpdate() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
         List<Query.Field> fieldList = PowerMockito.mock(ArrayList.class);
 
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
 
-        VitessPreparedStatement preparedStatement =
-            new VitessPreparedStatement(mockConn, sqlUpdate);
+        VitessPreparedStatement preparedStatement;
         try {
 
-            //exception on executing dml on non master
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
-            try {
-                preparedStatement.executeUpdate();
-                Assert.fail("Should have thrown exception for tablet type not being master");
-            } catch (SQLException ex) {
-                Assert.assertEquals("DML Statement cannot be executed on non master instance type",
-                    ex.getMessage());
-            }
-
             //executing dml on master
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
             preparedStatement =
                 new VitessPreparedStatement(mockConn, sqlUpdate, ResultSet.TYPE_FORWARD_ONLY,
                     ResultSet.CONCUR_READ_ONLY);
@@ -311,12 +254,7 @@
             Assert.assertEquals(0, updateCount);
 
             //tx is null & autoCommit is true
-            PowerMockito.when(mockConn.getVtGateTx()).thenReturn(null);
-            PowerMockito.when(mockVtGateConn.begin(Matchers.any(Context.class)))
-                .thenReturn(mockSqlFutureVtGateTx);
             PowerMockito.when(mockConn.getAutoCommit()).thenReturn(true);
-            PowerMockito.when(mockVtGateTx.commit(Matchers.any(Context.class)))
-                .thenReturn(mockSqlFutureCursor);
             preparedStatement = new VitessPreparedStatement(mockConn, sqlUpdate);
             updateCount = preparedStatement.executeUpdate();
             Assert.assertEquals(0, updateCount);
@@ -366,39 +304,22 @@
 
     @Test public void testExecute() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
         List<Query.Field> mockFieldList = PowerMockito.spy(new ArrayList<Query.Field>());
-
-        PowerMockito.when(mockConn.getKeyspace()).thenReturn("test_keyspace");
+        
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockConn.getExecuteType())
             .thenReturn(Constants.QueryExecuteType.SIMPLE);
         PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(true);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(null);
-        PowerMockito.when(mockVtGateConn.begin(Matchers.any(Context.class)))
-            .thenReturn(mockSqlFutureVtGateTx);
-
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+
         PowerMockito.when(mockConn.getAutoCommit()).thenReturn(true);
-        PowerMockito.when(mockVtGateTx.commit(Matchers.any(Context.class)))
-            .thenReturn(mockSqlFutureCursor);
 
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(mockFieldList);
 
         VitessPreparedStatement preparedStatement =
@@ -451,15 +372,11 @@
     }
 
     private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRunExecute, boolean shouldRunStreamExecute) throws SQLException {
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
 
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
         PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(simpleExecute);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
-        PowerMockito.when(mockConn.getKeyspace()).thenReturn("test_keyspace");
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
 
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
@@ -467,39 +384,36 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
 
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .streamExecute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockCursor);
 
         VitessPreparedStatement statement = new VitessPreparedStatement(mockConn, sqlSelect);
         statement.setFetchSize(fetchSize);
         statement.executeQuery();
 
         if (shouldRunExecute) {
-            Mockito.verify(mockVtGateConn).execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class));
+            Mockito.verify(mockVtGateConn, Mockito.times(2)).execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
+                Matchers.any(VTSession.class));
         }
 
         if (shouldRunStreamExecute) {
             Mockito.verify(mockVtGateConn).streamExecute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class));
+                Matchers.any(VTSession.class));
         }
     }
 
     @Test public void testGetUpdateCount() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFuture = PowerMockito.mock(SQLFuture.class);
 
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx
+        PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFuture);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFuture);
         PowerMockito.when(mockSqlFuture.checkedGet()).thenReturn(mockCursor);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
 
@@ -519,6 +433,7 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
             Assert.assertEquals(Integer.MAX_VALUE, updateCount);
             Assert.assertEquals(Integer.MAX_VALUE, preparedStatement.getUpdateCount());
 
+            PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(true);
             preparedStatement.executeQuery();
             Assert.assertEquals(-1, preparedStatement.getUpdateCount());
 
@@ -674,29 +589,16 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
 
     @Test public void testAutoGeneratedKeys() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
-        List<Query.Field> fieldList = PowerMockito.mock(ArrayList.class);
-
+        
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
 
         try {
 
@@ -774,15 +676,14 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
         int[] updateCounts = statement.executeBatch();
         Assert.assertEquals(0, updateCounts.length);
 
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
         PowerMockito.when(mockConn.getAutoCommit()).thenReturn(true);
 
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
         PowerMockito.when(mockVtGateConn
             .executeBatch(Matchers.any(Context.class), Matchers.anyList(), Matchers.anyList(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
 
         List<CursorWithError> mockCursorWithErrorList = new ArrayList<>();
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursorWithErrorList);
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessResultSetMetadataTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessResultSetMetadataTest.java
index 595b6577134..3f3140aadbe 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessResultSetMetadataTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessResultSetMetadataTest.java
@@ -16,9 +16,6 @@
 
 package io.vitess.jdbc;
 
-import io.vitess.proto.Query;
-import io.vitess.util.Constants;
-import io.vitess.util.charset.CharsetMapping;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -27,6 +24,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import io.vitess.proto.Query;
+import io.vitess.util.Constants;
+import io.vitess.util.charset.CharsetMapping;
+
 /**
  * Created by ashudeep.sharma on 08/02/16.
  */
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessResultSetTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessResultSetTest.java
index e3d8e295b35..aa5898c2bc2 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessResultSetTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessResultSetTest.java
@@ -16,6 +16,7 @@
 
 package io.vitess.jdbc;
 
+import com.google.protobuf.ByteString;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -25,7 +26,6 @@
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,8 +35,6 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.google.protobuf.ByteString;
-
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.SimpleCursor;
 import io.vitess.proto.Query;
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessStatementTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessStatementTest.java
index 955c06301fe..96a240a408e 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessStatementTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessStatementTest.java
@@ -23,7 +23,6 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,12 +34,11 @@
 
 import io.vitess.client.Context;
 import io.vitess.client.SQLFuture;
-import io.vitess.client.VTGateConn;
-import io.vitess.client.VTGateTx;
+import io.vitess.client.VTGateConnection;
+import io.vitess.client.VTSession;
 import io.vitess.client.cursor.Cursor;
 import io.vitess.client.cursor.CursorWithError;
 import io.vitess.proto.Query;
-import io.vitess.proto.Topodata;
 import io.vitess.proto.Vtrpc;
 import io.vitess.util.Constants;
 
@@ -48,7 +46,7 @@
  * Created by harshit.gangal on 19/01/16.
  */
 
-@RunWith(PowerMockRunner.class) @PrepareForTest({VTGateConn.class,
+@RunWith(PowerMockRunner.class) @PrepareForTest({VTGateConnection.class,
     Vtrpc.RPCError.class}) public class VitessStatementTest {
 
     private String sqlSelect = "select 1 from test_table";
@@ -80,30 +78,16 @@
 
     @Test public void testExecuteQuery() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
 
-        PowerMockito.when(mockConn.getKeyspace()).thenReturn("test_keyspace");
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockVtGateConn
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockConn.getExecuteType())
-            .thenReturn(Constants.QueryExecuteType.SIMPLE);
+            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(), Matchers.any(
+                VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(true);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
 
         VitessStatement statement = new VitessStatement(mockConn);
@@ -117,21 +101,12 @@
                 Assert.assertEquals("SQL statement is not valid", ex.getMessage());
             }
 
-            //select on replica
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
             ResultSet rs = statement.executeQuery(sqlSelect);
             Assert.assertEquals(-1, statement.getUpdateCount());
-
-            //show query
-            rs = statement.executeQuery(sqlShow);
-            Assert.assertEquals(-1, statement.getUpdateCount());
-
-            //select on master when tx is null and autocommit is false
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
-            PowerMockito.when(mockConn.getVtGateTx()).thenReturn(null);
-            PowerMockito.when(mockVtGateConn.begin(Matchers.any(Context.class)))
-                .thenReturn(mockSqlFutureVtGateTx);
+            
+            //autocommit is false and not in transaction
             PowerMockito.when(mockConn.getAutoCommit()).thenReturn(false);
+            PowerMockito.when(mockConn.isInTransaction()).thenReturn(false);
             rs = statement.executeQuery(sqlSelect);
             Assert.assertEquals(-1, statement.getUpdateCount());
 
@@ -151,29 +126,17 @@
 
     @Test public void testExecuteQueryWithStreamExecuteType() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
 
-        PowerMockito.when(mockConn.getKeyspace()).thenReturn("test_keyspace");
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .streamExecute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockCursor);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockCursor);
         PowerMockito.when(mockConn.getExecuteType())
             .thenReturn(Constants.QueryExecuteType.STREAM);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
 
         VitessStatement statement = new VitessStatement(mockConn);
@@ -188,7 +151,6 @@
             }
 
             //select on replica
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
             ResultSet rs = statement.executeQuery(sqlSelect);
             Assert.assertEquals(-1, statement.getUpdateCount());
 
@@ -197,16 +159,15 @@
             Assert.assertEquals(-1, statement.getUpdateCount());
 
             //select on master when tx is null and autocommit is false
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
-            PowerMockito.when(mockConn.getVtGateTx()).thenReturn(null);
-            PowerMockito.when(mockVtGateConn.begin(Matchers.any(Context.class)))
-                .thenReturn(mockSqlFutureVtGateTx);
             PowerMockito.when(mockConn.getAutoCommit()).thenReturn(false);
+            PowerMockito.when(mockConn.isInTransaction()).thenReturn(false);
             rs = statement.executeQuery(sqlSelect);
             Assert.assertEquals(-1, statement.getUpdateCount());
 
             //when returned cursor is null
-            PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(null);
+            PowerMockito.when(mockVtGateConn
+                .streamExecute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
+                    Matchers.any(VTSession.class))).thenReturn(null);
             try {
                 statement.executeQuery(sqlSelect);
                 Assert.fail("Should have thrown exception for cursor null");
@@ -227,92 +188,61 @@
     }
 
     private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRunExecute, boolean shouldRunStreamExecute) throws SQLException {
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
-
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
+        
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
         PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(simpleExecute);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
-        PowerMockito.when(mockConn.getKeyspace()).thenReturn("test_keyspace");
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-
+        
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
 
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .streamExecute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockCursor);
 
         VitessStatement statement = new VitessStatement(mockConn);
         statement.setFetchSize(fetchSize);
         statement.executeQuery(sqlSelect);
 
         if (shouldRunExecute) {
-            Mockito.verify(mockVtGateConn).execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class));
+            Mockito.verify(mockVtGateConn, Mockito.times(2)).execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
+                Matchers.any(VTSession.class));
         }
 
         if (shouldRunStreamExecute) {
             Mockito.verify(mockVtGateConn).streamExecute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class));
+                Matchers.any(VTSession.class));
         }
     }
 
     @Test public void testExecuteUpdate() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
         List<Query.Field> fieldList = PowerMockito.mock(ArrayList.class);
 
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
 
         VitessStatement statement = new VitessStatement(mockConn);
         try {
 
-            //exception on executing dml on non master
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
-            try {
-                statement.executeUpdate(sqlUpdate);
-                Assert.fail("Should have thrown exception for tablet type not being master");
-            } catch (SQLException ex) {
-                Assert.assertEquals("DML Statement cannot be executed on non master instance type",
-                    ex.getMessage());
-            }
-
             //executing dml on master
-            PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
             int updateCount = statement.executeUpdate(sqlUpdate);
             Assert.assertEquals(0, updateCount);
 
             //tx is null & autoCommit is true
-            PowerMockito.when(mockConn.getVtGateTx()).thenReturn(null);
-            PowerMockito.when(mockVtGateConn.begin(Matchers.any(Context.class)))
-                .thenReturn(mockSqlFutureVtGateTx);
             PowerMockito.when(mockConn.getAutoCommit()).thenReturn(true);
-            PowerMockito.when(mockVtGateTx.commit(Matchers.any(Context.class)))
-                .thenReturn(mockSqlFutureCursor);
             updateCount = statement.executeUpdate(sqlUpdate);
             Assert.assertEquals(0, updateCount);
 
@@ -361,39 +291,21 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
 
     @Test public void testExecute() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
         List<Query.Field> mockFieldList = PowerMockito.spy(new ArrayList<Query.Field>());
 
-        PowerMockito.when(mockConn.getKeyspace()).thenReturn("test_keyspace");
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(null);
-        PowerMockito.when(mockVtGateConn.begin(Matchers.any(Context.class)))
-            .thenReturn(mockSqlFutureVtGateTx);
-
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockConn.getAutoCommit()).thenReturn(true);
         PowerMockito.when(mockConn.getExecuteType())
             .thenReturn(Constants.QueryExecuteType.SIMPLE);
         PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(true);
-        PowerMockito.when(mockVtGateTx.commit(Matchers.any(Context.class)))
-            .thenReturn(mockSqlFutureCursor);
 
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(mockFieldList);
 
         VitessStatement statement = new VitessStatement(mockConn);
@@ -436,17 +348,14 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
 
     @Test public void testGetUpdateCount() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFuture = PowerMockito.mock(SQLFuture.class);
 
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx
+        PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFuture);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFuture);
         PowerMockito.when(mockSqlFuture.checkedGet()).thenReturn(mockCursor);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
 
@@ -465,6 +374,7 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
             Assert.assertEquals(Integer.MAX_VALUE, updateCount);
             Assert.assertEquals(Integer.MAX_VALUE, statement.getUpdateCount());
 
+            PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(true);
             statement.executeQuery(sqlSelect);
             Assert.assertEquals(-1, statement.getUpdateCount());
 
@@ -475,15 +385,14 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
 
     @Test public void testClose() throws Exception {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
 
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.REPLICA);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockConn.getExecuteType())
             .thenReturn(Constants.QueryExecuteType.SIMPLE);
         PowerMockito.when(mockConn.isSimpleExecute()).thenReturn(true);
@@ -530,13 +439,23 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
 
     @Test public void testGetQueryTimeout() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
+        Mockito.when(mockConn.getTimeout()).thenReturn((long)Constants.DEFAULT_TIMEOUT);
 
         VitessStatement statement = new VitessStatement(mockConn);
         Assert.assertEquals(30, statement.getQueryTimeout());
     }
 
+    @Test public void testGetQueryTimeoutZeroDefault() throws SQLException {
+        VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
+        Mockito.when(mockConn.getTimeout()).thenReturn(0L);
+
+        VitessStatement statement = new VitessStatement(mockConn);
+        Assert.assertEquals(0, statement.getQueryTimeout());
+    }
+
     @Test public void testSetQueryTimeout() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
+        Mockito.when(mockConn.getTimeout()).thenReturn((long)Constants.DEFAULT_TIMEOUT);
 
         VitessStatement statement = new VitessStatement(mockConn);
 
@@ -550,6 +469,9 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
         } catch (SQLException ex) {
             Assert.assertEquals("Illegal value for query timeout", ex.getMessage());
         }
+
+        statement.setQueryTimeout(0);
+        Assert.assertEquals(30, statement.getQueryTimeout());
     }
 
     @Test public void testGetWarnings() throws SQLException {
@@ -598,29 +520,16 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
 
     @Test public void testAutoGeneratedKeys() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
-        List<Query.Field> fieldList = PowerMockito.mock(ArrayList.class);
 
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
-        PowerMockito.when(mockVtGateTx
-            .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockVtGateConn
             .execute(Matchers.any(Context.class), Matchers.anyString(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
-        PowerMockito.when(mockVtGateConn
-            .executeKeyspaceIds(Matchers.any(Context.class), Matchers.anyString(),
-                Matchers.anyString(), Matchers.anyCollection(), Matchers.anyMap(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
 
         VitessStatement statement = new VitessStatement(mockConn);
         try {
@@ -706,15 +615,14 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
         int[] updateCounts = statement.executeBatch();
         Assert.assertEquals(0, updateCounts.length);
 
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
         PowerMockito.when(mockConn.getAutoCommit()).thenReturn(true);
 
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
         PowerMockito.when(mockVtGateConn
             .executeBatch(Matchers.any(Context.class), Matchers.anyList(), Matchers.anyList(),
-                Matchers.any(Topodata.TabletType.class), Matchers.any(Query.ExecuteOptions.IncludedFields.class))).thenReturn(mockSqlFutureCursor);
+                Matchers.any(VTSession.class))).thenReturn(mockSqlFutureCursor);
 
         List<CursorWithError> mockCursorWithErrorList = new ArrayList<>();
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursorWithErrorList);
@@ -750,28 +658,21 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
     @Test public void testBatchGeneratedKeys() throws SQLException {
         VitessConnection mockConn = PowerMockito.mock(VitessConnection.class);
         VitessStatement statement = new VitessStatement(mockConn);
-        VTGateTx mockVtGateTx = PowerMockito.mock(VTGateTx.class);
         Cursor mockCursor = PowerMockito.mock(Cursor.class);
         SQLFuture mockSqlFutureCursor = PowerMockito.mock(SQLFuture.class);
-        SQLFuture mockSqlFutureVtGateTx = PowerMockito.mock(SQLFuture.class);
-        List<Query.Field> fieldList = PowerMockito.mock(ArrayList.class);
 
-        VTGateConn mockVtGateConn = PowerMockito.mock(VTGateConn.class);
+        VTGateConnection mockVtGateConn = PowerMockito.mock(VTGateConnection.class);
         PowerMockito.when(mockConn.getVtGateConn()).thenReturn(mockVtGateConn);
-        PowerMockito.when(mockConn.getVtGateTx()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockConn.getAutoCommit()).thenReturn(true);
 
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursor);
-        PowerMockito.when(mockSqlFutureVtGateTx.checkedGet()).thenReturn(mockVtGateTx);
         PowerMockito.when(mockCursor.getFields()).thenReturn(Query.QueryResult.getDefaultInstance().getFieldsList());
-        PowerMockito.when(mockConn.getTabletType()).thenReturn(Topodata.TabletType.MASTER);
 
         PowerMockito.when(mockVtGateConn
             .executeBatch(Matchers.any(Context.class),
                           Matchers.anyList(),
                           Matchers.anyList(),
-                          Matchers.any(Topodata.TabletType.class),
-                          Matchers.any(Query.ExecuteOptions.IncludedFields.class)))
+                          Matchers.any(VTSession.class)))
             .thenReturn(mockSqlFutureCursor);
         List<CursorWithError> mockCursorWithErrorList = new ArrayList<>();
         PowerMockito.when(mockSqlFutureCursor.checkedGet()).thenReturn(mockCursorWithErrorList);
diff --git a/java/jdbc/src/test/java/io/vitess/jdbc/VitessVTGateManagerTest.java b/java/jdbc/src/test/java/io/vitess/jdbc/VitessVTGateManagerTest.java
index 5b65e4c5ec9..b8a6e9253e6 100644
--- a/java/jdbc/src/test/java/io/vitess/jdbc/VitessVTGateManagerTest.java
+++ b/java/jdbc/src/test/java/io/vitess/jdbc/VitessVTGateManagerTest.java
@@ -21,14 +21,13 @@
 import java.sql.SQLException;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.joda.time.Duration;
 import org.junit.Assert;
 import org.junit.Test;
 
 import io.vitess.client.Context;
 import io.vitess.client.RpcClient;
-import io.vitess.client.VTGateConn;
+import io.vitess.client.VTGateConnection;
 import io.vitess.client.grpc.GrpcClientFactory;
 import io.vitess.proto.Vtrpc;
 
@@ -37,12 +36,12 @@
  */
 public class VitessVTGateManagerTest {
 
-    public VTGateConn getVtGateConn() {
+    public VTGateConnection getVtGateConn() {
         Vtrpc.CallerID callerId = Vtrpc.CallerID.newBuilder().setPrincipal("username").build();
         Context ctx =
             Context.getDefault().withDeadlineAfter(Duration.millis(500)).withCallerId(callerId);
         RpcClient client = new GrpcClientFactory().create(ctx, "host:80");
-        return new VTGateConn(client);
+        return new VTGateConnection(client);
     }
 
     @Test public void testVtGateConnectionsConstructorMultipleVtGateConnections()
@@ -66,8 +65,8 @@ public VTGateConn getVtGateConn() {
         Field privateMapField = VitessVTGateManager.class.
             getDeclaredField("vtGateConnHashMap");
         privateMapField.setAccessible(true);
-        ConcurrentHashMap<String, VTGateConn> map =
-            (ConcurrentHashMap<String, VTGateConn>) privateMapField.get(VitessVTGateManager.class);
+        ConcurrentHashMap<String, VTGateConnection> map =
+            (ConcurrentHashMap<String, VTGateConnection>) privateMapField.get(VitessVTGateManager.class);
         Assert.assertEquals(4, map.size());
         VitessVTGateManager.close();
     }
@@ -82,13 +81,13 @@ public VTGateConn getVtGateConn() {
                 + ".233:15991/shipment/shipment?tabletType=master", info);
         VitessVTGateManager.VTGateConnections vtGateConnections =
             new VitessVTGateManager.VTGateConnections(connection);
-        Assert.assertEquals(vtGateConnections.getVtGateConnInstance() instanceof VTGateConn, true);
-        VTGateConn vtGateConn = vtGateConnections.getVtGateConnInstance();
+        Assert.assertEquals(vtGateConnections.getVtGateConnInstance() instanceof VTGateConnection, true);
+        VTGateConnection vtGateConn = vtGateConnections.getVtGateConnInstance();
         Field privateMapField = VitessVTGateManager.class.
             getDeclaredField("vtGateConnHashMap");
         privateMapField.setAccessible(true);
-        ConcurrentHashMap<String, VTGateConn> map =
-            (ConcurrentHashMap<String, VTGateConn>) privateMapField.get(VitessVTGateManager.class);
+        ConcurrentHashMap<String, VTGateConnection> map =
+            (ConcurrentHashMap<String, VTGateConnection>) privateMapField.get(VitessVTGateManager.class);
         Assert.assertEquals(3, map.size());
         VitessVTGateManager.close();
     }
diff --git a/misc/git/hooks/pylint b/misc/git/hooks/pylint
index d41e083b63e..e92f356e38c 100755
--- a/misc/git/hooks/pylint
+++ b/misc/git/hooks/pylint
@@ -25,7 +25,7 @@ function msg() {
   echo "$(date) $@"
 }
 
-PYLINT=/usr/bin/gpylint
+PYLINT=${PYLINT:-/usr/bin/gpylint}
 pylint_script=$VTTOP/tools/pylint.sh
 
 # This script does not handle file names that contain spaces.
diff --git a/php/README.md b/php/README.md
index 76afdd58585..be97c566844 100644
--- a/php/README.md
+++ b/php/README.md
@@ -5,7 +5,7 @@ This folder contains the PHP client for Vitess.
 For a simple example of using the API, see the [client.php]
 (https://github.com/youtube/vitess/blob/master/examples/local/client.php)
 script, which works with the environment created by the [local setup example]
-(http://vitess.io/getting-started/local-instance.html).
+(http://vitess.io/getting-started/local-instance/).
 
 There is also a similar example client for the [VTGateV3 demo]
 (https://github.com/youtube/vitess/tree/master/examples/demo) environment.
diff --git a/proto/query.proto b/proto/query.proto
index 8eb02c81a9d..c828698245c 100644
--- a/proto/query.proto
+++ b/proto/query.proto
@@ -287,6 +287,10 @@ message ExecuteOptions {
   }
 
   TransactionIsolation transaction_isolation = 9;
+
+  // skip_query_plan_cache specifies if the query plan shoud be cached by vitess.
+  // By default all query plans are cached.
+  bool skip_query_plan_cache = 10;
 }
 
 // Field describes a single column returned by a query
diff --git a/py/vtproto/query_pb2.py b/py/vtproto/query_pb2.py
index 04b08fe0e4b..19c7d6bcf1c 100644
--- a/py/vtproto/query_pb2.py
+++ b/py/vtproto/query_pb2.py
@@ -22,7 +22,7 @@
   name='query.proto',
   package='query',
   syntax='proto3',
-  serialized_pb=_b('\n\x0bquery.proto\x12\x05query\x1a\x0etopodata.proto\x1a\x0bvtrpc.proto\"T\n\x06Target\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\"2\n\x0eVTGateCallerID\x12\x10\n\x08username\x18\x01 \x01(\t\x12\x0e\n\x06groups\x18\x02 \x03(\t\"@\n\nEventToken\x12\x11\n\ttimestamp\x18\x01 \x01(\x03\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x10\n\x08position\x18\x03 \x01(\t\"1\n\x05Value\x12\x19\n\x04type\x18\x01 \x01(\x0e\x32\x0b.query.Type\x12\r\n\x05value\x18\x02 \x01(\x0c\"V\n\x0c\x42indVariable\x12\x19\n\x04type\x18\x01 \x01(\x0e\x32\x0b.query.Type\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x1c\n\x06values\x18\x03 \x03(\x0b\x32\x0c.query.Value\"\xa2\x01\n\nBoundQuery\x12\x0b\n\x03sql\x18\x01 \x01(\t\x12<\n\x0e\x62ind_variables\x18\x02 \x03(\x0b\x32$.query.BoundQuery.BindVariablesEntry\x1aI\n\x12\x42indVariablesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.query.BindVariable:\x02\x38\x01\"\xc1\x04\n\x0e\x45xecuteOptions\x12\x1b\n\x13include_event_token\x18\x02 \x01(\x08\x12.\n\x13\x63ompare_event_token\x18\x03 \x01(\x0b\x32\x11.query.EventToken\x12=\n\x0fincluded_fields\x18\x04 \x01(\x0e\x32$.query.ExecuteOptions.IncludedFields\x12\x19\n\x11\x63lient_found_rows\x18\x05 \x01(\x08\x12\x30\n\x08workload\x18\x06 \x01(\x0e\x32\x1e.query.ExecuteOptions.Workload\x12\x18\n\x10sql_select_limit\x18\x08 \x01(\x03\x12I\n\x15transaction_isolation\x18\t \x01(\x0e\x32*.query.ExecuteOptions.TransactionIsolation\";\n\x0eIncludedFields\x12\x11\n\rTYPE_AND_NAME\x10\x00\x12\r\n\tTYPE_ONLY\x10\x01\x12\x07\n\x03\x41LL\x10\x02\"8\n\x08Workload\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x08\n\x04OLTP\x10\x01\x12\x08\n\x04OLAP\x10\x02\x12\x07\n\x03\x44\x42\x41\x10\x03\"t\n\x14TransactionIsolation\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x13\n\x0fREPEATABLE_READ\x10\x01\x12\x12\n\x0eREAD_COMMITTED\x10\x02\x12\x14\n\x10READ_UNCOMMITTED\x10\x03\x12\x10\n\x0cSERIALIZABLE\x10\x04J\x04\x08\x01\x10\x02\"\xbf\x01\n\x05\x46ield\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x19\n\x04type\x18\x02 \x01(\x0e\x32\x0b.query.Type\x12\r\n\x05table\x18\x03 \x01(\t\x12\x11\n\torg_table\x18\x04 \x01(\t\x12\x10\n\x08\x64\x61tabase\x18\x05 \x01(\t\x12\x10\n\x08org_name\x18\x06 \x01(\t\x12\x15\n\rcolumn_length\x18\x07 \x01(\r\x12\x0f\n\x07\x63harset\x18\x08 \x01(\r\x12\x10\n\x08\x64\x65\x63imals\x18\t \x01(\r\x12\r\n\x05\x66lags\x18\n \x01(\r\"&\n\x03Row\x12\x0f\n\x07lengths\x18\x01 \x03(\x12\x12\x0e\n\x06values\x18\x02 \x01(\x0c\"G\n\x0cResultExtras\x12&\n\x0b\x65vent_token\x18\x01 \x01(\x0b\x32\x11.query.EventToken\x12\x0f\n\x07\x66resher\x18\x02 \x01(\x08\"\x94\x01\n\x0bQueryResult\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x15\n\rrows_affected\x18\x02 \x01(\x04\x12\x11\n\tinsert_id\x18\x03 \x01(\x04\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12#\n\x06\x65xtras\x18\x05 \x01(\x0b\x32\x13.query.ResultExtras\"\xca\x02\n\x0bStreamEvent\x12\x30\n\nstatements\x18\x01 \x03(\x0b\x32\x1c.query.StreamEvent.Statement\x12&\n\x0b\x65vent_token\x18\x02 \x01(\x0b\x32\x11.query.EventToken\x1a\xe0\x01\n\tStatement\x12\x37\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32%.query.StreamEvent.Statement.Category\x12\x12\n\ntable_name\x18\x02 \x01(\t\x12(\n\x12primary_key_fields\x18\x03 \x03(\x0b\x32\x0c.query.Field\x12&\n\x12primary_key_values\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x0b\n\x03sql\x18\x05 \x01(\x0c\"\'\n\x08\x43\x61tegory\x12\t\n\x05\x45rror\x10\x00\x12\x07\n\x03\x44ML\x10\x01\x12\x07\n\x03\x44\x44L\x10\x02\"\xf3\x01\n\x0e\x45xecuteRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12 \n\x05query\x18\x04 \x01(\x0b\x32\x11.query.BoundQuery\x12\x16\n\x0etransaction_id\x18\x05 \x01(\x03\x12&\n\x07options\x18\x06 \x01(\x0b\x32\x15.query.ExecuteOptions\"5\n\x0f\x45xecuteResponse\x12\"\n\x06result\x18\x01 \x01(\x0b\x32\x12.query.QueryResult\"U\n\x0fResultWithError\x12\x1e\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x0f.vtrpc.RPCError\x12\"\n\x06result\x18\x02 \x01(\x0b\x32\x12.query.QueryResult\"\x92\x02\n\x13\x45xecuteBatchRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\"\n\x07queries\x18\x04 \x03(\x0b\x32\x11.query.BoundQuery\x12\x16\n\x0e\x61s_transaction\x18\x05 \x01(\x08\x12\x16\n\x0etransaction_id\x18\x06 \x01(\x03\x12&\n\x07options\x18\x07 \x01(\x0b\x32\x15.query.ExecuteOptions\";\n\x14\x45xecuteBatchResponse\x12#\n\x07results\x18\x01 \x03(\x0b\x32\x12.query.QueryResult\"\xe1\x01\n\x14StreamExecuteRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12 \n\x05query\x18\x04 \x01(\x0b\x32\x11.query.BoundQuery\x12&\n\x07options\x18\x05 \x01(\x0b\x32\x15.query.ExecuteOptions\";\n\x15StreamExecuteResponse\x12\"\n\x06result\x18\x01 \x01(\x0b\x32\x12.query.QueryResult\"\xb7\x01\n\x0c\x42\x65ginRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12&\n\x07options\x18\x04 \x01(\x0b\x32\x15.query.ExecuteOptions\"\'\n\rBeginResponse\x12\x16\n\x0etransaction_id\x18\x01 \x01(\x03\"\xa8\x01\n\rCommitRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\"\x10\n\x0e\x43ommitResponse\"\xaa\x01\n\x0fRollbackRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\"\x12\n\x10RollbackResponse\"\xb7\x01\n\x0ePrepareRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x64tid\x18\x05 \x01(\t\"\x11\n\x0fPrepareResponse\"\xa6\x01\n\x15\x43ommitPreparedRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04\x64tid\x18\x04 \x01(\t\"\x18\n\x16\x43ommitPreparedResponse\"\xc0\x01\n\x17RollbackPreparedRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x64tid\x18\x05 \x01(\t\"\x1a\n\x18RollbackPreparedResponse\"\xce\x01\n\x18\x43reateTransactionRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04\x64tid\x18\x04 \x01(\t\x12#\n\x0cparticipants\x18\x05 \x03(\x0b\x32\r.query.Target\"\x1b\n\x19\x43reateTransactionResponse\"\xbb\x01\n\x12StartCommitRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x64tid\x18\x05 \x01(\t\"\x15\n\x13StartCommitResponse\"\xbb\x01\n\x12SetRollbackRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x64tid\x18\x05 \x01(\t\"\x15\n\x13SetRollbackResponse\"\xab\x01\n\x1a\x43oncludeTransactionRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04\x64tid\x18\x04 \x01(\t\"\x1d\n\x1b\x43oncludeTransactionResponse\"\xa7\x01\n\x16ReadTransactionRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04\x64tid\x18\x04 \x01(\t\"G\n\x17ReadTransactionResponse\x12,\n\x08metadata\x18\x01 \x01(\x0b\x32\x1a.query.TransactionMetadata\"\xe0\x01\n\x13\x42\x65ginExecuteRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12 \n\x05query\x18\x04 \x01(\x0b\x32\x11.query.BoundQuery\x12&\n\x07options\x18\x05 \x01(\x0b\x32\x15.query.ExecuteOptions\"r\n\x14\x42\x65ginExecuteResponse\x12\x1e\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x0f.vtrpc.RPCError\x12\"\n\x06result\x18\x02 \x01(\x0b\x32\x12.query.QueryResult\x12\x16\n\x0etransaction_id\x18\x03 \x01(\x03\"\xff\x01\n\x18\x42\x65ginExecuteBatchRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\"\n\x07queries\x18\x04 \x03(\x0b\x32\x11.query.BoundQuery\x12\x16\n\x0e\x61s_transaction\x18\x05 \x01(\x08\x12&\n\x07options\x18\x06 \x01(\x0b\x32\x15.query.ExecuteOptions\"x\n\x19\x42\x65ginExecuteBatchResponse\x12\x1e\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x0f.vtrpc.RPCError\x12#\n\x07results\x18\x02 \x03(\x0b\x32\x12.query.QueryResult\x12\x16\n\x0etransaction_id\x18\x03 \x01(\x03\"\xa5\x01\n\x14MessageStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04name\x18\x04 \x01(\t\";\n\x15MessageStreamResponse\x12\"\n\x06result\x18\x01 \x01(\x0b\x32\x12.query.QueryResult\"\xbd\x01\n\x11MessageAckRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x19\n\x03ids\x18\x05 \x03(\x0b\x32\x0c.query.Value\"8\n\x12MessageAckResponse\x12\"\n\x06result\x18\x01 \x01(\x0b\x32\x12.query.QueryResult\"\xe7\x02\n\x11SplitQueryRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12 \n\x05query\x18\x04 \x01(\x0b\x32\x11.query.BoundQuery\x12\x14\n\x0csplit_column\x18\x05 \x03(\t\x12\x13\n\x0bsplit_count\x18\x06 \x01(\x03\x12\x1f\n\x17num_rows_per_query_part\x18\x08 \x01(\x03\x12\x35\n\talgorithm\x18\t \x01(\x0e\x32\".query.SplitQueryRequest.Algorithm\",\n\tAlgorithm\x12\x10\n\x0c\x45QUAL_SPLITS\x10\x00\x12\r\n\tFULL_SCAN\x10\x01\"A\n\nQuerySplit\x12 \n\x05query\x18\x01 \x01(\x0b\x32\x11.query.BoundQuery\x12\x11\n\trow_count\x18\x02 \x01(\x03\"8\n\x12SplitQueryResponse\x12\"\n\x07queries\x18\x01 \x03(\x0b\x32\x11.query.QuerySplit\"\x15\n\x13StreamHealthRequest\"\xb6\x01\n\rRealtimeStats\x12\x14\n\x0chealth_error\x18\x01 \x01(\t\x12\x1d\n\x15seconds_behind_master\x18\x02 \x01(\r\x12\x1c\n\x14\x62inlog_players_count\x18\x03 \x01(\x05\x12\x32\n*seconds_behind_master_filtered_replication\x18\x04 \x01(\x03\x12\x11\n\tcpu_usage\x18\x05 \x01(\x01\x12\x0b\n\x03qps\x18\x06 \x01(\x01\"\xd1\x01\n\x14StreamHealthResponse\x12\x1d\n\x06target\x18\x01 \x01(\x0b\x32\r.query.Target\x12\x0f\n\x07serving\x18\x02 \x01(\x08\x12.\n&tablet_externally_reparented_timestamp\x18\x03 \x01(\x03\x12,\n\x0erealtime_stats\x18\x04 \x01(\x0b\x32\x14.query.RealtimeStats\x12+\n\x0ctablet_alias\x18\x05 \x01(\x0b\x32\x15.topodata.TabletAlias\"\xbb\x01\n\x13UpdateStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\x11\n\ttimestamp\x18\x05 \x01(\x03\"9\n\x14UpdateStreamResponse\x12!\n\x05\x65vent\x18\x01 \x01(\x0b\x32\x12.query.StreamEvent\"\x86\x01\n\x13TransactionMetadata\x12\x0c\n\x04\x64tid\x18\x01 \x01(\t\x12&\n\x05state\x18\x02 \x01(\x0e\x32\x17.query.TransactionState\x12\x14\n\x0ctime_created\x18\x03 \x01(\x03\x12#\n\x0cparticipants\x18\x04 \x03(\x0b\x32\r.query.Target*\x92\x03\n\tMySqlFlag\x12\t\n\x05\x45MPTY\x10\x00\x12\x11\n\rNOT_NULL_FLAG\x10\x01\x12\x10\n\x0cPRI_KEY_FLAG\x10\x02\x12\x13\n\x0fUNIQUE_KEY_FLAG\x10\x04\x12\x15\n\x11MULTIPLE_KEY_FLAG\x10\x08\x12\r\n\tBLOB_FLAG\x10\x10\x12\x11\n\rUNSIGNED_FLAG\x10 \x12\x11\n\rZEROFILL_FLAG\x10@\x12\x10\n\x0b\x42INARY_FLAG\x10\x80\x01\x12\x0e\n\tENUM_FLAG\x10\x80\x02\x12\x18\n\x13\x41UTO_INCREMENT_FLAG\x10\x80\x04\x12\x13\n\x0eTIMESTAMP_FLAG\x10\x80\x08\x12\r\n\x08SET_FLAG\x10\x80\x10\x12\x1a\n\x15NO_DEFAULT_VALUE_FLAG\x10\x80 \x12\x17\n\x12ON_UPDATE_NOW_FLAG\x10\x80@\x12\x0e\n\x08NUM_FLAG\x10\x80\x80\x02\x12\x13\n\rPART_KEY_FLAG\x10\x80\x80\x01\x12\x10\n\nGROUP_FLAG\x10\x80\x80\x02\x12\x11\n\x0bUNIQUE_FLAG\x10\x80\x80\x04\x12\x11\n\x0b\x42INCMP_FLAG\x10\x80\x80\x08\x1a\x02\x10\x01*k\n\x04\x46lag\x12\x08\n\x04NONE\x10\x00\x12\x0f\n\nISINTEGRAL\x10\x80\x02\x12\x0f\n\nISUNSIGNED\x10\x80\x04\x12\x0c\n\x07ISFLOAT\x10\x80\x08\x12\r\n\x08ISQUOTED\x10\x80\x10\x12\x0b\n\x06ISTEXT\x10\x80 \x12\r\n\x08ISBINARY\x10\x80@*\x99\x03\n\x04Type\x12\r\n\tNULL_TYPE\x10\x00\x12\t\n\x04INT8\x10\x81\x02\x12\n\n\x05UINT8\x10\x82\x06\x12\n\n\x05INT16\x10\x83\x02\x12\x0b\n\x06UINT16\x10\x84\x06\x12\n\n\x05INT24\x10\x85\x02\x12\x0b\n\x06UINT24\x10\x86\x06\x12\n\n\x05INT32\x10\x87\x02\x12\x0b\n\x06UINT32\x10\x88\x06\x12\n\n\x05INT64\x10\x89\x02\x12\x0b\n\x06UINT64\x10\x8a\x06\x12\x0c\n\x07\x46LOAT32\x10\x8b\x08\x12\x0c\n\x07\x46LOAT64\x10\x8c\x08\x12\x0e\n\tTIMESTAMP\x10\x8d\x10\x12\t\n\x04\x44\x41TE\x10\x8e\x10\x12\t\n\x04TIME\x10\x8f\x10\x12\r\n\x08\x44\x41TETIME\x10\x90\x10\x12\t\n\x04YEAR\x10\x91\x06\x12\x0b\n\x07\x44\x45\x43IMAL\x10\x12\x12\t\n\x04TEXT\x10\x93\x30\x12\t\n\x04\x42LOB\x10\x94P\x12\x0c\n\x07VARCHAR\x10\x95\x30\x12\x0e\n\tVARBINARY\x10\x96P\x12\t\n\x04\x43HAR\x10\x97\x30\x12\x0b\n\x06\x42INARY\x10\x98P\x12\x08\n\x03\x42IT\x10\x99\x10\x12\t\n\x04\x45NUM\x10\x9a\x10\x12\x08\n\x03SET\x10\x9b\x10\x12\t\n\x05TUPLE\x10\x1c\x12\r\n\x08GEOMETRY\x10\x9d\x10\x12\t\n\x04JSON\x10\x9e\x10\x12\x0e\n\nEXPRESSION\x10\x1f*F\n\x10TransactionState\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07PREPARE\x10\x01\x12\n\n\x06\x43OMMIT\x10\x02\x12\x0c\n\x08ROLLBACK\x10\x03\x42\x11\n\x0fio.vitess.protob\x06proto3')
+  serialized_pb=_b('\n\x0bquery.proto\x12\x05query\x1a\x0etopodata.proto\x1a\x0bvtrpc.proto\"T\n\x06Target\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\"2\n\x0eVTGateCallerID\x12\x10\n\x08username\x18\x01 \x01(\t\x12\x0e\n\x06groups\x18\x02 \x03(\t\"@\n\nEventToken\x12\x11\n\ttimestamp\x18\x01 \x01(\x03\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x10\n\x08position\x18\x03 \x01(\t\"1\n\x05Value\x12\x19\n\x04type\x18\x01 \x01(\x0e\x32\x0b.query.Type\x12\r\n\x05value\x18\x02 \x01(\x0c\"V\n\x0c\x42indVariable\x12\x19\n\x04type\x18\x01 \x01(\x0e\x32\x0b.query.Type\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x1c\n\x06values\x18\x03 \x03(\x0b\x32\x0c.query.Value\"\xa2\x01\n\nBoundQuery\x12\x0b\n\x03sql\x18\x01 \x01(\t\x12<\n\x0e\x62ind_variables\x18\x02 \x03(\x0b\x32$.query.BoundQuery.BindVariablesEntry\x1aI\n\x12\x42indVariablesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.query.BindVariable:\x02\x38\x01\"\xe0\x04\n\x0e\x45xecuteOptions\x12\x1b\n\x13include_event_token\x18\x02 \x01(\x08\x12.\n\x13\x63ompare_event_token\x18\x03 \x01(\x0b\x32\x11.query.EventToken\x12=\n\x0fincluded_fields\x18\x04 \x01(\x0e\x32$.query.ExecuteOptions.IncludedFields\x12\x19\n\x11\x63lient_found_rows\x18\x05 \x01(\x08\x12\x30\n\x08workload\x18\x06 \x01(\x0e\x32\x1e.query.ExecuteOptions.Workload\x12\x18\n\x10sql_select_limit\x18\x08 \x01(\x03\x12I\n\x15transaction_isolation\x18\t \x01(\x0e\x32*.query.ExecuteOptions.TransactionIsolation\x12\x1d\n\x15skip_query_plan_cache\x18\n \x01(\x08\";\n\x0eIncludedFields\x12\x11\n\rTYPE_AND_NAME\x10\x00\x12\r\n\tTYPE_ONLY\x10\x01\x12\x07\n\x03\x41LL\x10\x02\"8\n\x08Workload\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x08\n\x04OLTP\x10\x01\x12\x08\n\x04OLAP\x10\x02\x12\x07\n\x03\x44\x42\x41\x10\x03\"t\n\x14TransactionIsolation\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x13\n\x0fREPEATABLE_READ\x10\x01\x12\x12\n\x0eREAD_COMMITTED\x10\x02\x12\x14\n\x10READ_UNCOMMITTED\x10\x03\x12\x10\n\x0cSERIALIZABLE\x10\x04J\x04\x08\x01\x10\x02\"\xbf\x01\n\x05\x46ield\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x19\n\x04type\x18\x02 \x01(\x0e\x32\x0b.query.Type\x12\r\n\x05table\x18\x03 \x01(\t\x12\x11\n\torg_table\x18\x04 \x01(\t\x12\x10\n\x08\x64\x61tabase\x18\x05 \x01(\t\x12\x10\n\x08org_name\x18\x06 \x01(\t\x12\x15\n\rcolumn_length\x18\x07 \x01(\r\x12\x0f\n\x07\x63harset\x18\x08 \x01(\r\x12\x10\n\x08\x64\x65\x63imals\x18\t \x01(\r\x12\r\n\x05\x66lags\x18\n \x01(\r\"&\n\x03Row\x12\x0f\n\x07lengths\x18\x01 \x03(\x12\x12\x0e\n\x06values\x18\x02 \x01(\x0c\"G\n\x0cResultExtras\x12&\n\x0b\x65vent_token\x18\x01 \x01(\x0b\x32\x11.query.EventToken\x12\x0f\n\x07\x66resher\x18\x02 \x01(\x08\"\x94\x01\n\x0bQueryResult\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x15\n\rrows_affected\x18\x02 \x01(\x04\x12\x11\n\tinsert_id\x18\x03 \x01(\x04\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12#\n\x06\x65xtras\x18\x05 \x01(\x0b\x32\x13.query.ResultExtras\"\xca\x02\n\x0bStreamEvent\x12\x30\n\nstatements\x18\x01 \x03(\x0b\x32\x1c.query.StreamEvent.Statement\x12&\n\x0b\x65vent_token\x18\x02 \x01(\x0b\x32\x11.query.EventToken\x1a\xe0\x01\n\tStatement\x12\x37\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32%.query.StreamEvent.Statement.Category\x12\x12\n\ntable_name\x18\x02 \x01(\t\x12(\n\x12primary_key_fields\x18\x03 \x03(\x0b\x32\x0c.query.Field\x12&\n\x12primary_key_values\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x0b\n\x03sql\x18\x05 \x01(\x0c\"\'\n\x08\x43\x61tegory\x12\t\n\x05\x45rror\x10\x00\x12\x07\n\x03\x44ML\x10\x01\x12\x07\n\x03\x44\x44L\x10\x02\"\xf3\x01\n\x0e\x45xecuteRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12 \n\x05query\x18\x04 \x01(\x0b\x32\x11.query.BoundQuery\x12\x16\n\x0etransaction_id\x18\x05 \x01(\x03\x12&\n\x07options\x18\x06 \x01(\x0b\x32\x15.query.ExecuteOptions\"5\n\x0f\x45xecuteResponse\x12\"\n\x06result\x18\x01 \x01(\x0b\x32\x12.query.QueryResult\"U\n\x0fResultWithError\x12\x1e\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x0f.vtrpc.RPCError\x12\"\n\x06result\x18\x02 \x01(\x0b\x32\x12.query.QueryResult\"\x92\x02\n\x13\x45xecuteBatchRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\"\n\x07queries\x18\x04 \x03(\x0b\x32\x11.query.BoundQuery\x12\x16\n\x0e\x61s_transaction\x18\x05 \x01(\x08\x12\x16\n\x0etransaction_id\x18\x06 \x01(\x03\x12&\n\x07options\x18\x07 \x01(\x0b\x32\x15.query.ExecuteOptions\";\n\x14\x45xecuteBatchResponse\x12#\n\x07results\x18\x01 \x03(\x0b\x32\x12.query.QueryResult\"\xe1\x01\n\x14StreamExecuteRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12 \n\x05query\x18\x04 \x01(\x0b\x32\x11.query.BoundQuery\x12&\n\x07options\x18\x05 \x01(\x0b\x32\x15.query.ExecuteOptions\";\n\x15StreamExecuteResponse\x12\"\n\x06result\x18\x01 \x01(\x0b\x32\x12.query.QueryResult\"\xb7\x01\n\x0c\x42\x65ginRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12&\n\x07options\x18\x04 \x01(\x0b\x32\x15.query.ExecuteOptions\"\'\n\rBeginResponse\x12\x16\n\x0etransaction_id\x18\x01 \x01(\x03\"\xa8\x01\n\rCommitRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\"\x10\n\x0e\x43ommitResponse\"\xaa\x01\n\x0fRollbackRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\"\x12\n\x10RollbackResponse\"\xb7\x01\n\x0ePrepareRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x64tid\x18\x05 \x01(\t\"\x11\n\x0fPrepareResponse\"\xa6\x01\n\x15\x43ommitPreparedRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04\x64tid\x18\x04 \x01(\t\"\x18\n\x16\x43ommitPreparedResponse\"\xc0\x01\n\x17RollbackPreparedRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x64tid\x18\x05 \x01(\t\"\x1a\n\x18RollbackPreparedResponse\"\xce\x01\n\x18\x43reateTransactionRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04\x64tid\x18\x04 \x01(\t\x12#\n\x0cparticipants\x18\x05 \x03(\x0b\x32\r.query.Target\"\x1b\n\x19\x43reateTransactionResponse\"\xbb\x01\n\x12StartCommitRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x64tid\x18\x05 \x01(\t\"\x15\n\x13StartCommitResponse\"\xbb\x01\n\x12SetRollbackRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x16\n\x0etransaction_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x64tid\x18\x05 \x01(\t\"\x15\n\x13SetRollbackResponse\"\xab\x01\n\x1a\x43oncludeTransactionRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04\x64tid\x18\x04 \x01(\t\"\x1d\n\x1b\x43oncludeTransactionResponse\"\xa7\x01\n\x16ReadTransactionRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04\x64tid\x18\x04 \x01(\t\"G\n\x17ReadTransactionResponse\x12,\n\x08metadata\x18\x01 \x01(\x0b\x32\x1a.query.TransactionMetadata\"\xe0\x01\n\x13\x42\x65ginExecuteRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12 \n\x05query\x18\x04 \x01(\x0b\x32\x11.query.BoundQuery\x12&\n\x07options\x18\x05 \x01(\x0b\x32\x15.query.ExecuteOptions\"r\n\x14\x42\x65ginExecuteResponse\x12\x1e\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x0f.vtrpc.RPCError\x12\"\n\x06result\x18\x02 \x01(\x0b\x32\x12.query.QueryResult\x12\x16\n\x0etransaction_id\x18\x03 \x01(\x03\"\xff\x01\n\x18\x42\x65ginExecuteBatchRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\"\n\x07queries\x18\x04 \x03(\x0b\x32\x11.query.BoundQuery\x12\x16\n\x0e\x61s_transaction\x18\x05 \x01(\x08\x12&\n\x07options\x18\x06 \x01(\x0b\x32\x15.query.ExecuteOptions\"x\n\x19\x42\x65ginExecuteBatchResponse\x12\x1e\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x0f.vtrpc.RPCError\x12#\n\x07results\x18\x02 \x03(\x0b\x32\x12.query.QueryResult\x12\x16\n\x0etransaction_id\x18\x03 \x01(\x03\"\xa5\x01\n\x14MessageStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04name\x18\x04 \x01(\t\";\n\x15MessageStreamResponse\x12\"\n\x06result\x18\x01 \x01(\x0b\x32\x12.query.QueryResult\"\xbd\x01\n\x11MessageAckRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x19\n\x03ids\x18\x05 \x03(\x0b\x32\x0c.query.Value\"8\n\x12MessageAckResponse\x12\"\n\x06result\x18\x01 \x01(\x0b\x32\x12.query.QueryResult\"\xe7\x02\n\x11SplitQueryRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12 \n\x05query\x18\x04 \x01(\x0b\x32\x11.query.BoundQuery\x12\x14\n\x0csplit_column\x18\x05 \x03(\t\x12\x13\n\x0bsplit_count\x18\x06 \x01(\x03\x12\x1f\n\x17num_rows_per_query_part\x18\x08 \x01(\x03\x12\x35\n\talgorithm\x18\t \x01(\x0e\x32\".query.SplitQueryRequest.Algorithm\",\n\tAlgorithm\x12\x10\n\x0c\x45QUAL_SPLITS\x10\x00\x12\r\n\tFULL_SCAN\x10\x01\"A\n\nQuerySplit\x12 \n\x05query\x18\x01 \x01(\x0b\x32\x11.query.BoundQuery\x12\x11\n\trow_count\x18\x02 \x01(\x03\"8\n\x12SplitQueryResponse\x12\"\n\x07queries\x18\x01 \x03(\x0b\x32\x11.query.QuerySplit\"\x15\n\x13StreamHealthRequest\"\xb6\x01\n\rRealtimeStats\x12\x14\n\x0chealth_error\x18\x01 \x01(\t\x12\x1d\n\x15seconds_behind_master\x18\x02 \x01(\r\x12\x1c\n\x14\x62inlog_players_count\x18\x03 \x01(\x05\x12\x32\n*seconds_behind_master_filtered_replication\x18\x04 \x01(\x03\x12\x11\n\tcpu_usage\x18\x05 \x01(\x01\x12\x0b\n\x03qps\x18\x06 \x01(\x01\"\xd1\x01\n\x14StreamHealthResponse\x12\x1d\n\x06target\x18\x01 \x01(\x0b\x32\r.query.Target\x12\x0f\n\x07serving\x18\x02 \x01(\x08\x12.\n&tablet_externally_reparented_timestamp\x18\x03 \x01(\x03\x12,\n\x0erealtime_stats\x18\x04 \x01(\x0b\x32\x14.query.RealtimeStats\x12+\n\x0ctablet_alias\x18\x05 \x01(\x0b\x32\x15.topodata.TabletAlias\"\xbb\x01\n\x13UpdateStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\x11\n\ttimestamp\x18\x05 \x01(\x03\"9\n\x14UpdateStreamResponse\x12!\n\x05\x65vent\x18\x01 \x01(\x0b\x32\x12.query.StreamEvent\"\x86\x01\n\x13TransactionMetadata\x12\x0c\n\x04\x64tid\x18\x01 \x01(\t\x12&\n\x05state\x18\x02 \x01(\x0e\x32\x17.query.TransactionState\x12\x14\n\x0ctime_created\x18\x03 \x01(\x03\x12#\n\x0cparticipants\x18\x04 \x03(\x0b\x32\r.query.Target*\x92\x03\n\tMySqlFlag\x12\t\n\x05\x45MPTY\x10\x00\x12\x11\n\rNOT_NULL_FLAG\x10\x01\x12\x10\n\x0cPRI_KEY_FLAG\x10\x02\x12\x13\n\x0fUNIQUE_KEY_FLAG\x10\x04\x12\x15\n\x11MULTIPLE_KEY_FLAG\x10\x08\x12\r\n\tBLOB_FLAG\x10\x10\x12\x11\n\rUNSIGNED_FLAG\x10 \x12\x11\n\rZEROFILL_FLAG\x10@\x12\x10\n\x0b\x42INARY_FLAG\x10\x80\x01\x12\x0e\n\tENUM_FLAG\x10\x80\x02\x12\x18\n\x13\x41UTO_INCREMENT_FLAG\x10\x80\x04\x12\x13\n\x0eTIMESTAMP_FLAG\x10\x80\x08\x12\r\n\x08SET_FLAG\x10\x80\x10\x12\x1a\n\x15NO_DEFAULT_VALUE_FLAG\x10\x80 \x12\x17\n\x12ON_UPDATE_NOW_FLAG\x10\x80@\x12\x0e\n\x08NUM_FLAG\x10\x80\x80\x02\x12\x13\n\rPART_KEY_FLAG\x10\x80\x80\x01\x12\x10\n\nGROUP_FLAG\x10\x80\x80\x02\x12\x11\n\x0bUNIQUE_FLAG\x10\x80\x80\x04\x12\x11\n\x0b\x42INCMP_FLAG\x10\x80\x80\x08\x1a\x02\x10\x01*k\n\x04\x46lag\x12\x08\n\x04NONE\x10\x00\x12\x0f\n\nISINTEGRAL\x10\x80\x02\x12\x0f\n\nISUNSIGNED\x10\x80\x04\x12\x0c\n\x07ISFLOAT\x10\x80\x08\x12\r\n\x08ISQUOTED\x10\x80\x10\x12\x0b\n\x06ISTEXT\x10\x80 \x12\r\n\x08ISBINARY\x10\x80@*\x99\x03\n\x04Type\x12\r\n\tNULL_TYPE\x10\x00\x12\t\n\x04INT8\x10\x81\x02\x12\n\n\x05UINT8\x10\x82\x06\x12\n\n\x05INT16\x10\x83\x02\x12\x0b\n\x06UINT16\x10\x84\x06\x12\n\n\x05INT24\x10\x85\x02\x12\x0b\n\x06UINT24\x10\x86\x06\x12\n\n\x05INT32\x10\x87\x02\x12\x0b\n\x06UINT32\x10\x88\x06\x12\n\n\x05INT64\x10\x89\x02\x12\x0b\n\x06UINT64\x10\x8a\x06\x12\x0c\n\x07\x46LOAT32\x10\x8b\x08\x12\x0c\n\x07\x46LOAT64\x10\x8c\x08\x12\x0e\n\tTIMESTAMP\x10\x8d\x10\x12\t\n\x04\x44\x41TE\x10\x8e\x10\x12\t\n\x04TIME\x10\x8f\x10\x12\r\n\x08\x44\x41TETIME\x10\x90\x10\x12\t\n\x04YEAR\x10\x91\x06\x12\x0b\n\x07\x44\x45\x43IMAL\x10\x12\x12\t\n\x04TEXT\x10\x93\x30\x12\t\n\x04\x42LOB\x10\x94P\x12\x0c\n\x07VARCHAR\x10\x95\x30\x12\x0e\n\tVARBINARY\x10\x96P\x12\t\n\x04\x43HAR\x10\x97\x30\x12\x0b\n\x06\x42INARY\x10\x98P\x12\x08\n\x03\x42IT\x10\x99\x10\x12\t\n\x04\x45NUM\x10\x9a\x10\x12\x08\n\x03SET\x10\x9b\x10\x12\t\n\x05TUPLE\x10\x1c\x12\r\n\x08GEOMETRY\x10\x9d\x10\x12\t\n\x04JSON\x10\x9e\x10\x12\x0e\n\nEXPRESSION\x10\x1f*F\n\x10TransactionState\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07PREPARE\x10\x01\x12\n\n\x06\x43OMMIT\x10\x02\x12\x0c\n\x08ROLLBACK\x10\x03\x42\x11\n\x0fio.vitess.protob\x06proto3')
   ,
   dependencies=[topodata__pb2.DESCRIPTOR,vtrpc__pb2.DESCRIPTOR,])
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
@@ -116,8 +116,8 @@
   ],
   containing_type=None,
   options=_descriptor._ParseOptions(descriptor_pb2.EnumOptions(), _b('\020\001')),
-  serialized_start=7785,
-  serialized_end=8187,
+  serialized_start=7816,
+  serialized_end=8218,
 )
 _sym_db.RegisterEnumDescriptor(_MYSQLFLAG)
 
@@ -159,8 +159,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=8189,
-  serialized_end=8296,
+  serialized_start=8220,
+  serialized_end=8327,
 )
 _sym_db.RegisterEnumDescriptor(_FLAG)
 
@@ -302,8 +302,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=8299,
-  serialized_end=8708,
+  serialized_start=8330,
+  serialized_end=8739,
 )
 _sym_db.RegisterEnumDescriptor(_TYPE)
 
@@ -333,8 +333,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=8710,
-  serialized_end=8780,
+  serialized_start=8741,
+  serialized_end=8811,
 )
 _sym_db.RegisterEnumDescriptor(_TRANSACTIONSTATE)
 
@@ -425,8 +425,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=896,
-  serialized_end=955,
+  serialized_start=927,
+  serialized_end=986,
 )
 _sym_db.RegisterEnumDescriptor(_EXECUTEOPTIONS_INCLUDEDFIELDS)
 
@@ -455,8 +455,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=957,
-  serialized_end=1013,
+  serialized_start=988,
+  serialized_end=1044,
 )
 _sym_db.RegisterEnumDescriptor(_EXECUTEOPTIONS_WORKLOAD)
 
@@ -489,8 +489,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=1015,
-  serialized_end=1131,
+  serialized_start=1046,
+  serialized_end=1162,
 )
 _sym_db.RegisterEnumDescriptor(_EXECUTEOPTIONS_TRANSACTIONISOLATION)
 
@@ -515,8 +515,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=1889,
-  serialized_end=1928,
+  serialized_start=1920,
+  serialized_end=1959,
 )
 _sym_db.RegisterEnumDescriptor(_STREAMEVENT_STATEMENT_CATEGORY)
 
@@ -537,8 +537,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=6807,
-  serialized_end=6851,
+  serialized_start=6838,
+  serialized_end=6882,
 )
 _sym_db.RegisterEnumDescriptor(_SPLITQUERYREQUEST_ALGORITHM)
 
@@ -885,6 +885,13 @@
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
+    _descriptor.FieldDescriptor(
+      name='skip_query_plan_cache', full_name='query.ExecuteOptions.skip_query_plan_cache', index=7,
+      number=10, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
   ],
   extensions=[
   ],
@@ -901,7 +908,7 @@
   oneofs=[
   ],
   serialized_start=560,
-  serialized_end=1137,
+  serialized_end=1168,
 )
 
 
@@ -994,8 +1001,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1140,
-  serialized_end=1331,
+  serialized_start=1171,
+  serialized_end=1362,
 )
 
 
@@ -1032,8 +1039,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1333,
-  serialized_end=1371,
+  serialized_start=1364,
+  serialized_end=1402,
 )
 
 
@@ -1070,8 +1077,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1373,
-  serialized_end=1444,
+  serialized_start=1404,
+  serialized_end=1475,
 )
 
 
@@ -1129,8 +1136,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1447,
-  serialized_end=1595,
+  serialized_start=1478,
+  serialized_end=1626,
 )
 
 
@@ -1189,8 +1196,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1704,
-  serialized_end=1928,
+  serialized_start=1735,
+  serialized_end=1959,
 )
 
 _STREAMEVENT = _descriptor.Descriptor(
@@ -1226,8 +1233,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1598,
-  serialized_end=1928,
+  serialized_start=1629,
+  serialized_end=1959,
 )
 
 
@@ -1292,8 +1299,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1931,
-  serialized_end=2174,
+  serialized_start=1962,
+  serialized_end=2205,
 )
 
 
@@ -1323,8 +1330,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2176,
-  serialized_end=2229,
+  serialized_start=2207,
+  serialized_end=2260,
 )
 
 
@@ -1361,8 +1368,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2231,
-  serialized_end=2316,
+  serialized_start=2262,
+  serialized_end=2347,
 )
 
 
@@ -1434,8 +1441,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2319,
-  serialized_end=2593,
+  serialized_start=2350,
+  serialized_end=2624,
 )
 
 
@@ -1465,8 +1472,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2595,
-  serialized_end=2654,
+  serialized_start=2626,
+  serialized_end=2685,
 )
 
 
@@ -1524,8 +1531,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2657,
-  serialized_end=2882,
+  serialized_start=2688,
+  serialized_end=2913,
 )
 
 
@@ -1555,8 +1562,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2884,
-  serialized_end=2943,
+  serialized_start=2915,
+  serialized_end=2974,
 )
 
 
@@ -1607,8 +1614,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2946,
-  serialized_end=3129,
+  serialized_start=2977,
+  serialized_end=3160,
 )
 
 
@@ -1638,8 +1645,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3131,
-  serialized_end=3170,
+  serialized_start=3162,
+  serialized_end=3201,
 )
 
 
@@ -1690,8 +1697,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3173,
-  serialized_end=3341,
+  serialized_start=3204,
+  serialized_end=3372,
 )
 
 
@@ -1714,8 +1721,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3343,
-  serialized_end=3359,
+  serialized_start=3374,
+  serialized_end=3390,
 )
 
 
@@ -1766,8 +1773,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3362,
-  serialized_end=3532,
+  serialized_start=3393,
+  serialized_end=3563,
 )
 
 
@@ -1790,8 +1797,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3534,
-  serialized_end=3552,
+  serialized_start=3565,
+  serialized_end=3583,
 )
 
 
@@ -1849,8 +1856,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3555,
-  serialized_end=3738,
+  serialized_start=3586,
+  serialized_end=3769,
 )
 
 
@@ -1873,8 +1880,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3740,
-  serialized_end=3757,
+  serialized_start=3771,
+  serialized_end=3788,
 )
 
 
@@ -1925,8 +1932,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3760,
-  serialized_end=3926,
+  serialized_start=3791,
+  serialized_end=3957,
 )
 
 
@@ -1949,8 +1956,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3928,
-  serialized_end=3952,
+  serialized_start=3959,
+  serialized_end=3983,
 )
 
 
@@ -2008,8 +2015,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=3955,
-  serialized_end=4147,
+  serialized_start=3986,
+  serialized_end=4178,
 )
 
 
@@ -2032,8 +2039,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4149,
-  serialized_end=4175,
+  serialized_start=4180,
+  serialized_end=4206,
 )
 
 
@@ -2091,8 +2098,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4178,
-  serialized_end=4384,
+  serialized_start=4209,
+  serialized_end=4415,
 )
 
 
@@ -2115,8 +2122,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4386,
-  serialized_end=4413,
+  serialized_start=4417,
+  serialized_end=4444,
 )
 
 
@@ -2174,8 +2181,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4416,
-  serialized_end=4603,
+  serialized_start=4447,
+  serialized_end=4634,
 )
 
 
@@ -2198,8 +2205,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4605,
-  serialized_end=4626,
+  serialized_start=4636,
+  serialized_end=4657,
 )
 
 
@@ -2257,8 +2264,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4629,
-  serialized_end=4816,
+  serialized_start=4660,
+  serialized_end=4847,
 )
 
 
@@ -2281,8 +2288,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4818,
-  serialized_end=4839,
+  serialized_start=4849,
+  serialized_end=4870,
 )
 
 
@@ -2333,8 +2340,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=4842,
-  serialized_end=5013,
+  serialized_start=4873,
+  serialized_end=5044,
 )
 
 
@@ -2357,8 +2364,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5015,
-  serialized_end=5044,
+  serialized_start=5046,
+  serialized_end=5075,
 )
 
 
@@ -2409,8 +2416,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5047,
-  serialized_end=5214,
+  serialized_start=5078,
+  serialized_end=5245,
 )
 
 
@@ -2440,8 +2447,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5216,
-  serialized_end=5287,
+  serialized_start=5247,
+  serialized_end=5318,
 )
 
 
@@ -2499,8 +2506,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5290,
-  serialized_end=5514,
+  serialized_start=5321,
+  serialized_end=5545,
 )
 
 
@@ -2544,8 +2551,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5516,
-  serialized_end=5630,
+  serialized_start=5547,
+  serialized_end=5661,
 )
 
 
@@ -2610,8 +2617,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5633,
-  serialized_end=5888,
+  serialized_start=5664,
+  serialized_end=5919,
 )
 
 
@@ -2655,8 +2662,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=5890,
-  serialized_end=6010,
+  serialized_start=5921,
+  serialized_end=6041,
 )
 
 
@@ -2707,8 +2714,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6013,
-  serialized_end=6178,
+  serialized_start=6044,
+  serialized_end=6209,
 )
 
 
@@ -2738,8 +2745,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6180,
-  serialized_end=6239,
+  serialized_start=6211,
+  serialized_end=6270,
 )
 
 
@@ -2797,8 +2804,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6242,
-  serialized_end=6431,
+  serialized_start=6273,
+  serialized_end=6462,
 )
 
 
@@ -2828,8 +2835,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6433,
-  serialized_end=6489,
+  serialized_start=6464,
+  serialized_end=6520,
 )
 
 
@@ -2909,8 +2916,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6492,
-  serialized_end=6851,
+  serialized_start=6523,
+  serialized_end=6882,
 )
 
 
@@ -2947,8 +2954,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6853,
-  serialized_end=6918,
+  serialized_start=6884,
+  serialized_end=6949,
 )
 
 
@@ -2978,8 +2985,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6920,
-  serialized_end=6976,
+  serialized_start=6951,
+  serialized_end=7007,
 )
 
 
@@ -3002,8 +3009,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=6978,
-  serialized_end=6999,
+  serialized_start=7009,
+  serialized_end=7030,
 )
 
 
@@ -3068,8 +3075,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=7002,
-  serialized_end=7184,
+  serialized_start=7033,
+  serialized_end=7215,
 )
 
 
@@ -3127,8 +3134,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=7187,
-  serialized_end=7396,
+  serialized_start=7218,
+  serialized_end=7427,
 )
 
 
@@ -3186,8 +3193,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=7399,
-  serialized_end=7586,
+  serialized_start=7430,
+  serialized_end=7617,
 )
 
 
@@ -3217,8 +3224,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=7588,
-  serialized_end=7645,
+  serialized_start=7619,
+  serialized_end=7676,
 )
 
 
@@ -3269,8 +3276,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=7648,
-  serialized_end=7782,
+  serialized_start=7679,
+  serialized_end=7813,
 )
 
 _TARGET.fields_by_name['tablet_type'].enum_type = topodata__pb2._TABLETTYPE
diff --git a/test.go b/test.go
index d74d84b383c..36fd4e29dfc 100755
--- a/test.go
+++ b/test.go
@@ -78,21 +78,22 @@ const flavors = "mariadb,mysql56,mysql57,percona,percona57"
 
 // Flags
 var (
-	flavor   = flag.String("flavor", "mysql57", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
-	runCount = flag.Int("runs", 1, "run each test this many times")
-	retryMax = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
-	logPass  = flag.Bool("log-pass", false, "log test output even if it passes")
-	timeout  = flag.Duration("timeout", 10*time.Minute, "timeout for each test")
-	pull     = flag.Bool("pull", true, "re-pull the bootstrap image, in case it's been updated")
-	docker   = flag.Bool("docker", true, "run tests with Docker")
-	shard    = flag.Int("shard", -1, "if N>=0, run the tests whose Shard field matches N")
-	tag      = flag.String("tag", "", "if provided, only run tests with the given tag. Can't be combined with -shard or explicit test list")
-	exclude  = flag.String("exclude", "", "if provided, exclude tests containing any of the given tags (comma delimited)")
-	reshard  = flag.Int("rebalance", 0, "if N>0, check the stats and group tests into N similarly-sized bins by average run time")
-	keepData = flag.Bool("keep-data", false, "don't delete the per-test VTDATAROOT subfolders")
-	printLog = flag.Bool("print-log", false, "print the log of each failed test (or all tests if -log-pass) to the console")
-	follow   = flag.Bool("follow", false, "print test output as it runs, instead of waiting to see if it passes or fails")
-	parallel = flag.Int("parallel", 1, "number of tests to run in parallel")
+	flavor         = flag.String("flavor", "mysql57", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
+	runCount       = flag.Int("runs", 1, "run each test this many times")
+	retryMax       = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
+	logPass        = flag.Bool("log-pass", false, "log test output even if it passes")
+	timeout        = flag.Duration("timeout", 10*time.Minute, "timeout for each test")
+	pull           = flag.Bool("pull", true, "re-pull the bootstrap image, in case it's been updated")
+	docker         = flag.Bool("docker", true, "run tests with Docker")
+	useDockerCache = flag.Bool("use_docker_cache", false, "if true, create a temporary Docker image to cache the source code and the binaries generated by 'make build'. Used for execution on Travis CI.")
+	shard          = flag.Int("shard", -1, "if N>=0, run the tests whose Shard field matches N")
+	tag            = flag.String("tag", "", "if provided, only run tests with the given tag. Can't be combined with -shard or explicit test list")
+	exclude        = flag.String("exclude", "", "if provided, exclude tests containing any of the given tags (comma delimited)")
+	reshard        = flag.Int("rebalance", 0, "if N>0, check the stats and group tests into N similarly-sized bins by average run time")
+	keepData       = flag.Bool("keep-data", false, "don't delete the per-test VTDATAROOT subfolders")
+	printLog       = flag.Bool("print-log", false, "print the log of each failed test (or all tests if -log-pass) to the console")
+	follow         = flag.Bool("follow", false, "print test output as it runs, instead of waiting to see if it passes or fails")
+	parallel       = flag.Int("parallel", 1, "number of tests to run in parallel")
 
 	remoteStats = flag.String("remote-stats", "", "url to send remote stats")
 )
@@ -174,7 +175,17 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) {
 
 	var cmd *exec.Cmd
 	if *docker {
-		cmd = exec.Command(path.Join(dir, "docker/test/run.sh"), t.flavor, "make build && "+strings.Join(testCmd, " "))
+		var args []string
+		testArgs := strings.Join(testCmd, " ")
+
+		if *useDockerCache {
+			args = []string{"--use_docker_cache", cacheImage(t.flavor), t.flavor, testArgs}
+		} else {
+			// If there is no cache, we have to call 'make build' before each test.
+			args = []string{t.flavor, "make build && " + testArgs}
+		}
+
+		cmd = exec.Command(path.Join(dir, "docker/test/run.sh"), args...)
 	} else {
 		cmd = exec.Command(testCmd[0], testCmd[1:]...)
 	}
@@ -253,6 +264,9 @@ func main() {
 	if *parallel > 1 && !*docker {
 		log.Fatalf("Can't use -parallel value > 1 when -docker=false")
 	}
+	if *useDockerCache && !*docker {
+		log.Fatalf("Can't use -use_docker_cache when -docker=false")
+	}
 
 	startTime := time.Now()
 
@@ -315,7 +329,7 @@ func main() {
 					if out, err := cmd.CombinedOutput(); err != nil {
 						log.Fatalf("Can't pull image %v: %v\n%s", image, err, out)
 					}
-					log.Printf("Image %v pulled in %v", image, time.Since(pullTime))
+					log.Printf("Image %v pulled in %v", image, round(time.Since(pullTime)))
 				}(flavor)
 			}
 			wg.Wait()
@@ -382,6 +396,17 @@ func main() {
 		}
 	}
 
+	if *useDockerCache {
+		for _, flavor := range flavors {
+			start := time.Now()
+			log.Printf("Creating Docker cache image for flavor '%s'...", flavor)
+			if out, err := exec.Command("docker/test/run.sh", "--create_docker_cache", cacheImage(flavor), flavor, "make build").CombinedOutput(); err != nil {
+				log.Fatalf("Failed to create Docker cache image for flavor '%s': %v\n%s", flavor, err, out)
+			}
+			log.Printf("Creating Docker cache image took %v", round(time.Since(start)))
+		}
+	}
+
 	// Keep stats for the overall run.
 	var mu sync.Mutex
 	failed := 0
@@ -473,7 +498,7 @@ func main() {
 
 					if err != nil {
 						// This try failed.
-						test.logf("FAILED (try %v/%v) in %v: %v", try, tryMax, duration, err)
+						test.logf("FAILED (try %v/%v) in %v: %v", try, tryMax, round(duration), err)
 						mu.Lock()
 						testFailed(test.name)
 						mu.Unlock()
@@ -485,11 +510,11 @@ func main() {
 
 					if try == 1 {
 						// Passed on the first try.
-						test.logf("PASSED in %v", duration)
+						test.logf("PASSED in %v", round(duration))
 						passed++
 					} else {
 						// Passed, but not on the first try.
-						test.logf("FLAKY (1/%v passed in %v)", try, duration)
+						test.logf("FLAKY (1/%v passed in %v)", try, round(duration))
 						flaky++
 						testFlaked(test.name, try)
 					}
@@ -527,6 +552,15 @@ func main() {
 			log.Printf("Failed to remove temp dir: %v", err)
 		}
 	}
+	// Remove temporary Docker cache image.
+	if *useDockerCache {
+		for _, flavor := range flavors {
+			log.Printf("Removing temporary Docker cache image for flavor '%s'", flavor)
+			if out, err := exec.Command("docker", "rmi", cacheImage(flavor)).CombinedOutput(); err != nil {
+				log.Printf("WARNING: Failed to delete Docker cache image: %v\n%s", err, out)
+			}
+		}
+	}
 
 	// Print summary.
 	log.Printf(strings.Repeat("=", 60))
@@ -546,7 +580,7 @@ func main() {
 	log.Printf(strings.Repeat("=", 60))
 	skipped := len(tests) - passed - flaky - failed
 	log.Printf("%v PASSED, %v FLAKY, %v FAILED, %v SKIPPED", passed, flaky, failed, skipped)
-	log.Printf("Total time: %v", time.Since(startTime))
+	log.Printf("Total time: %v", round(time.Since(startTime)))
 
 	if failed > 0 || skipped > 0 {
 		os.Exit(1)
@@ -567,6 +601,11 @@ func updateEnv(orig []string, updates map[string]string) []string {
 	return env
 }
 
+// cacheImage returns the flavor-specific name of the Docker cache image.
+func cacheImage(flavor string) string {
+	return fmt.Sprintf("vitess/bootstrap:rm_%s_test_cache_do_NOT_push", flavor)
+}
+
 type Stats struct {
 	TestStats map[string]TestStats
 }
@@ -835,3 +874,7 @@ func splitArgs(all []string, tok string) (args, extraArgs []string) {
 	}
 	return
 }
+
+func round(d time.Duration) time.Duration {
+	return d.Round(100 * time.Millisecond)
+}
diff --git a/test/automation_horizontal_resharding.py b/test/automation_horizontal_resharding.py
deleted file mode 100755
index bfb46171a34..00000000000
--- a/test/automation_horizontal_resharding.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2017 Google Inc.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""End-to-end test for horizontal resharding automation."""
-
-# "unittest" is used indirectly by importing "worker", but pylint does
-# not grasp this.
-# Import it explicitly to make pylint happy and stop it complaining about
-# setUpModule, tearDownModule and the missing module docstring.
-import unittest  # pylint: disable=unused-import
-
-import environment
-import utils
-import worker
-
-
-def setUpModule():
-  worker.setUpModule()
-  utils.Vtctld().start()
-
-
-def tearDownModule():
-  worker.tearDownModule()
-
-
-class TestAutomationHorizontalResharding(worker.TestBaseSplitClone):
-  """End-to-end test for horizontal resharding automation.
-
-  This test reuses worker.py because worker.py also covers the happy path
-  of the horizontal resharding code. Instead of running the different resharding
-  steps "manually" as part of the test, they will be run by the automation
-  cluster operation.
-  """
-
-  KEYSPACE = 'test_keyspace'
-
-  def test_regular_operation(self):
-    # Use a dedicated worker to run all vtworker commands.
-    worker_proc, _, worker_rpc_port = utils.run_vtworker_bg(
-        ['--cell', 'test_nj'],
-        auto_log=True)
-    vtworker_endpoint = 'localhost:' + str(worker_rpc_port)
-
-    automation_server_proc, automation_server_port = (
-        utils.run_automation_server())
-
-    source_shard_list = '0'
-    dest_shard_list = '-80,80-'
-    _, vtctld_endpoint = utils.vtctld.rpc_endpoint()
-    utils.run(
-        environment.binary_argstr('automation_client') +
-        ' --server localhost:' + str(automation_server_port) +
-        ' --task HorizontalReshardingTask' +
-        ' --param keyspace=' + self.KEYSPACE +
-        ' --param source_shard_list=' + source_shard_list +
-        ' --param dest_shard_list=' + dest_shard_list +
-        ' --param vtctld_endpoint=' + vtctld_endpoint +
-        ' --param vtworker_endpoint=' + vtworker_endpoint +
-        ' --param min_healthy_rdonly_tablets=1')
-
-    self.verify()
-
-    utils.kill_sub_process(automation_server_proc, soft=True)
-    utils.kill_sub_process(worker_proc, soft=True)
-
-  def verify(self):
-    self.assert_shard_data_equal(0, worker.shard_master,
-                                 worker.shard_0_tablets.replica)
-    self.assert_shard_data_equal(1, worker.shard_master,
-                                 worker.shard_1_tablets.replica)
-
-    # Verify effect of MigrateServedTypes. Dest shards are serving now.
-    utils.check_srv_keyspace(
-        'test_nj', self.KEYSPACE,
-        'Partitions(master): -80 80-\n'
-        'Partitions(rdonly): -80 80-\n'
-        'Partitions(replica): -80 80-\n')
-
-    # Check that query service is disabled (source shard) or enabled (dest).
-
-    # source shard: query service must be disabled after MigrateServedTypes.
-    utils.check_tablet_query_service(
-        self, worker.shard_rdonly1,
-        serving=False, tablet_control_disabled=True)
-    utils.check_tablet_query_service(
-        self, worker.shard_replica,
-        serving=False, tablet_control_disabled=True)
-    utils.check_tablet_query_service(
-        self, worker.shard_master,
-        serving=False, tablet_control_disabled=True)
-
-    # dest shard -80: query service must be enabled after MigrateServedTypes.
-    utils.check_tablet_query_service(
-        self, worker.shard_0_rdonly1,
-        serving=True, tablet_control_disabled=False)
-    utils.check_tablet_query_service(
-        self, worker.shard_0_replica,
-        serving=True, tablet_control_disabled=False)
-    utils.check_tablet_query_service(
-        self, worker.shard_0_master,
-        serving=True, tablet_control_disabled=False)
-
-    # dest shard 80-: query service must be enabled after MigrateServedTypes.
-    utils.check_tablet_query_service(
-        self, worker.shard_1_rdonly1,
-        serving=True, tablet_control_disabled=False)
-    utils.check_tablet_query_service(
-        self, worker.shard_1_replica,
-        serving=True, tablet_control_disabled=False)
-    utils.check_tablet_query_service(
-        self, worker.shard_1_master,
-        serving=True, tablet_control_disabled=False)
-
-if __name__ == '__main__':
-  utils.main(test_options=worker.add_test_options)
diff --git a/test/automation_vertical_split.py b/test/automation_vertical_split.py
deleted file mode 100755
index def59de31da..00000000000
--- a/test/automation_vertical_split.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2017 Google Inc.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# "unittest" is used indirectly by importing "vertical_split", but pylint does
-# not grasp this.
-# Import it explicitly to make pylint happy and stop it complaining about
-# setUpModule, tearDownModule and the missing module docstring.
-import unittest  # pylint: disable=unused-import
-
-import environment
-import utils
-import vertical_split
-
-
-def setUpModule():
-  vertical_split.setUpModule()
-
-
-def tearDownModule():
-  vertical_split.tearDownModule()
-
-
-class TestAutomationVerticalSplit(vertical_split.TestVerticalSplit):
-  """End-to-end test for running a vertical split via the automation framework.
-
-  This test is a subset of vertical_split.py. The "VerticalSplitTask" automation
-  operation runs the major commands for a vertical split instead of calling them
-  "manually" from the test.
-  """
-
-  def test_vertical_split(self):
-    # Use a dedicated worker to run all vtworker commands.
-    worker_proc, _, worker_rpc_port = utils.run_vtworker_bg(
-        ['--cell', 'test_nj'],
-        auto_log=True)
-    vtworker_endpoint = 'localhost:' + str(worker_rpc_port)
-
-    automation_server_proc, automation_server_port = (
-        utils.run_automation_server())
-
-    _, vtctld_endpoint = utils.vtctld.rpc_endpoint()
-    params = {'source_keyspace': 'source_keyspace',
-              'dest_keyspace': 'destination_keyspace',
-              'shard_list': '0',
-              'tables': '/moving/,view1',
-              'vtctld_endpoint': vtctld_endpoint,
-              'vtworker_endpoint': vtworker_endpoint,
-             }
-    args = ['--server', 'localhost:' + str(automation_server_port),
-            '--task', 'VerticalSplitTask']
-    args.extend(['--param=' + k + '=' + v for k, v in params.items()])
-    utils.run(environment.binary_args('automation_client') + args)
-
-    self._check_srv_keyspace('')
-    self._check_blacklisted_tables(vertical_split.source_master,
-                                   ['/moving/', 'view1'])
-    self._check_blacklisted_tables(vertical_split.source_replica,
-                                   ['/moving/', 'view1'])
-    self._check_blacklisted_tables(vertical_split.source_rdonly1,
-                                   ['/moving/', 'view1'])
-    self._check_blacklisted_tables(vertical_split.source_rdonly2,
-                                   ['/moving/', 'view1'])
-
-    # check the binlog player is gone now
-    vertical_split.destination_master.wait_for_binlog_player_count(0)
-
-    utils.kill_sub_process(automation_server_proc, soft=True)
-    utils.kill_sub_process(worker_proc, soft=True)
-
-
-if __name__ == '__main__':
-  utils.main()
diff --git a/test/cluster/keytar/config/vitess_config.yaml b/test/cluster/keytar/config/vitess_config.yaml
index 7402ee0903c..f8fafba7f62 100644
--- a/test/cluster/keytar/config/vitess_config.yaml
+++ b/test/cluster/keytar/config/vitess_config.yaml
@@ -3,8 +3,8 @@ install:
     - python-mysqldb
   extra:
     - apt-get update
-    - wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.8.linux-amd64.tar.gz
+    - wget https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.9.linux-amd64.tar.gz
     - wget https://storage.googleapis.com/kubernetes-helm/helm-v2.1.3-linux-amd64.tar.gz
     - tar -zxvf helm-v2.1.3-linux-amd64.tar.gz
     - pip install numpy
diff --git a/test/config.json b/test/config.json
index b5173941c8c..f7154d093e8 100644
--- a/test/config.json
+++ b/test/config.json
@@ -1,24 +1,6 @@
 
 {
 	"Tests": {
-		"automation_horizontal_resharding": {
-			"File": "automation_horizontal_resharding.py",
-			"Args": [],
-			"Command": [],
-			"Manual": false,
-			"Shard": 4,
-			"RetryMax": 0,
-			"Tags": []
-		},
-		"automation_vertical_split": {
-			"File": "automation_vertical_split.py",
-			"Args": [],
-			"Command": [],
-			"Manual": false,
-			"Shard": 3,
-			"RetryMax": 0,
-			"Tags": []
-		},
 		"backup": {
 			"File": "backup.py",
 			"Args": [],
@@ -371,7 +353,7 @@
 				"make",
 				"unit_test_race"
 			],
-			"Manual": false,
+			"Manual": true,
 			"Shard": 0,
 			"RetryMax": 0,
 			"Tags": []
diff --git a/test/environment.py b/test/environment.py
index 2e4e843aa8e..86c12f0b0b5 100644
--- a/test/environment.py
+++ b/test/environment.py
@@ -96,6 +96,10 @@
 # url to hit to force the logs to flush.
 flush_logs_url = '/debug/flushlogs'
 
+# set the maximum size for grpc messages to be 5MB (larger than the default of
+# 4MB).
+grpc_max_message_size = 5 * 1024 * 1024
+
 
 def setup():
   try:
@@ -250,3 +254,12 @@ def create_webdriver():
     driver.set_window_position(0, 0)
     driver.set_window_size(1280, 1024)
   return driver
+
+
+def set_log_level(verbose):
+  level = logging.DEBUG
+  if verbose == 0:
+    level = logging.WARNING
+  elif verbose == 1:
+    level = logging.INFO
+  logging.getLogger().setLevel(level)
diff --git a/test/messaging.py b/test/messaging.py
index 62e69e91c56..37dfb0bd6f9 100755
--- a/test/messaging.py
+++ b/test/messaging.py
@@ -17,6 +17,7 @@
 
 
 import logging
+import time
 import unittest
 
 import environment
@@ -29,6 +30,7 @@
 
 
 shard_0_master = None
+shard_0_replica = None
 shard_1_master = None
 lookup_master = None
 
@@ -95,6 +97,7 @@
 def setUpModule():
   global keyspace_env
   global shard_0_master
+  global shard_0_replica
   global shard_1_master
   global lookup_master
   logging.debug('in setUpModule')
@@ -117,13 +120,15 @@ def setUpModule():
             ],
         )
     shard_0_master = keyspace_env.tablet_map['user.-80.master']
+    shard_0_replica = keyspace_env.tablet_map['user.-80.replica.0']
     shard_1_master = keyspace_env.tablet_map['user.80-.master']
     lookup_master = keyspace_env.tablet_map['lookup.0.master']
 
     utils.apply_vschema(vschema)
     utils.VtGate().start(
-        tablets=[shard_0_master, shard_1_master, lookup_master])
+        tablets=[shard_0_master, shard_0_replica, shard_1_master, lookup_master])
     utils.vtgate.wait_for_endpoints('user.-80.master', 1)
+    utils.vtgate.wait_for_endpoints('user.-80.replica', 1)
     utils.vtgate.wait_for_endpoints('user.80-.master', 1)
     utils.vtgate.wait_for_endpoints('lookup.0.master', 1)
   except:
@@ -155,6 +160,11 @@ def get_connection(timeout=15.0):
     raise
 
 
+def get_client_count(tablet):
+    debugvars = utils.get_vars(tablet.port)
+    return debugvars['Messages'].get('sharded_message.ClientCount', 0)
+
+
 class TestMessaging(unittest.TestCase):
 
   def test_sharded(self):
@@ -207,6 +217,98 @@ def _test_messaging(self, name, keyspace):
     # Only one should be acked.
     count = vtgate_conn.message_ack(name, [1, 4])
     self.assertEqual(count, 1)
+    it.close()
+
+  def test_connections(self):
+    name = 'sharded_message'
+    keyspace = 'user'
+
+    self.assertEqual(get_client_count(shard_0_master), 0)
+    self.assertEqual(get_client_count(shard_1_master), 0)
+
+    vtgate_conn1 = get_connection()
+    (it1, fields1) = vtgate_conn1.message_stream(keyspace, name)
+    self.assertEqual(get_client_count(shard_0_master), 1)
+    self.assertEqual(get_client_count(shard_1_master), 1)
+
+    vtgate_conn2 = get_connection()
+    (it2, fields2) = vtgate_conn2.message_stream(keyspace, name)
+    self.assertEqual(get_client_count(shard_0_master), 2)
+    self.assertEqual(get_client_count(shard_1_master), 2)
+
+    cursor = vtgate_conn1.cursor(
+        tablet_type='master', keyspace=None, writable=True)
+    query = 'insert into %s(id, message) values(:id, :message)'%(name)
+    cursor.begin()
+    cursor.execute(query, {'id': 2, 'message': 'hello world 2'})
+    cursor.execute(query, {'id': 5, 'message': 'hello world 5'})
+    cursor.commit()
+
+    # Each connection should get one message.
+    it1.next()
+    it2.next()
+
+    # Ack the messages.
+    count = vtgate_conn1.message_ack(name, [2, 5])
+
+    # After closing one stream, ensure vttablets have dropped it.
+    it1.close()
+    time.sleep(1)
+    self.assertEqual(get_client_count(shard_0_master), 1)
+    self.assertEqual(get_client_count(shard_1_master), 1)
+
+    it2.close()
+
+  def test_reparent(self):
+    name = 'sharded_message'
+    keyspace = 'user'
+
+    # Start a stream. Use a timeout that's greater than how long
+    # the test will take to run.
+    vtgate_conn = get_connection(120)
+    (it, fields) = vtgate_conn.message_stream(keyspace, name)
+    self.assertEqual(get_client_count(shard_0_master), 1)
+    self.assertEqual(get_client_count(shard_0_replica), 0)
+    self.assertEqual(get_client_count(shard_1_master), 1)
+
+    # Perform a graceful reparent to the replica.
+    utils.run_vtctl(['PlannedReparentShard',
+                     '-keyspace_shard', 'user/-80',
+                     '-new_master', shard_0_replica.tablet_alias], auto_log=True)
+    utils.validate_topology()
+
+    # Verify connection has migrated.
+    # The wait must be at least 6s which is how long vtgate will
+    # wait before retrying: that is 30s/5 where 30s is the default
+    # message_stream_grace_period.
+    time.sleep(10)
+    self.assertEqual(get_client_count(shard_0_master), 0)
+    self.assertEqual(get_client_count(shard_0_replica), 1)
+    self.assertEqual(get_client_count(shard_1_master), 1)
+
+    cursor = vtgate_conn.cursor(
+        tablet_type='master', keyspace=None, writable=True)
+    query = 'insert into %s(id, message) values(:id, :message)'%(name)
+    cursor.begin()
+    cursor.execute(query, {'id': 3, 'message': 'hello world 3'})
+    cursor.commit()
+
+    # Receive the message.
+    it.next()
+
+    # Reparent back to old master.
+    utils.run_vtctl(['PlannedReparentShard',
+                     '-keyspace_shard', 'user/-80',
+                     '-new_master', shard_0_master.tablet_alias], auto_log=True)
+    utils.validate_topology()
+
+    time.sleep(10)
+    self.assertEqual(get_client_count(shard_0_master), 1)
+    self.assertEqual(get_client_count(shard_0_replica), 0)
+    self.assertEqual(get_client_count(shard_1_master), 1)
+
+    # Ack the message.
+    count = vtgate_conn.message_ack(name, [3])
 
 
 if __name__ == '__main__':
diff --git a/test/mysql_server_test.py b/test/mysql_server_test.py
index 2620ce00825..0d986c128d5 100755
--- a/test/mysql_server_test.py
+++ b/test/mysql_server_test.py
@@ -89,6 +89,7 @@ def tearDownModule():
 id bigint auto_increment,
 msg varchar(64),
 keyspace_id bigint(20) unsigned NOT NULL,
+data longblob,
 primary key (id)
 ) Engine=InnoDB'''
 
@@ -152,6 +153,37 @@ def test_mysql_connector(self):
     conn = MySQLdb.Connect(**params)
     cursor = conn.cursor()
     cursor.execute('select * from vt_insert_test', {})
+    cursor.close()
+
+    # verify that queries work end-to-end with large grpc messages
+    largeComment = 'L' * ((4 * 1024 * 1024) + 1)
+    cursor = conn.cursor()
+    cursor.execute('insert into vt_insert_test (id, msg, keyspace_id, data) values(%s, %s, %s, %s) /* %s */',
+        (1, 'large blob', 123, 'LLL', largeComment))
+    cursor.close()
+
+    cursor = conn.cursor()
+    cursor.execute('select * from vt_insert_test where id = 1');
+    if cursor.rowcount != 1:
+        self.fail('expected 1 row got ' + str(cursor.rowcount))
+
+    for (id, msg, keyspace_id, blob) in cursor:
+        if blob != 'LLL':
+            self.fail('blob did not match \'LLL\'')
+
+    cursor.close()
+
+    hugeBlob = 'L' * (environment.grpc_max_message_size + 1)
+
+    cursor = conn.cursor()
+    try:
+        cursor.execute('insert into vt_insert_test (id, msg, keyspace_id, data) values(%s, %s, %s, %s)',
+            (2, 'huge blob', 123, hugeBlob))
+        self.fail('Execute went through')
+    except MySQLdb.OperationalError, e:
+      s = str(e)
+      self.assertIn('trying to send message larger than max', s)
+
     conn.close()
 
     # 'vtgate client 2' is not authorized to access vt_insert_test
@@ -168,6 +200,5 @@ def test_mysql_connector(self):
       self.assertIn('cannot run PASS_SELECT on table', s)
     conn.close()
 
-
 if __name__ == '__main__':
   utils.main()
diff --git a/test/tablet.py b/test/tablet.py
index eda33cce937..71eab7bfe32 100644
--- a/test/tablet.py
+++ b/test/tablet.py
@@ -596,6 +596,7 @@ def start_vttablet(
       args.extend(['-service_map', ','.join(protocols_flavor().service_map())])
     if self.grpc_enabled():
       args.extend(['-grpc_port', str(self.grpc_port)])
+      args.extend(['-grpc_max_message_size', str(environment.grpc_max_message_size)])
     if lameduck_period:
       args.extend(environment.lameduck_flag(lameduck_period))
     if grace_period:
diff --git a/test/utils.py b/test/utils.py
index 5fbf291867f..9a3909813a9 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
 # Copyright 2017 Google Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -142,7 +142,7 @@ def main(mod=None, test_options=None):
     test_options(parser)
   (options, args) = parser.parse_args()
 
-  set_log_level(options.verbose)
+  environment.set_log_level(options.verbose)
   logging.basicConfig(
       format='-- %(asctime)s %(module)s:%(lineno)d %(levelname)s %(message)s')
 
@@ -586,6 +586,8 @@ def start(self, cell='test_nj', retry_count=2,
 
     if protocols_flavor().vtgate_protocol() == 'grpc':
       args.extend(['-grpc_port', str(self.grpc_port)])
+      args.extend(['-grpc_max_message_size',
+                   str(environment.grpc_max_message_size)])
     if protocols_flavor().service_map():
       args.extend(['-service_map', ','.join(protocols_flavor().service_map())])
     if topo_impl:
@@ -969,15 +971,6 @@ def get_log_level():
     return '2'
 
 
-def set_log_level(verbose):
-  level = logging.DEBUG
-  if verbose == 0:
-    level = logging.WARNING
-  elif verbose == 1:
-    level = logging.INFO
-  logging.getLogger().setLevel(level)
-
-
 # vtworker helpers
 def run_vtworker(clargs, auto_log=False, expect_fail=False, **kwargs):
   """Runs a vtworker process, returning the stdout and stderr."""
diff --git a/tools/pylint.sh b/tools/pylint.sh
index d8da2bc24f4..ec86c36d535 100755
--- a/tools/pylint.sh
+++ b/tools/pylint.sh
@@ -18,7 +18,7 @@
 # It's used by the pre-commit hook, but is a separate script
 # so you can run it manually too.
 
-PYLINT=/usr/bin/gpylint
+PYLINT=${PYLINT:-/usr/bin/gpylint}
 
 file=$1
 
diff --git a/travis/download_mariadb.sh b/travis/download_mariadb.sh
deleted file mode 100755
index 997e72b4796..00000000000
--- a/travis/download_mariadb.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 Google Inc.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-set -e
-
-# Download and extract MariaDB 10.0 packages.
-
-# As of 07/2015, this mirror is the fastest for the Travis CI workers.
-DEB_PACKAGES="
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mysql-common_10.0.31+maria-1~precise_all.deb
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-common_10.0.31+maria-1~precise_all.deb
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/libmysqlclient18_10.0.31+maria-1~precise_amd64.deb
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/libmariadbclient18_10.0.31+maria-1~precise_amd64.deb
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/libmariadbclient-dev_10.0.31+maria-1~precise_amd64.deb
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-client-core-10.0_10.0.31+maria-1~precise_amd64.deb
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-client-10.0_10.0.31+maria-1~precise_amd64.deb
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-server-core-10.0_10.0.31+maria-1~precise_amd64.deb
-http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-server-10.0_10.0.31+maria-1~precise_amd64.deb
-"
-
-mkdir -p $MYSQL_ROOT
-if [ -d "$MYSQL_ROOT/usr" ]; then
-  echo "skipping downloading and extracting MariaDB packages because it seems they have been cached by Travis CI."
-  echo "Delete the cache through the Travis CI Settings page on the webinterface if you want to enforce this step."
-  exit 0
-fi
-
-for deb in $DEB_PACKAGES; do
-  wget $deb
-done
-
-for deb in *.deb; do
-  dpkg -x $deb $MYSQL_ROOT
-done
-
-# Uncomment to debug any issues and inspect which files are available.
-# ls -alR $MYSQL_ROOT
diff --git a/travis/install_grpc.sh b/travis/install_grpc.sh
index e54def5d4f8..3eb2d853b28 100755
--- a/travis/install_grpc.sh
+++ b/travis/install_grpc.sh
@@ -19,20 +19,19 @@
 # as root in the image.
 set -ex
 
-# Import prepend_path function.
-dir="$(dirname "${BASH_SOURCE[0]}")"
-source "${dir}/../tools/shell_functions.inc"
-if [ $? -ne 0 ]; then
-  echo "failed to load ../tools/shell_functions.inc"
-  return 1
-fi
-
 # grpc_dist can be empty, in which case we just install to the default paths
 grpc_dist="$1"
 if [ -n "$grpc_dist" ]; then
   cd $grpc_dist
 fi
 
+if [[ -z "$PIP" ]]; then
+  # PIP is not set i.e. dev.env was not loaded.
+  # We're probably doing a system-wide installation when building the Docker
+  # bootstrap image. Set the variable now.
+  PIP=pip
+fi
+
 # Python requires a very recent version of virtualenv.
 # We also require a recent version of pip, as we use it to
 # upgrade the other tools.
@@ -40,84 +39,17 @@ fi
 # https://github.com/pypa/setuptools/issues/945
 # (and setuptools is used by grpc install).
 if [ -n "$grpc_dist" ]; then
-  # Create a virtualenv, which also creates a virualenv-boxed pip.
+  # Non-system wide installation. Create a virtualenv, which also creates a
+  # virtualenv-boxed pip.
+
   # Update both pip and virtualenv.
   $VIRTUALENV -v $grpc_dist/usr/local
   PIP=$grpc_dist/usr/local/bin/pip
   $PIP install --upgrade pip
   $PIP install --upgrade --ignore-installed virtualenv
-else
-  PIP=pip
-  $PIP install --upgrade pip
-  # System wide installations require an explicit upgrade of
-  # certain gRPC Python dependencies e.g. "six" on Debian Jessie.
-  $PIP install --upgrade --ignore-installed six
-fi
-
-# clone the repository, setup the submodules
-git clone https://github.com/grpc/grpc.git
-cd grpc
-git checkout v1.0.0
-git submodule update --init
-
-# OSX specific setting + dependencies
-if [ `uname -s` == "Darwin" ]; then
-  export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-  $PIP install Cython
-
-  # Work-around macOS Sierra blocker, see: https://github.com/youtube/vitess/issues/2115
-  # TODO(mberlin): Remove this when the underlying issue is fixed and available
-  #                in the gRPC version used by Vitess.
-  #                See: https://github.com/google/protobuf/issues/2182
-  export CPPFLAGS="-Wno-deprecated-declarations"
-fi
-
-# build everything
-make
-
-# install protobuf side (it was already built by the 'make' earlier)
-cd third_party/protobuf
-if [ -n "$grpc_dist" ]; then
-  make install prefix=$grpc_dist/usr/local
-else
-  make install
-fi
-
-# now install grpc itself
-cd ../..
-if [ -n "$grpc_dist" ]; then
-  make install prefix=$grpc_dist/usr/local
-
-  # Add bin directory to the path such that gRPC python won't complain that
-  # it cannot find "grpc_python_plugin".
-  export PATH=$(prepend_path $PATH $grpc_dist/usr/local/bin)
-else
-  make install
 fi
 
 # Install gRPC python libraries from PyPI.
 # Dependencies like protobuf python will be installed automatically.
-grpcio_ver=1.0.4
+grpcio_ver=1.6.0
 $PIP install --upgrade grpcio==$grpcio_ver
-
-# Build PHP extension, only if requested.
-if [ -n "$INSTALL_GRPC_PHP" ]; then
-  echo "Building gRPC PHP extension..."
-  cd src/php/ext/grpc
-  if [[ "$TRAVIS" == "true" ]]; then
-    # On Travis, we get an old glibc version that doesn't yet
-    # have clock_*() functions built in, so we need -lrt.
-    # Temporarily turn off --as-needed because the lib doesn't
-    # request rt, since it assumes a newer glibc.
-    export LDFLAGS="-Wl,--no-as-needed -lrt -Wl,--as-needed"
-  fi
-  phpize
-  if ! ./configure --enable-grpc=$grpc_dist/usr/local; then
-    cat config.log
-    echo "Failed to configure build for gRPC PHP extension."
-    exit 1
-  fi
-  make
-  mkdir -p $INSTALL_GRPC_PHP
-  mv modules/grpc.so $INSTALL_GRPC_PHP
-fi
diff --git a/travis/php_init.sh b/travis/php_init.sh
deleted file mode 100755
index 7c8762af8f7..00000000000
--- a/travis/php_init.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 Google Inc.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-version=5.5.9
-
-set -e
-
-if [ -f $HOME/.phpenv/bin/phpenv ]; then
-  echo "Using cached phpenv"
-else
-  curl -s https://raw.githubusercontent.com/CHH/phpenv/master/bin/phpenv-install.sh | bash
-  git clone git://github.com/michael-berlin/php-build.git $HOME/.phpenv/plugins/php-build
-fi
-
-eval "$(phpenv init -)"
-
-if [ -d $HOME/.phpenv/versions/$version ]; then
-  echo "Using cached php"
-else
-  PHP_BUILD_CONFIGURE_OPTS="--without-xmlrpc --without-xsl --without-curl --without-gd --without-mcrypt --without-readline --disable-soap --without-tidy" phpenv install $version
-fi
-
-phpenv global $version
-phpenv rehash
-
-# gRPC plugin will be placed by install_grpc.sh
-echo "extension=$HOME/.phpenv/lib/grpc.so" > ~/.phpenv/versions/$(phpenv global)/etc/conf.d/grpc.ini
-
-if [ -f $HOME/.phpenv/bin/phpunit ]; then
-  echo "Using cached phpunit"
-else
-  curl -sL https://phar.phpunit.de/phpunit-4.8.9.phar > $HOME/.phpenv/bin/phpunit
-  chmod +x $HOME/.phpenv/bin/phpunit
-fi
-
-# If you need to trigger a re-download,
-# increment this value.
-ver=1
-ver_file=$HOME/.phpenv/bin/composer.ver
-if [[ -f $ver_file && "$(cat $ver_file)" == "$ver" ]]; then
-  echo "Using cached composer"
-else
-  rm -f $HOME/.phpenv/bin/composer
-  curl -sS https://getcomposer.org/installer | php -- --install-dir=$HOME/.phpenv/bin/ --filename=composer
-  echo "$ver" > $ver_file
-fi
-
-# composer install should be run in every travis build
-cd $HOME/gopath/src/github.com/youtube/vitess
-composer install
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 3e106727c38..f7f3c243294 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -341,10 +341,12 @@
 			"revisionTime": "2016-01-25T20:49:56Z"
 		},
 		{
-			"checksumSHA1": "JSHl8b3nI8EWvzm+uyrIqj2Hiu4=",
+			"checksumSHA1": "M3BUApw7nNipzKvYbHSpxqE04FY=",
 			"path": "github.com/golang/mock/gomock",
-			"revision": "bd3c8e81be01eef76d4b503f5e687d2d1354d2d9",
-			"revisionTime": "2016-01-21T18:51:14Z"
+			"revision": "13f360950a79f5864a972c786a10a50e44b69541",
+			"revisionTime": "2017-07-22T14:45:13Z",
+			"version": "v1.0.0",
+			"versionExact": "v1.0.0"
 		},
 		{
 			"checksumSHA1": "ks9nCA68MefWDMUIjIF/zJwpTuw=",
@@ -975,106 +977,164 @@
 			"revisionTime": "2017-05-31T20:35:52Z"
 		},
 		{
-			"checksumSHA1": "zoNC4xFysyYBRILPrhcULrVDP+U=",
+			"checksumSHA1": "SMXFUf293CEiLOAmKk7ku1bSCeo=",
 			"path": "google.golang.org/grpc",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
+		},
+		{
+			"checksumSHA1": "AS14kO6FrzuQ/8wP+a/n55SNW6U=",
+			"path": "google.golang.org/grpc/balancer",
+			"revision": "067cb1fcbf74396966d96d4727b43ca880e9581a",
+			"revisionTime": "2017-09-07T16:57:31Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "Dkjgw1HasWvqct0IuiZdjbD7O0c=",
 			"path": "google.golang.org/grpc/codes",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "XH2WYcDNwVO47zYShREJjcYXm0Y=",
 			"path": "google.golang.org/grpc/connectivity",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "5ylThBvJnIcyWhL17AC9+Sdbw2E=",
 			"path": "google.golang.org/grpc/credentials",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "TTx8t1Cvkp0nz2burZz6BN4fIeY=",
 			"path": "google.golang.org/grpc/credentials/oauth",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
-			"checksumSHA1": "OvYpodREHfhAVizxPNnx4Wh3Yqw=",
+			"checksumSHA1": "XbDzI4GeUt2/8WAS5mLKm5ghVWo=",
 			"path": "google.golang.org/grpc/grpclb/grpc_lb_v1",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
+		},
+		{
+			"checksumSHA1": "WxP3QV0Y4fIx5NsT0dwBp6JsrJE=",
+			"path": "google.golang.org/grpc/grpclb/grpc_lb_v1/messages",
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "taQS6p0HLyrMJZc0hvxPLrcBTVI=",
 			"path": "google.golang.org/grpc/grpclb/messages_only/grpc_lb_v1",
 			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revisionTime": "2017-08-23T20:45:01Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "ntHev01vgZgeIh5VFRmbLx/BSTo=",
 			"path": "google.golang.org/grpc/grpclog",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "U9vDe05/tQrvFBojOQX8Xk12W9I=",
 			"path": "google.golang.org/grpc/internal",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "hcuHgKp8W0wIzoCnNfKI8NUss5o=",
 			"path": "google.golang.org/grpc/keepalive",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
-			"checksumSHA1": "h6S0QC4uAtF11dTpGeuUkTx9aQo=",
+			"checksumSHA1": "KeUmTZV+2X46C49cKyjp+xM7fvw=",
 			"path": "google.golang.org/grpc/metadata",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "dgwdT20kXe4ZbXBOFbTwVQt8rmA=",
 			"path": "google.golang.org/grpc/naming",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "n5EgDdBqFMa2KQFhtl+FF/4gIFo=",
 			"path": "google.golang.org/grpc/peer",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
-			"checksumSHA1": "WdY487BYWJOOoLdJk42M/ZOBSDY=",
+			"checksumSHA1": "bJJaQUbZqEpTlnXTXgGwOZWijs4=",
+			"path": "google.golang.org/grpc/resolver",
+			"revision": "067cb1fcbf74396966d96d4727b43ca880e9581a",
+			"revisionTime": "2017-09-07T16:57:31Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
+		},
+		{
+			"checksumSHA1": "mN8hVA1AgNCqERfkX/4l/EM6srY=",
 			"path": "google.golang.org/grpc/stats",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "3Dwz4RLstDHMPyDA7BUsYe+JP4w=",
 			"path": "google.golang.org/grpc/status",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "qvArRhlrww5WvRmbyMF2mUfbJew=",
 			"path": "google.golang.org/grpc/tap",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
-			"checksumSHA1": "dERr7A9chxd+AUu0zV6gSr9b/64=",
+			"checksumSHA1": "eaAukoLg7xWreNDm68Vs3dVc4UY=",
 			"path": "google.golang.org/grpc/transport",
-			"revision": "9b6ac7ddb739a2bdfe5692fc29284db555756acd",
-			"revisionTime": "2017-08-23T20:45:01Z"
+			"revision": "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3",
+			"revisionTime": "2017-08-30T18:24:17Z",
+			"version": "v1.6.0",
+			"versionExact": "v1.6.0"
 		},
 		{
 			"checksumSHA1": "wSu8owMAP7GixsYoSZ4CmKUVhnU=",
diff --git a/vitess.io/.gitignore b/vitess.io/.gitignore
index 28b75e5ca54..6a6dc3de324 100644
--- a/vitess.io/.gitignore
+++ b/vitess.io/.gitignore
@@ -1,2 +1 @@
-/Gemfile.lock
 /.sass-cache/
diff --git a/vitess.io/Gemfile b/vitess.io/Gemfile
index 00b5556ad58..0f1b0be1a6e 100644
--- a/vitess.io/Gemfile
+++ b/vitess.io/Gemfile
@@ -1,6 +1,9 @@
+# Note: When you change this file and run "bundle install", the Gemfile.lock
+# file will be changed as well. Please always commit both files and do not
+# ignore the changes in the .lock file.
 source "https://rubygems.org"
 
-gem 'jekyll', '2.4.0'
+gem 'jekyll', '3.5.2'
 gem 'jekyll-coffeescript', '1.0.1'
 gem 'jekyll-sass-converter', '1.3.0'
 gem 'kramdown', '1.5.0'
@@ -8,13 +11,17 @@ gem 'maruku', '0.7.0'
 gem 'rdiscount', '2.1.7'
 gem 'redcarpet', '3.3.2'
 gem 'RedCloth', '4.2.9'
-gem 'liquid', '2.6.2'
+gem 'liquid', '4.0.0'
 gem 'pygments.rb', '0.6.3'
 gem 'jemoji', '0.5.0'
-gem 'jekyll-mentions', '0.2.1'
-gem 'jekyll-redirect-from', '0.8.0'
-gem 'jekyll-sitemap', '0.8.1'
+# Note that we cannot use 0.12.1 because it does not have the bugfix
+# https://github.com/jekyll/jekyll-redirect-from/pull/142. Instead,
+# we use a version which is not affected by issue
+# https://github.com/jekyll/jekyll-redirect-from/issues/139.
+gem 'jekyll-redirect-from', '0.11.0'
+gem 'jekyll-sitemap', '1.1.1'
 gem 'jekyll-feed', '0.3.1'
+gem 'jekyll-seo-tag', '2.3.0'
 
 gem 'bourbon'
 gem 'neat'
diff --git a/vitess.io/Gemfile.lock b/vitess.io/Gemfile.lock
new file mode 100644
index 00000000000..7d09a26aee7
--- /dev/null
+++ b/vitess.io/Gemfile.lock
@@ -0,0 +1,119 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.2.9)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    bourbon (4.3.4)
+      sass (~> 3.4)
+      thor (~> 0.19)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    colorator (1.1.0)
+    concurrent-ruby (1.0.5)
+    execjs (2.7.0)
+    ffi (1.9.18)
+    forwardable-extended (2.6.0)
+    gemoji (2.1.0)
+    html-pipeline (1.11.0)
+      activesupport (>= 2)
+      nokogiri (~> 1.4)
+    i18n (0.8.6)
+    jekyll (3.5.2)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-feed (0.3.1)
+    jekyll-redirect-from (0.11.0)
+      jekyll (>= 2.0)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-seo-tag (2.3.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (1.1.1)
+      jekyll (~> 3.3)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    jemoji (0.5.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 1.9)
+      jekyll (>= 2.0)
+    kramdown (1.5.0)
+    liquid (4.0.0)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    maruku (0.7.0)
+    mercenary (0.3.6)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    neat (2.1.0)
+      sass (~> 3.4)
+      thor (~> 0.19)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    posix-spawn (0.3.13)
+    public_suffix (3.0.0)
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rdiscount (2.1.7)
+    redcarpet (3.3.2)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    yajl-ruby (1.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth (= 4.2.9)
+  bourbon
+  jekyll (= 3.5.2)
+  jekyll-coffeescript (= 1.0.1)
+  jekyll-feed (= 0.3.1)
+  jekyll-redirect-from (= 0.11.0)
+  jekyll-sass-converter (= 1.3.0)
+  jekyll-seo-tag (= 2.3.0)
+  jekyll-sitemap (= 1.1.1)
+  jemoji (= 0.5.0)
+  kramdown (= 1.5.0)
+  liquid (= 4.0.0)
+  maruku (= 0.7.0)
+  neat
+  pygments.rb (= 0.6.3)
+  rdiscount (= 2.1.7)
+  redcarpet (= 3.3.2)
+
+BUNDLED WITH
+   1.15.4
diff --git a/vitess.io/_config.yml b/vitess.io/_config.yml
index a0a77978fd3..39eaff1cac0 100644
--- a/vitess.io/_config.yml
+++ b/vitess.io/_config.yml
@@ -14,10 +14,12 @@ repo: https://github.com/youtube/vitess
 sass:
   sass_dir: _sass
   style: compressed
-permalink: /:categories/:title/
+permalink: pretty
 highlighter: pygments
-gems:
+plugins:
   - jekyll-sitemap
+  - jekyll-redirect-from
+  - jekyll-seo-tag
 
 markdown: redcarpet
 
@@ -39,3 +41,4 @@ owner:
 
 
 exclude: ["config.rb", ".sass-cache", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "*.sublime-project", "*.sublime-workspace", "Gemfile", "Gemfile.lock", "README.md", "LICENSE", "node_modules", "Gruntfile.js", "package.json", "preview-site.sh", "publish-site.sh"]
+
diff --git a/vitess.io/_config_dev.yml b/vitess.io/_config_dev.yml
index bccfc951123..480b1d19bf4 100644
--- a/vitess.io/_config_dev.yml
+++ b/vitess.io/_config_dev.yml
@@ -14,10 +14,12 @@ repo: https://github.com/youtube/vitess
 sass:
   sass_dir: _sass
   style: compressed
-permalink: /:categories/:title/
+permalink: pretty
 highlighter: pygments
-gems:
+plugins:
   - jekyll-sitemap
+  - jekyll-redirect-from
+  - jekyll-seo-tag
 
 markdown: redcarpet
 
@@ -36,3 +38,7 @@ owner:
 
 
 exclude: ["config.rb", ".sass-cache", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "*.sublime-project", "*.sublime-workspace", "Gemfile", "Gemfile.lock", "README.md", "LICENSE", "node_modules", "Gruntfile.js", "package.json", "preview-site.sh", "publish-site.sh"]
+
+# Open up "jekyll serve" because the requests via the Docker forwarding are not
+# treated as incoming from "localhost".
+host: 0.0.0.0
diff --git a/vitess.io/_data/nav.yml b/vitess.io/_data/nav.yml
index 3f7ed67b0c2..a1d0fe5dec8 100644
--- a/vitess.io/_data/nav.yml
+++ b/vitess.io/_data/nav.yml
@@ -15,6 +15,8 @@
 #  excerpt: "Download the code from GitHub."
 #  image: 400x250.gif
 
+# TODO(mberlin): Check if we can remove this.
+
 - path: /
 - path: overview/
   title: Guides
diff --git a/vitess.io/_includes/left-nav-menu.html b/vitess.io/_includes/left-nav-menu.html
index 2011ca1778f..4f5475d84f4 100644
--- a/vitess.io/_includes/left-nav-menu.html
+++ b/vitess.io/_includes/left-nav-menu.html
@@ -1,95 +1,95 @@
         <li class="submenu">
           <h4 class="arrow-r no-top-margin">Overview</h4>
           <ul style="display: none">
-            <li><a href="/overview/">What is Vitess</a></li>
-            <li><a href="/overview/scaling-mysql.html">Scaling MySQL with Vitess</a></li>
-            <li><a href="/overview/concepts.html">Key Concepts</a></li>
+            <li><a href="{% link overview/index.md %}">What is Vitess</a></li>
+            <li><a href="{% link overview/scaling-mysql.md %}">Scaling MySQL with Vitess</a></li>
+            <li><a href="{% link overview/concepts.md %}">Key Concepts</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Getting Started</h4>
           <ul style="display: none">
-            <li style="padding-bottom: 0"><a href="/getting-started/">Run Vitess on Kubernetes</a>
+            <li style="padding-bottom: 0"><a href="{% link getting-started/index.md %}">Run Vitess on Kubernetes</a>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/getting-started/docker-build.html">Custom Docker Build</a></li>
+                <li style="padding-bottom: 0"><a href="{% link getting-started/docker-build.md %}">Custom Docker Build</a></li>
               </ul>
             </li>
-            <li><a href="/getting-started/local-instance.html">Run Vitess Locally</a></li>
+            <li><a href="{% link getting-started/local-instance.md %}">Run Vitess Locally</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">User Guide</h4>
           <ul style="display: none">
-            <li><a href="/user-guide/introduction.html">Introduction</a>
-            <li><a href="/user-guide/client-libraries.html">Client Libraries</a>
-            <li><a href="/user-guide/backup-and-restore.html">Backing Up Data</a>
-            <li><a href="/user-guide/reparenting.html">Reparenting</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/schema-management.html">Schema Management</a></li>
+            <li><a href="{% link user-guide/introduction.md %}">Introduction</a>
+            <li><a href="{% link user-guide/client-libraries.md %}">Client Libraries</a>
+            <li><a href="{% link user-guide/backup-and-restore.md %}">Backing Up Data</a>
+            <li><a href="{% link user-guide/reparenting.md %}">Reparenting</a></li>
+            <li style="padding-bottom: 0"><a href="{% link user-guide/schema-management.md %}">Schema Management</a></li>
               <ul style="display: block">
-                <li style="padding-bottom: 0"><a href="/user-guide/vschema.html">VSchema Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/schema-swap.html">Schema Swap (Tutorial)</a></li>
+                <li style="padding-bottom: 0"><a href="{% link user-guide/vschema.md %}">VSchema Guide</a></li>
+                <li style="padding-bottom: 0"><a href="{% link user-guide/schema-swap.md %}">Schema Swap (Tutorial)</a></li>
               </ul>
-            <li style="padding-bottom: 0"><a href="/user-guide/sharding.html">Sharding</a>
+            <li style="padding-bottom: 0"><a href="{% link user-guide/sharding.md %}">Sharding</a>
               <ul style="display: block">
-                <li><a href="/user-guide/horizontal-sharding-workflow.html">Horizontal Sharding (Tutorial, automated)</a></li>
-                <li><a href="/user-guide/horizontal-sharding.html">Horizontal Sharding (Tutorial, manual)</a></li>
-                <li><a href="/user-guide/sharding-kubernetes-workflow.html">Sharding in Kubernetes (Tutorial, automated)</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/sharding-kubernetes.html">Sharding in Kubernetes (Tutorial, manual)</a></li>
+                <li><a href="{% link user-guide/horizontal-sharding-workflow.md %}">Horizontal Sharding (Tutorial, automated)</a></li>
+                <li><a href="{% link user-guide/horizontal-sharding.md %}">Horizontal Sharding (Tutorial, manual)</a></li>
+                <li><a href="{% link user-guide/sharding-kubernetes-workflow.md %}">Sharding in Kubernetes (Tutorial, automated)</a></li>
+                <li style="padding-bottom: 0"><a href="{% link user-guide/sharding-kubernetes.md %}">Sharding in Kubernetes (Tutorial, manual)</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/vitess-sequences.html">Vitess Sequences</a></li>
-            <li><a href="/user-guide/mysql-server-protocol.html">MySQL Server Protocol</a></li>
-            <li><a href="/user-guide/vitess-replication.html">Vitess and Replication</a></li>
-            <li><a href="/user-guide/update-stream.html">Update Stream</a></li>
-            <li><a href="/user-guide/row-based-replication.html">Row Based Replication</a></li>
-            <li><a href="/user-guide/topology-service.html">Topology Service</a></li>
-            <li><a href="/user-guide/transport-security-model.html">Transport Security Model</a></li>
-            <li style="padding-bottom: 0"><a href="/user-guide/launching.html">Launching</a>
+            <li><a href="{% link user-guide/vitess-sequences.md %}">Vitess Sequences</a></li>
+            <li><a href="{% link user-guide/mysql-server-protocol.md %}">MySQL Server Protocol</a></li>
+            <li><a href="{% link user-guide/vitess-replication.md %}">Vitess and Replication</a></li>
+            <li><a href="{% link user-guide/update-stream.md %}">Update Stream</a></li>
+            <li><a href="{% link user-guide/row-based-replication.md %}">Row Based Replication</a></li>
+            <li><a href="{% link user-guide/topology-service.md %}">Topology Service</a></li>
+            <li><a href="{% link user-guide/transport-security-model.md %}">Transport Security Model</a></li>
+            <li style="padding-bottom: 0"><a href="{% link user-guide/launching.md %}">Launching</a>
               <ul style="display: block">
-                <li><a href="/user-guide/scalability-philosophy.html">Scalability Philosophy</a></li>
-                <li><a href="/user-guide/production-planning.html">Production Planning</a></li>
-                <li><a href="/user-guide/server-configuration.html">Server Configuration</a></li>
-                <li><a href="/user-guide/twopc.html">2PC Guide</a></li>
-                <li style="padding-bottom: 0"><a href="/user-guide/troubleshooting.html">Troubleshooting</a></li>
+                <li><a href="{% link user-guide/scalability-philosophy.md %}">Scalability Philosophy</a></li>
+                <li><a href="{% link user-guide/production-planning.md %}">Production Planning</a></li>
+                <li><a href="{% link user-guide/server-configuration.md %}">Server Configuration</a></li>
+                <li><a href="{% link user-guide/twopc.md %}">2PC Guide</a></li>
+                <li style="padding-bottom: 0"><a href="{% link user-guide/troubleshooting.md %}">Troubleshooting</a></li>
               </ul>
             </li>
-            <li><a href="/user-guide/upgrading.html">Upgrading</a></li>
+            <li><a href="{% link user-guide/upgrading.md %}">Upgrading</a></li>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Reference Guides</h4>
           <ul style="display: none">
-            <li><a href="/reference/vitess-api.html">Vitess API</a>
-            <li><a href="/reference/vtctl.html">vtctl Commands</a>
+            <li><a href="{% link reference/vitess-api.md %}">Vitess API</a>
+            <li><a href="{% link reference/vtctl.md %}">vtctl Commands</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Other Resources</h4>
           <ul style="display: none">
-            <li><a href="/resources/presentations.html">Presentations</a>
+            <li><a href="{% link resources/presentations.md %}">Presentations</a>
             <li><a href="http://blog.vitess.io/">Blog</a>
-            <li><a href="/resources/roadmap.html">Roadmap</a>
+            <li><a href="{% link resources/roadmap.md %}">Roadmap</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Contributing</h4>
           <ul style="display: none">
-            <li><a href="/contributing/">Contributing to Vitess</a>
-            <li><a href="/contributing/github-workflow.html">GitHub Workflow</a>
-            <li><a href="/contributing/code-reviews.html">Code Reviews</a>
+            <li><a href="{% link contributing/index.md %}">Contributing to Vitess</a>
+            <li><a href="{% link contributing/github-workflow.md %}">GitHub Workflow</a>
+            <li><a href="{% link contributing/code-reviews.md %}">Code Reviews</a>
           </ul>
         </li>
         <li class="submenu">
           <h4 class="arrow-r">Internal</h4>
           <ul style="display: none">
-            <li><a href="/internal/">Overview</a>
-            <li><a href="/internal/release-instructions.html">Release Instructions</a>
-            <li><a href="/internal/publish-website.html">Publish Website</a>
+            <li><a href="{% link internal/index.md %}">Overview</a>
+            <li><a href="{% link internal/release-instructions.md %}">Release Instructions</a>
+            <li><a href="{% link internal/publish-website.md %}">Publish Website</a>
           </ul>
         </li>
 
         <div>
-          <form method="get" action="/search/">
+          <form method="get" action="{% link search/index.md %}">
             <input id="search-form" name="q" type="text" placeholder="Search">
           </form>
         </div>
diff --git a/vitess.io/_includes/nav.html b/vitess.io/_includes/nav.html
index 416777a62ed..66b96401e3d 100644
--- a/vitess.io/_includes/nav.html
+++ b/vitess.io/_includes/nav.html
@@ -16,9 +16,9 @@
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right" id="standard-menu-links">
-        <li><a href="/overview/">Overview</a></li>
-        <li><a href="/user-guide/introduction.html">Guides</a></li>
-        <li><a href="/reference/vitess-api.html">Reference</a></li>
+        <li><a href="{% link overview/index.md %}">Overview</a></li>
+        <li><a href="{% link user-guide/introduction.md %}">Guides</a></li>
+        <li><a href="{% link reference/vitess-api.md %}">Reference</a></li>
         <li><a href="http://blog.vitess.io">Blog</a></li>
         <li><a href="https://github.com/youtube/vitess"><i class="fa fa-github"></i> GitHub</a></li>
         <!-- Hide link to blog unless we have actual posts -->
diff --git a/vitess.io/_layouts/base.liquid b/vitess.io/_layouts/base.liquid
index dc9340de4a9..3afa021cc72 100644
--- a/vitess.io/_layouts/base.liquid
+++ b/vitess.io/_layouts/base.liquid
@@ -4,22 +4,19 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ site.title }} / {{ page.title }}</title>
 
     {% include styles.liquid %}
 
-    <!-- metadata -->
-    <meta name="og:title" content="{{ site.title }} / {{page.title}}"/>
-    <meta name="og:image" content="{{ site.baseurl }}/images/{{ site.logo }}"/>
-    <meta name="og:description" content="{{ site.description }}"/>
-
     <link rel="icon" href="{{ site.baseurl }}/images/{{ site.icon }}" type="image/png">
 
     {% if site.analytics.id %}
     {% include analytics.liquid %}
     {% endif %}
+
+    <!-- Metadata *and* <title> Tag generated by SEO Plugin. -->
+    {% seo %}
   </head>
-  <body class="{{ page.bodyclass }}" id="top_of_page">
+  <body class="{{ layout.bodyclass }}" id="top_of_page">
 {% if page.tocDepth %}
     <span id="toc-depth" data-toc-depth="{{ page.tocDepth }}"></span>
 {% else %}
diff --git a/vitess.io/_layouts/home.liquid b/vitess.io/_layouts/home.liquid
index fa468038800..f4c2e7e93c1 100644
--- a/vitess.io/_layouts/home.liquid
+++ b/vitess.io/_layouts/home.liquid
@@ -10,7 +10,7 @@ layout: base
       <p>
         <a class="btn btn-default btn-lg" href="/getting-started/" role="button">
         <img src="/images/kubernetes.svg" style="width:30px;height:30px;margin-top:-5px"> Quickstart</a>
-        <a class="btn btn-default btn-lg" href="/getting-started/local-instance.html" role="button">Manual Build</a>
+        <a class="btn btn-default btn-lg" href="{% link getting-started/local-instance.md %}" role="button">Manual Build</a>
         <a class="btn btn-default btn-lg" href="/overview/" role="button">Learn More</a>
       </p>
     </div>
diff --git a/vitess.io/about/index.md b/vitess.io/about/index.md
deleted file mode 100644
index c8d2a35ae90..00000000000
--- a/vitess.io/about/index.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: article
-title: "About"
-excerpt:
-image:
-  feature:
-  teaser:
-  thumb:
-share: false
-ads: false
----
-
-This is a work in progress.
diff --git a/vitess.io/contributing/github-workflow.md b/vitess.io/contributing/github-workflow.md
index 48f5be968dc..984779cd17d 100644
--- a/vitess.io/contributing/github-workflow.md
+++ b/vitess.io/contributing/github-workflow.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "GitHub Workflow"
+redirect_from: contributing/github-workflow.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/css/site.scss b/vitess.io/css/site.scss
index 39efe8460d3..0d07efa878b 100644
--- a/vitess.io/css/site.scss
+++ b/vitess.io/css/site.scss
@@ -4,13 +4,15 @@
 @import url("https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.css");
 
 // Colors
-// We're using the Material "Indigo" palette: https://material.google.com/style/color.html#color-color-palette
-// Indigo 500
-$primaryBrandColor: #3F51B5;
-// Indigo 800
-$darkerBrandColor: #283593;
-// Indigo 50
-$lighterBrandColor: #E8EAF6;
+// We're using colors picked from images/vitess_logo.svg.
+// Using the brightness principles in https://material.google.com/style/color.html#color-color-palette.
+// Primary is a color of mid-range brighntess from the logo.
+$primaryBrandColor: #296589;
+// Darker is one of the darker colors from the logo.
+$darkerBrandColor: #183B4F;
+// The logo doesn't have a color light enough. So, we pick something similar from material design.
+// Cyan 50
+$lighterBrandColor: #E0F7FA;
 // Purple 800
 $accentColor: #6A1B9A;
 
@@ -304,6 +306,11 @@ aside.success, div.success, p.success {
   margin-top: 40px;
 }
 
+// User logos are centered and need the padding.
+.logo-row {
+  margin-top: 10px;
+  text-align: center;
+}
 
 // Table styles
 table {
diff --git a/vitess.io/getting-started/docker-build.md b/vitess.io/getting-started/docker-build.md
index 36275eb4400..92b25ec519c 100644
--- a/vitess.io/getting-started/docker-build.md
+++ b/vitess.io/getting-started/docker-build.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Custom Docker Build"
+redirect_from: /getting-started/docker-build.html
 description: Build a custom Docker image for Vitess.
 date: 
 modified:
diff --git a/vitess.io/getting-started/local-instance.md b/vitess.io/getting-started/local-instance.md
index 9f228d4d7f3..c9eee20c9ce 100644
--- a/vitess.io/getting-started/local-instance.md
+++ b/vitess.io/getting-started/local-instance.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Running Vitess on a Local Server"
+redirect_from: /getting-started/local-instance.html
 description: Learn how to build Vitess on a local server.
 date: 
 modified:
diff --git a/vitess.io/images/users/axon_logo.png b/vitess.io/images/users/axon_logo.png
new file mode 100644
index 00000000000..04bb390f64a
Binary files /dev/null and b/vitess.io/images/users/axon_logo.png differ
diff --git a/vitess.io/images/users/bettercloud_logo.png b/vitess.io/images/users/bettercloud_logo.png
new file mode 100644
index 00000000000..2c0bed7501a
Binary files /dev/null and b/vitess.io/images/users/bettercloud_logo.png differ
diff --git a/vitess.io/images/users/flipkart_logo.png b/vitess.io/images/users/flipkart_logo.png
new file mode 100644
index 00000000000..7047b8a52ee
Binary files /dev/null and b/vitess.io/images/users/flipkart_logo.png differ
diff --git a/vitess.io/images/users/hubspot_logo.png b/vitess.io/images/users/hubspot_logo.png
new file mode 100644
index 00000000000..7d9f9556f19
Binary files /dev/null and b/vitess.io/images/users/hubspot_logo.png differ
diff --git a/vitess.io/images/users/nozzle_logo.png b/vitess.io/images/users/nozzle_logo.png
new file mode 100644
index 00000000000..e3a5a731403
Binary files /dev/null and b/vitess.io/images/users/nozzle_logo.png differ
diff --git a/vitess.io/images/users/pixel_federation_logo.png b/vitess.io/images/users/pixel_federation_logo.png
new file mode 100644
index 00000000000..ff60a98fff4
Binary files /dev/null and b/vitess.io/images/users/pixel_federation_logo.png differ
diff --git a/vitess.io/images/users/quiz_of_kings_logo.jpg b/vitess.io/images/users/quiz_of_kings_logo.jpg
new file mode 100644
index 00000000000..aa4078c7ffb
Binary files /dev/null and b/vitess.io/images/users/quiz_of_kings_logo.jpg differ
diff --git a/vitess.io/images/users/slack_logo.png b/vitess.io/images/users/slack_logo.png
new file mode 100644
index 00000000000..90c8c17a41b
Binary files /dev/null and b/vitess.io/images/users/slack_logo.png differ
diff --git a/vitess.io/images/users/square_logo.png b/vitess.io/images/users/square_logo.png
new file mode 100644
index 00000000000..fc71fc855f2
Binary files /dev/null and b/vitess.io/images/users/square_logo.png differ
diff --git a/vitess.io/images/users/stitchlabs_logo.png b/vitess.io/images/users/stitchlabs_logo.png
new file mode 100644
index 00000000000..440307d1df6
Binary files /dev/null and b/vitess.io/images/users/stitchlabs_logo.png differ
diff --git a/vitess.io/images/users/youtube_logo.png b/vitess.io/images/users/youtube_logo.png
new file mode 100644
index 00000000000..165e04b5829
Binary files /dev/null and b/vitess.io/images/users/youtube_logo.png differ
diff --git a/vitess.io/images/vitess_logo.svg b/vitess.io/images/vitess_logo.svg
index 7f718dfa929..bdacb4fb6f4 100644
--- a/vitess.io/images/vitess_logo.svg
+++ b/vitess.io/images/vitess_logo.svg
@@ -152,7 +152,7 @@
          d="m 367.1282,648.85881 -27.87054,-51.05696 43.91222,-28.31214 z"
          inkscape:transform-center-y="9.0326795"
          inkscape:transform-center-x="1.1278866e-05"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#254c63;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -160,7 +160,7 @@
          d="m 358.11877,523.54589 -18.86111,74.25596 43.89303,-28.23753 z"
          inkscape:transform-center-y="-9.0326324"
          inkscape:transform-center-x="1.0833444e-05"
-         style="fill:#3949AB;fill-opacity:1;stroke:none" />
+         style="fill:#265c7d;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -168,7 +168,7 @@
          d="M 339.25766,597.80185 309.81992,543.4964 358.11877,523.54589 z"
          inkscape:transform-center-y="9.0326757"
          inkscape:transform-center-x="1.4539605e-05"
-         style="fill:#9FA8DA;fill-opacity:1;stroke:none" />
+         style="fill:#3788b7;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -176,7 +176,7 @@
          d="m 321.77925,456.51404 -11.95933,86.98236 48.29885,-19.95051 z"
          inkscape:transform-center-y="-9.0326719"
          inkscape:transform-center-x="1.4539605e-05"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#1e4c66;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -184,7 +184,7 @@
          d="m 396.92809,488.92607 -28.80694,53.00636 15.02954,27.63189 z"
          inkscape:transform-center-y="-9.0326719"
          inkscape:transform-center-x="1.7127283e-05"
-         style="fill:#C5CAE9;fill-opacity:1;stroke:none" />
+         style="fill:#3e9dd7;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -192,7 +192,7 @@
          d="m 309.81992,543.4964 -29.45786,-54.08204 41.41719,-32.90032 z"
          inkscape:transform-center-y="9.0326752"
          inkscape:transform-center-x="1.6018239e-05"
-         style="fill:#5C6BC0;fill-opacity:1;stroke:none" />
+         style="fill:#2d709a;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -200,7 +200,7 @@
          d="m 424.96714,544.084 -37.46497,0.0312 68.05792,-55.31976 z"
          inkscape:transform-center-y="9.0326752"
          inkscape:transform-center-x="1.4311967e-05"
-         style="fill:#283593;fill-opacity:1;stroke:none" />
+         style="fill:#28495c;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -208,7 +208,7 @@
          d="m 309.88277,434.58815 -29.52071,54.82621 41.41719,-32.90032 z"
          inkscape:transform-center-y="-9.0326741"
          inkscape:transform-center-x="1.7800343e-05"
-         style="fill:#C5CAE9;fill-opacity:1;stroke:none" />
+         style="fill:#3c97ce;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -216,14 +216,14 @@
          d="m 426.72149,434.94529 -29.7934,53.98078 -9.42592,55.18913 z"
          inkscape:transform-center-y="-9.0326741"
          inkscape:transform-center-x="1.609407e-05"
-         style="fill:#E8EAF6;fill-opacity:1;stroke:none" />
+         style="fill:#61b7eb;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path5101"
          d="m 280.36206,489.41436 -7.99111,-14.56861 37.51182,-40.25759 z"
          inkscape:transform-center-y="9.0326798"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#1e4c66;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -231,7 +231,7 @@
          d="m 387.50217,544.1152 39.21932,-109.16991 28.8386,53.85018 z"
          inkscape:transform-center-y="9.0326798"
          inkscape:transform-center-x="1.3724591e-05"
-         style="fill:#3F51B5;fill-opacity:1;stroke:none" />
+         style="fill:#296589;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -239,7 +239,7 @@
          d="m 280.22019,380.34483 -7.84924,94.50092 37.51182,-40.25759 z"
          inkscape:transform-center-y="-9.0326738"
          inkscape:transform-center-x="1.4136307e-05"
-         style="fill:#3949AB;fill-opacity:1;stroke:none" />
+         style="fill:#1a5a81;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -247,7 +247,7 @@
          d="m 456.61375,380.34483 -29.89226,54.60046 28.8386,53.85018 z"
          inkscape:transform-center-y="-9.0326738"
          inkscape:transform-center-x="1.4316579e-05"
-         style="fill:#7986CB;fill-opacity:1;stroke:none" />
+         style="fill:#427b9e;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -255,14 +255,14 @@
          d="m 272.37095,474.84575 -51.15286,-94.50092 59.0021,0 z"
          inkscape:transform-center-y="9.0326732"
          inkscape:transform-center-x="1.2539717e-05"
-         style="fill:#9FA8DA;fill-opacity:1;stroke:none" />
+         style="fill:#328cc2;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path5121"
          d="m 455.56009,488.79547 1.05366,-108.45064 58.754,0 z"
          inkscape:transform-center-y="9.0326732"
-         style="fill:#1A237E;fill-opacity:1;stroke:none" />
+         style="fill:#183b4f;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -270,7 +270,7 @@
          d="M 367.1282,648.85881 387.50217,544.1152 424.96714,544.084 z"
          inkscape:transform-center-y="9.0326757"
          inkscape:transform-center-x="1.7127283e-05"
-         style="fill:#1A237E;fill-opacity:1;stroke:none" />
+         style="fill:#0d3044;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/vitess.io/images/vitess_logo_icon_size.png b/vitess.io/images/vitess_logo_icon_size.png
index 8b427d58022..51b813d82d3 100644
Binary files a/vitess.io/images/vitess_logo_icon_size.png and b/vitess.io/images/vitess_logo_icon_size.png differ
diff --git a/vitess.io/images/vitess_logo_with_border.svg b/vitess.io/images/vitess_logo_with_border.svg
index e44d53c8b59..5c6b8a06cea 100644
--- a/vitess.io/images/vitess_logo_with_border.svg
+++ b/vitess.io/images/vitess_logo_with_border.svg
@@ -157,7 +157,7 @@
          d="m 367.1282,648.85881 -27.87054,-51.05696 43.91222,-28.31214 z"
          inkscape:transform-center-y="9.0326795"
          inkscape:transform-center-x="1.1278866e-05"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#254c63;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -165,7 +165,7 @@
          d="m 358.11877,523.54589 -18.86111,74.25596 43.89303,-28.23753 z"
          inkscape:transform-center-y="-9.0326324"
          inkscape:transform-center-x="1.0833444e-05"
-         style="fill:#3949AB;fill-opacity:1;stroke:none" />
+         style="fill:#265c7d;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -173,7 +173,7 @@
          d="M 339.25766,597.80185 309.81992,543.4964 358.11877,523.54589 z"
          inkscape:transform-center-y="9.0326757"
          inkscape:transform-center-x="1.4539605e-05"
-         style="fill:#9FA8DA;fill-opacity:1;stroke:none" />
+         style="fill:#3788b7;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -181,7 +181,7 @@
          d="m 321.77925,456.51404 -11.95933,86.98236 48.29885,-19.95051 z"
          inkscape:transform-center-y="-9.0326719"
          inkscape:transform-center-x="1.4539605e-05"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#1e4c66;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -189,7 +189,7 @@
          d="m 396.92809,488.92607 -28.80694,53.00636 15.02954,27.63189 z"
          inkscape:transform-center-y="-9.0326719"
          inkscape:transform-center-x="1.7127283e-05"
-         style="fill:#C5CAE9;fill-opacity:1;stroke:none" />
+         style="fill:#3e9dd7;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -197,7 +197,7 @@
          d="m 309.81992,543.4964 -29.45786,-54.08204 41.41719,-32.90032 z"
          inkscape:transform-center-y="9.0326752"
          inkscape:transform-center-x="1.6018239e-05"
-         style="fill:#5C6BC0;fill-opacity:1;stroke:none" />
+         style="fill:#2d709a;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -205,7 +205,7 @@
          d="m 424.96714,544.084 -37.46497,0.0312 68.05792,-55.31976 z"
          inkscape:transform-center-y="9.0326752"
          inkscape:transform-center-x="1.4311967e-05"
-         style="fill:#283593;fill-opacity:1;stroke:none" />
+         style="fill:#28495c;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -213,7 +213,7 @@
          d="m 309.88277,434.58815 -29.52071,54.82621 41.41719,-32.90032 z"
          inkscape:transform-center-y="-9.0326741"
          inkscape:transform-center-x="1.7800343e-05"
-         style="fill:#C5CAE9;fill-opacity:1;stroke:none" />
+         style="fill:#3c97ce;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -221,14 +221,14 @@
          d="m 426.72149,434.94529 -29.7934,53.98078 -9.42592,55.18913 z"
          inkscape:transform-center-y="-9.0326741"
          inkscape:transform-center-x="1.609407e-05"
-         style="fill:#E8EAF6;fill-opacity:1;stroke:none" />
+         style="fill:#61b7eb;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path5101"
          d="m 280.36206,489.41436 -7.99111,-14.56861 37.51182,-40.25759 z"
          inkscape:transform-center-y="9.0326798"
-         style="fill:#303F9F;fill-opacity:1;stroke:none" />
+         style="fill:#1e4c66;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -236,7 +236,7 @@
          d="m 387.50217,544.1152 39.21932,-109.16991 28.8386,53.85018 z"
          inkscape:transform-center-y="9.0326798"
          inkscape:transform-center-x="1.3724591e-05"
-         style="fill:#3F51B5;fill-opacity:1;stroke:none" />
+         style="fill:#296589;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -244,7 +244,7 @@
          d="m 280.22019,380.34483 -7.84924,94.50092 37.51182,-40.25759 z"
          inkscape:transform-center-y="-9.0326738"
          inkscape:transform-center-x="1.4136307e-05"
-         style="fill:#3949AB;fill-opacity:1;stroke:none" />
+         style="fill:#1a5a81;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -252,7 +252,7 @@
          d="m 456.61375,380.34483 -29.89226,54.60046 28.8386,53.85018 z"
          inkscape:transform-center-y="-9.0326738"
          inkscape:transform-center-x="1.4316579e-05"
-         style="fill:#7986CB;fill-opacity:1;stroke:none" />
+         style="fill:#427b9e;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -260,14 +260,14 @@
          d="m 272.37095,474.84575 -51.15286,-94.50092 59.0021,0 z"
          inkscape:transform-center-y="9.0326732"
          inkscape:transform-center-x="1.2539717e-05"
-         style="fill:#9FA8DA;fill-opacity:1;stroke:none" />
+         style="fill:#328cc2;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path5121"
          d="m 455.56009,488.79547 1.05366,-108.45064 58.754,0 z"
          inkscape:transform-center-y="9.0326732"
-         style="fill:#1A237E;fill-opacity:1;stroke:none" />
+         style="fill:#183b4f;fill-opacity:1;stroke:none" />
       <path
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
@@ -275,7 +275,7 @@
          d="M 367.1282,648.85881 387.50217,544.1152 424.96714,544.084 z"
          inkscape:transform-center-y="9.0326757"
          inkscape:transform-center-x="1.7127283e-05"
-         style="fill:#1A237E;fill-opacity:1;stroke:none" />
+         style="fill:#0d3044;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/vitess.io/index.md b/vitess.io/index.md
index 80e26cc2121..b410b590df6 100644
--- a/vitess.io/index.md
+++ b/vitess.io/index.md
@@ -1,6 +1,7 @@
 ---
 layout: home
 permalink: /
+title: Vitess - Database Clustering System for Horizontal Scaling of MySQL
 ---
 
 {% include index.md %}
diff --git a/vitess.io/internal/publish-website.md b/vitess.io/internal/publish-website.md
index 0ceb6a539e2..6f4809e069f 100644
--- a/vitess.io/internal/publish-website.md
+++ b/vitess.io/internal/publish-website.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Publish Website"
+redirect_from: /internal/publish-website.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/internal/release-instructions.md b/vitess.io/internal/release-instructions.md
index 6fa71864e12..a9a8ce777dd 100644
--- a/vitess.io/internal/release-instructions.md
+++ b/vitess.io/internal/release-instructions.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Release Instructions"
+served_from: /internal/release-instructions.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/overview/index.md b/vitess.io/overview/index.md
index 4d7b5d3f52e..07b14cecb94 100644
--- a/vitess.io/overview/index.md
+++ b/vitess.io/overview/index.md
@@ -1,6 +1,6 @@
 ---
 layout: doc
-title: "Understanding Vitess "
+title: "Understanding Vitess"
 description: Learn about core Vitess features and how Vitess stacks up
           against data storage alternatives. 
 modified:
diff --git a/vitess.io/overview/scaling-mysql.md b/vitess.io/overview/scaling-mysql.md
index 0775032f9d5..12a1912ef45 100644
--- a/vitess.io/overview/scaling-mysql.md
+++ b/vitess.io/overview/scaling-mysql.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
-title: "Understanding Vitess "
-description: Learn about core Vitess features and how Vitess stacks up
-          against data storage alternatives. 
+title: "Scaling MySQL with Vitess"
+redirect_from: /overview/scaling-mysql.html
+description: Vitess simplifies every aspect of managing a MySQL cluster, allowing easy scaling to any size without complicating your application layer.
 modified:
 excerpt:
 tags: []
diff --git a/vitess.io/preview-site.sh b/vitess.io/preview-site.sh
index f4dc180b2ee..34e7cb062db 100755
--- a/vitess.io/preview-site.sh
+++ b/vitess.io/preview-site.sh
@@ -10,6 +10,12 @@ if [[ -n "$1" ]]; then
   fi
 fi
 
+# Infer $VTTOP if it was not set.
+if [[ -z "$VTTOP" ]]; then
+  DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+  VTTOP="${DIR}/.."
+fi
+
 if [[ "$use_docker" == true ]]; then
   # Call this script from within the Docker container which has all dependencies installed.
   docker run -ti --rm -p 4000:4000 -v $VTTOP:/vttop -e VTTOP=/vttop vitess/publish-site /vttop/vitess.io/preview-site.sh --docker=false
diff --git a/vitess.io/publish-site.sh b/vitess.io/publish-site.sh
index 05d3713fc5b..2fc7098ce25 100755
--- a/vitess.io/publish-site.sh
+++ b/vitess.io/publish-site.sh
@@ -19,6 +19,15 @@ if [[ -n "$1" ]]; then
   fi
 fi
 
+# Infer $VTTOP if it was not set.
+if [[ -z "$VTTOP" ]]; then
+  DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+  VTTOP="${DIR}/.."
+fi
+
+# Make sure we're within the Git repository before checking it.
+pushd $VTTOP >/dev/null
+
 if [[ -n "$(git status --porcelain)" ]]; then
   echo "ERROR: Your working directory is not clean."
   echo
@@ -63,6 +72,14 @@ if [ -n "$list" ]; then
 fi
 set -e
 
+if ! git remote | grep -q "^origin$"; then
+  echo
+  echo "INFO: Skipping 'git commit' because you have no git remote called 'origin'."
+  echo "      Most likely this is run as netlify.com build where git commit does not work"
+  echo "      and nothing else has to be done here."
+  exit 0
+fi
+
 # Commit new version.
 git add -A .
 git commit -m "publish site `date`"
@@ -75,4 +92,5 @@ echo "Please sanity-check the output: git diff HEAD~"
 echo
 echo "When you're ready to publish, create a pull request."
 
-popd >/dev/null
+popd >/dev/null # Leaving $website_path.
+popd >/dev/null # Leaving $VTTOP.
diff --git a/vitess.io/reference/vitess-api.md b/vitess.io/reference/vitess-api.md
index c2a1e8d56c5..45dd208e6d2 100644
--- a/vitess.io/reference/vitess-api.md
+++ b/vitess.io/reference/vitess-api.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Vitess API Reference"
+redirect_from: /reference/vitess-api.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/reference/vtctl.md b/vitess.io/reference/vtctl.md
index 23ca32f6fb4..095fe7df5c3 100644
--- a/vitess.io/reference/vtctl.md
+++ b/vitess.io/reference/vtctl.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "vtctl Reference"
+redirect_from: /reference/vtctl.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/resources/presentations.md b/vitess.io/resources/presentations.md
index ee70691598a..d233e03e9ff 100644
--- a/vitess.io/resources/presentations.md
+++ b/vitess.io/resources/presentations.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Presentations and Videos"
+redirect_from: /resources/presentations.html
 description: Slides and videos from presentations about Vitess.
 modified:
 excerpt:
@@ -17,9 +18,9 @@ share: false
 
 [Sugu](https://github.com/sougou) and [Anthony](https://github.com/enisoc)
 showed what it looks like to use Vitess now that
-[Keyspace IDs](http://vitess.io/overview/concepts.html#keyspace-id) can be
+[Keyspace IDs]({% link overview/concepts.md %}#keyspace-id) can be
 completely hidden from the application. They gave a live demo of
-[resharding the Guestbook sample app](http://vitess.io/user-guide/sharding-kubernetes.html),
+[resharding the Guestbook sample app]({% link user-guide/sharding-kubernetes.md %}),
 which now knows nothing about shards, and explained how new features in VTGate
 make all of this possible.
 
@@ -45,7 +46,7 @@ Oracle OpenWorld 2015 focused on
 what the [Cloud Native Computing](http://cncf.io) paradigm means when
 applied to MySQL in the cloud. The talk also included a deep dive into
 [transparent, live resharding]
-(http://vitess.io/user-guide/sharding.html#resharding), one of the key
+({% link user-guide/sharding.md %}#resharding), one of the key
 features of Vitess that makes it well-adapted for a Cloud Native environment.
 
 <iframe src="http://docs.google.com/gview?url=http://vitess.io/resources/openworld-2015-vitess.pdf&embedded=true" style="width:643px; height:379px; margin-top: 20px;" frameborder="0"></iframe>
diff --git a/vitess.io/resources/roadmap.md b/vitess.io/resources/roadmap.md
index 572ddf22729..2197260a987 100644
--- a/vitess.io/resources/roadmap.md
+++ b/vitess.io/resources/roadmap.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Vitess Roadmap"
+redirect_from: /resources/roadmap.html
 description: Current version, what we are working on, what's planned.
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/backup-and-restore.md b/vitess.io/user-guide/backup-and-restore.md
index 2f5915d851d..a7baede6c8a 100644
--- a/vitess.io/user-guide/backup-and-restore.md
+++ b/vitess.io/user-guide/backup-and-restore.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Backing Up Data"
+redirect_from: /userguide/backup-and-restore.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/client-libraries.md b/vitess.io/user-guide/client-libraries.md
index 3fd4bad6511..0c2569bb320 100644
--- a/vitess.io/user-guide/client-libraries.md
+++ b/vitess.io/user-guide/client-libraries.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Client Libraries"
+redirect_from: /user-guide/client-libraries.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/horizontal-sharding-workflow.md b/vitess.io/user-guide/horizontal-sharding-workflow.md
index 9cee179bc46..613bc93c21d 100644
--- a/vitess.io/user-guide/horizontal-sharding-workflow.md
+++ b/vitess.io/user-guide/horizontal-sharding-workflow.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Horizontal Sharding (Tutorial, automated)"
+redirect_from: /user-guide/horizontal-resharding-workflow.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/horizontal-sharding.md b/vitess.io/user-guide/horizontal-sharding.md
index 7d57fa1e1ee..be996651c30 100644
--- a/vitess.io/user-guide/horizontal-sharding.md
+++ b/vitess.io/user-guide/horizontal-sharding.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Horizontal Sharding (Tutorial, manual)"
+redirect_from: /user-guide/horizontal-resharding.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/introduction.md b/vitess.io/user-guide/introduction.md
index 5a80e6ee1c0..763aab79769 100644
--- a/vitess.io/user-guide/introduction.md
+++ b/vitess.io/user-guide/introduction.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Vitess User Guide - Introduction"
+redirect_from: /user-guide/introduction.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/launching.md b/vitess.io/user-guide/launching.md
index f94e17d6d0b..95d23316e53 100644
--- a/vitess.io/user-guide/launching.md
+++ b/vitess.io/user-guide/launching.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Launching Vitess"
+redirect_from: /user-guide/launching.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/mysql-server-protocol.md b/vitess.io/user-guide/mysql-server-protocol.md
index 8a7b6efbb7c..aaca104a7f2 100644
--- a/vitess.io/user-guide/mysql-server-protocol.md
+++ b/vitess.io/user-guide/mysql-server-protocol.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "MySQL Server Protocol"
+redirect_from: /user-guide/mysql-server-protocol.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/production-planning.md b/vitess.io/user-guide/production-planning.md
index dc8a847f42c..3686238d66f 100644
--- a/vitess.io/user-guide/production-planning.md
+++ b/vitess.io/user-guide/production-planning.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Production Planning"
+redirect_from: /user-guide/production-planning.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/reparenting.md b/vitess.io/user-guide/reparenting.md
index 7e7263ae792..91ad8ddd32d 100644
--- a/vitess.io/user-guide/reparenting.md
+++ b/vitess.io/user-guide/reparenting.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Reparenting"
+redirect_from: /user-guide/reparenting.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/row-based-replication.md b/vitess.io/user-guide/row-based-replication.md
index 0f5a939b807..27406c01517 100644
--- a/vitess.io/user-guide/row-based-replication.md
+++ b/vitess.io/user-guide/row-based-replication.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Row Based Replication"
+redirect_from: /user-guide/row-based-replication.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/scalability-philosophy.md b/vitess.io/user-guide/scalability-philosophy.md
index 28e84418f9d..df453e1eebd 100644
--- a/vitess.io/user-guide/scalability-philosophy.md
+++ b/vitess.io/user-guide/scalability-philosophy.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Scalability Philosophy"
+redirect_from: /user-guide/scalability-philosophy.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/schema-management.md b/vitess.io/user-guide/schema-management.md
index f6dfc595e4f..882a09d1df4 100644
--- a/vitess.io/user-guide/schema-management.md
+++ b/vitess.io/user-guide/schema-management.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Schema Management"
+redirect_from: /user-guide/schema-management.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/schema-swap.md b/vitess.io/user-guide/schema-swap.md
index 2449d87689d..b2e711ac2d9 100644
--- a/vitess.io/user-guide/schema-swap.md
+++ b/vitess.io/user-guide/schema-swap.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Schema Swap"
+redirect_from: /user-guide/schema-swap.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/server-configuration.md b/vitess.io/user-guide/server-configuration.md
index 34d84b8154b..29c5e5ff6d9 100644
--- a/vitess.io/user-guide/server-configuration.md
+++ b/vitess.io/user-guide/server-configuration.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Server Configuration"
+redirect_from: /user-guide/server-configuration.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/sharding-kubernetes-workflow.md b/vitess.io/user-guide/sharding-kubernetes-workflow.md
index fe2bd8e2104..8515e043211 100644
--- a/vitess.io/user-guide/sharding-kubernetes-workflow.md
+++ b/vitess.io/user-guide/sharding-kubernetes-workflow.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Sharding in Kubernetes (Tutorial, automated)"
+redirect_from: /user-guide/sharding-kubernetes-workflow.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/sharding-kubernetes.md b/vitess.io/user-guide/sharding-kubernetes.md
index 5b9df95818a..f04afef2122 100644
--- a/vitess.io/user-guide/sharding-kubernetes.md
+++ b/vitess.io/user-guide/sharding-kubernetes.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Sharding in Kubernetes (Tutorial, manual)"
+redirect_from: /user-guide/sharding-kubernetes.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/sharding.md b/vitess.io/user-guide/sharding.md
index d6ce9093ad1..365206b1b46 100644
--- a/vitess.io/user-guide/sharding.md
+++ b/vitess.io/user-guide/sharding.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Sharding"
+redirect_from: /user-guide/sharding.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/topology-service.md b/vitess.io/user-guide/topology-service.md
index 490b366fccb..546f6e8e1b8 100644
--- a/vitess.io/user-guide/topology-service.md
+++ b/vitess.io/user-guide/topology-service.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Topology Service"
+redirect_from: /user-guide/topology-service.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/transport-security-model.md b/vitess.io/user-guide/transport-security-model.md
index 3c75095f50c..f62e47a7fac 100644
--- a/vitess.io/user-guide/transport-security-model.md
+++ b/vitess.io/user-guide/transport-security-model.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Transport Security Model"
+redirect_from: /user-guide/transport-security-model.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/troubleshooting.md b/vitess.io/user-guide/troubleshooting.md
index 90c912297d8..7f52c0f8f74 100644
--- a/vitess.io/user-guide/troubleshooting.md
+++ b/vitess.io/user-guide/troubleshooting.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Troubleshooting"
+redirect_from: /user-guide/troubleshooting.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/twopc.md b/vitess.io/user-guide/twopc.md
index e3084fe2aca..457712bbfaf 100644
--- a/vitess.io/user-guide/twopc.md
+++ b/vitess.io/user-guide/twopc.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "2PC Guide"
+redirect_from: /user-guide/twopc.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/update-stream.md b/vitess.io/user-guide/update-stream.md
index 1ea291de87f..e691d5c1ed8 100644
--- a/vitess.io/user-guide/update-stream.md
+++ b/vitess.io/user-guide/update-stream.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Update Stream"
+redirect_from: /user-guide/update-stream.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/upgrading.md b/vitess.io/user-guide/upgrading.md
index 74c574c768a..31ade67b0b9 100644
--- a/vitess.io/user-guide/upgrading.md
+++ b/vitess.io/user-guide/upgrading.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Upgrading"
+redirect_from: /user-guide/upgrading.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/vitess-replication.md b/vitess.io/user-guide/vitess-replication.md
index 37ce367d4d5..aafefe96489 100644
--- a/vitess.io/user-guide/vitess-replication.md
+++ b/vitess.io/user-guide/vitess-replication.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Vitess and Replication"
+redirect_from: /user-guide/vitess-replication.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/vitess-sequences.md b/vitess.io/user-guide/vitess-sequences.md
index 5fc558bba4b..b104ea27a96 100644
--- a/vitess.io/user-guide/vitess-sequences.md
+++ b/vitess.io/user-guide/vitess-sequences.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "Vitess Sequences"
+redirect_from: /user-guide/vitess-sequences.html
 description:
 modified:
 excerpt:
diff --git a/vitess.io/user-guide/vschema.md b/vitess.io/user-guide/vschema.md
index 246aa931066..8debdbc9cb9 100644
--- a/vitess.io/user-guide/vschema.md
+++ b/vitess.io/user-guide/vschema.md
@@ -1,6 +1,7 @@
 ---
 layout: doc
 title: "VSchema User Guide"
+redirect_from: /user-guide/vschema.html
 description:
 modified:
 excerpt: