Refine site build (#3363)

* clean up broken links in MD file.  Update gitignore for committing static docs.  tweaking static site build scripts

* update script

* adding page to link to java and py docs.  updated build site script to appropriately place static assets.

* adding  versioned docs for latest release

* update versioned docs

* comment out blog header link.  remove broken links in python docs

* fixing heron version references.  recreateing versioned docs.

* clean up in gitignore.  Adding missing ticks in python docs.

* clean up
diff --git a/.gitignore b/.gitignore
index c599612..d33c02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,9 +132,10 @@
 # generated for the website
 website/node_modules/
 website/public/
-/bin/
+
 website2/website/public
 website2/website/static/api
+website2/website/venv/
 
 # Visual Studio Code
 .vscode
diff --git a/website2/docs/client-api-docs-overview.md b/website2/docs/client-api-docs-overview.md
new file mode 100644
index 0000000..a1ce713
--- /dev/null
+++ b/website2/docs/client-api-docs-overview.md
@@ -0,0 +1,25 @@
+---
+id: client-api-docs-overview
+title: Client API Docs 
+sidebar_label: Client API Docs 
+---
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+-->
+
+You can view JavaDocs [here](http://heron.incubator.apache.org/api/java)
+
+You can view Pydocs [here](http://heron.incubator.apache.org/api/python)
\ No newline at end of file
diff --git a/website2/docs/getting-started-migrate-storm-topologies.md b/website2/docs/getting-started-migrate-storm-topologies.md
index 4b50f3b..ab7e490 100644
--- a/website2/docs/getting-started-migrate-storm-topologies.md
+++ b/website2/docs/getting-started-migrate-storm-topologies.md
@@ -36,13 +36,13 @@
 <dependency>
   <groupId>org.apache.heron</groupId>
   <artifactId>heron-api</artifactId>
-  <version>{{< heronVersion >}}</version>
+  <version>{{heron:version}}</version>
   <scope>compile</scope>
 </dependency>
 <dependency>
   <groupId>org.apache.heron</groupId>
   <artifactId>heron-storm</artifactId>
-  <version>{{< heronVersion >}}</version>
+  <version>{{heron:version}}</version>
   <scope>compile</scope>
 </dependency>
 ```
diff --git a/website2/docs/guides-python-topologies.md b/website2/docs/guides-python-topologies.md
index 379c4b5..e2aa96a 100644
--- a/website2/docs/guides-python-topologies.md
+++ b/website2/docs/guides-python-topologies.md
@@ -52,7 +52,7 @@
 
 Once you've defined spouts and bolts for a topology, you can then compose the topology in one of two ways:
 
-* You can use the [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder) class inside of a main function.
+* You can use the `TopologyBuilder` class inside of a main function.
 
     Here's an example:
 
@@ -67,7 +67,7 @@
         builder.build_and_submit()
     ```
 
-* You can subclass the [`Topology`](/api/python/topology.m.html#heronpy.topology.Topology) class.
+* You can subclass the `Topology` class.
 
     Here's an example:
 
@@ -81,9 +81,9 @@
         my_bolt = CountBolt.spec(par=3, inputs={spout: Grouping.fields("word")})
     ```
 
-## Defining topologies using the [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder) class
+## Defining topologies using the `TopologyBuilder` class
 
-If you create a Python topology using a [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder), you need to instantiate a `TopologyBuilder` inside of a standard Python main function, like this:
+If you create a Python topology using a `TopologyBuilder`, you need to instantiate a `TopologyBuilder` inside of a standard Python main function, like this:
 
 ```python
 from heronpy.api.topology import TopologyBuilder
@@ -93,7 +93,7 @@
     builder = TopologyBuilder("MyTopology")
 ```
 
-Once you've created a `TopologyBuilder` object, you can add bolts using the [`add_bolt`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder.add_bolt) method and spouts using the [`add_spout`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder.add_spout) method. Here's an example:
+Once you've created a `TopologyBuilder` object, you can add bolts using the `add_bolt` method and spouts using the `add_spout` method. Here's an example:
 
 ```python
 builder = TopologyBuilder("MyTopology")
@@ -101,14 +101,14 @@
 builder.add_spout("my_spout", WordSpout, par=2)
 ```
 
-Both the `add_bolt` and `add_spout` methods return the corresponding [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec) object.
+Both the `add_bolt` and `add_spout` methods return the corresponding `HeronComponentSpec1 object.
 
 The `add_bolt` method takes four arguments and an optional `config` parameter:
 
 Argument | Data type | Description | Default
 :--------|:----------|:------------|:-------
 `name` | `str` | The unique identifier assigned to this bolt | |
-`bolt_cls` | class | The subclass of [`Bolt`](/api/python/bolt/bolt.m.html#heronpy.bolt.bolt.Bolt) that defines this bolt | |
+`bolt_cls` | class | The subclass of `Bolt` that defines this bolt | |
 `par` | `int` | The number of instances of this bolt in the topology | |
 `config` | `dict` | Specifies the configuration for this spout | `None`
 
@@ -117,14 +117,14 @@
 Argument | Data type | Description | Default
 :--------|:----------|:------------|:-------
 `name` | `str` | The unique identifier assigned to this spout | |
-`spout_cls` | class | The subclass of [`Spout`](/api/python/spout/spout.m.html#heronpy.spout.spout.Spout) that defines this spout | |
+`spout_cls` | class | The subclass of `Spout` that defines this spout | |
 `par` | `int` | The number of instances of this spout in the topology | |
-`inputs` | `dict` or `list` | Either a `dict` mapping from [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec) to [`Grouping`](/api/python/stream.m.html#heronpy.stream.Grouping) *or* a list of [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec)s, in which case the [`shuffle`](/api/python/stream.m.html#heronpy.stream.Grouping.SHUFFLE) grouping is used
+`inputs` | `dict` or `list` | Either a `dict` mapping from `HeronComponentSpec` to `Grouping` *or* a list of `HeronComponentSpec`, in which case the `shuffle` grouping is used
 `config` | `dict` | Specifies the configuration for this spout | `None`
 
 ### Example
 
-The following is an example implementation of a word count topology in Python that subclasses [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder).
+The following is an example implementation of a word count topology in Python that subclasses `TopologyBuilder`.
 
 ```python
 from your_spout import WordSpout
@@ -148,7 +148,7 @@
 
 ### Topology-wide configuration
 
-If you're building a Python topology using a `TopologyBuilder`, you can specify configuration for the topology using the [`set_config`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder.set_config) method. A topology's config is a `dict` in which the keys are a series constants from the [`api_constants`](/api/python/api_constants.m.html) module and values are configuration values for those parameters.
+If you're building a Python topology using a `TopologyBuilder`, you can specify configuration for the topology using the `set_config` method. A topology's config is a `dict` in which the keys are a series constants from the `api_constants` module and values are configuration values for those parameters.
 
 Here's an example:
 
@@ -170,7 +170,7 @@
 
 If you want to [submit](../../../operators/heron-cli#submitting-a-topology) Python topologies to a Heron cluster, they need to be packaged as a [PEX](https://pex.readthedocs.io/en/stable/whatispex.html) file. In order to produce PEX files, we recommend using a build tool like [Pants](http://www.pantsbuild.org/python_readme.html) or [Bazel](https://github.com/benley/bazel_rules_pex).
 
-If you defined your topology by subclassing the [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder) class and built a `word_count.pex` file for that topology in the `~/topology` folder. You can submit the topology to a cluster called `local` like this:
+If you defined your topology by subclassing the `TopologyBuilder` class and built a `word_count.pex` file for that topology in the `~/topology` folder. You can submit the topology to a cluster called `local` like this:
 
 ```bash
 $ heron submit local \
@@ -184,9 +184,9 @@
 > * See [this repo](https://github.com/streamlio/pants-dev-environment) for an example of a Heron topology written in Python and deployable as a Pants-packaged PEX.
 > * See [this repo](https://github.com/streamlio/bazel-dev-environment) for an example of a Heron topology written in Python and deployable as a Bazel-packaged PEX.
 
-## Defining a topology by subclassing the [`Topology`](/api/python/topology.m.html#heronpy.topology.Topology) class
+## Defining a topology by subclassing the `Topology` class
 
-If you create a Python topology by subclassing the [`Topology`](/api/python/topology.m.html#heronpy.topology.Topology) class, you need to create a new topology class, like this:
+If you create a Python topology by subclassing the `Topology` class, you need to create a new topology class, like this:
 
 ```python
 from my_spout import WordSpout
@@ -202,13 +202,13 @@
     my_bolt = CountBolt.spec(par=3, inputs=my_bolt_inputs)
 ```
 
-All you need to do is place [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec)s as the class attributes
+All you need to do is place `HeronComponentSpec`s as the class attributes
 of your topology class, which are returned by the `spec()` method of
 your spout or bolt class. You do *not* need to run a `build` method or anything like that; the `Topology` class will automatically detect which spouts and bolts are included in the topology.
 
 > If you use this method to define a new Python topology, you do *not* need to have a main function.
 
-For bolts, the [`spec`](/api/python/bolt/bolt.m.html#heronpy.bolt.bolt.Bolt.spec) method for spouts takes three optional arguments::
+For bolts, the `spec` method for spouts takes three optional arguments::
 
 Argument | Data type | Description | Default
 :--------|:----------|:------------|:-------
@@ -217,12 +217,12 @@
 `config` | `dict` | Specifies the configuration for this bolt | `None`
 
 
-For spouts, the [`spec`](/api/python/spout/spout.m.html#heronpy.spout.spout.Spout.spec) method takes four optional arguments:
+For spouts, the `spec` method takes four optional arguments:
 
 Argument | Data type | Description | Default
 :--------|:----------|:------------|:-------
 `name` | `str` | The unique identifier assigned to this spout or `None` if you want to use the variable name of the return `HeronComponentSpec` as the unique identifier for this spout | `None` |
-`inputs` | `dict` or `list` | Either a `dict` mapping from [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec) to [`Grouping`](/api/python/stream.m.html#heronpy.stream.Grouping) *or* a list of [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec)s, in which case the [`shuffle`](/api/python/stream.m.html#heronpy.stream.Grouping.SHUFFLE) grouping is used
+`inputs` | `dict` or `list` | Either a `dict` mapping from `HeronComponentSpec`to `Grouping` *or* a list of `HeronComponentSpec`s, in which case the `shuffle` grouping is used
 `par` | `int` | The number of instances of this spout in the topology | `1` |
 `config` | `dict` | Specifies the configuration for this spout | `None`
 
@@ -245,7 +245,7 @@
 
 ### Launching
 
-If you defined your topology by subclassing the [`Topology`](/api/python/topology.m.html#heronpy.topology.Topology) class,
+If you defined your topology by subclassing the `Topology` class,
 your main Python file should *not* contain a main method. You will, however, need to instruct Heron which class contains your topology definition.
 
 Let's say that you've defined a topology by subclassing `Topology` and built a PEX stored in `~/topology/dist/word_count.pex`. The class containing your topology definition is `topology.word_count.WordCount`. You can submit the topology to a cluster called `local` like this:
@@ -259,7 +259,7 @@
 
 ### Topology-wide configuration
 
-If you're building a Python topology by subclassing `Topology`, you can specify configuration for the topology using the [`set_config`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder.set_config) method. A topology's config is a `dict` in which the keys are a series constants from the [`api_constants`](/api/python/api_constants.m.html) module and values are configuration values for those parameters.
+If you're building a Python topology by subclassing `Topology`, you can specify configuration for the topology using the `set_config` method. A topology's config is a `dict` in which the keys are a series constants from the `api_constants` module and values are configuration values for those parameters.
 
 Here's an example:
 
diff --git a/website2/docs/topology-development-streamlet-api.md b/website2/docs/topology-development-streamlet-api.md
index 91d6033..87396af 100644
--- a/website2/docs/topology-development-streamlet-api.md
+++ b/website2/docs/topology-development-streamlet-api.md
@@ -355,8 +355,6 @@
 
 ### Join operations
 
-> For a more in-depth conceptual discussion of joins, see the [Heron Streamlet API](../../../concepts/streamlet-api#join-operations) doc.
-
 Join operations unify two streamlets *on a key* (join operations thus require KV streamlets). Each `KeyValue` object in a streamlet has, by definition, a key. When a join operation is added to a processing graph, 
 
 ```java
diff --git a/website2/docs/topology-development-topology-api-java.md b/website2/docs/topology-development-topology-api-java.md
index 910e62d..11b50e2 100644
--- a/website2/docs/topology-development-topology-api-java.md
+++ b/website2/docs/topology-development-topology-api-java.md
@@ -46,7 +46,7 @@
 <dependency>
     <groupId>org.apache.heron</groupId>
     <artifactId>heron-api</artifactId>
-    <version>{{< heronVersion >}}</version>
+    <version>{{heron:version}}</version>
 </dependency>
 ```
 
diff --git a/website2/docs/topology-development-topology-api-python.md b/website2/docs/topology-development-topology-api-python.md
index 0b9e56e..d898a66 100644
--- a/website2/docs/topology-development-topology-api-python.md
+++ b/website2/docs/topology-development-topology-api-python.md
@@ -20,7 +20,7 @@
     under the License.
 -->
 
-> The current version of `heronpy` is [{{% heronpyVersion %}}](https://pypi.python.org/pypi/heronpy/{{% heronpyVersion %}}).
+> The current version of `heronpy` is [{{heron:version}}](https://pypi.python.org/pypi/heronpy/{{heron:version}}).
 
 Support for developing Heron topologies in Python is provided by a Python library called [`heronpy`](https://pypi.python.org/pypi/heronpy).
 
diff --git a/website2/website/Makefile b/website2/website/Makefile
index ef7e5ed..1465eb0 100644
--- a/website2/website/Makefile
+++ b/website2/website/Makefile
@@ -8,4 +8,6 @@
 	@scripts/python-doc-gen.sh 0.0.0
 
 buildsite:
+	@scripts/javadocs.sh
+	@scripts/python-doc-gen.sh 0.0.0
 	@scripts/build-site.sh
diff --git a/website2/website/scripts/build-site.sh b/website2/website/scripts/build-site.sh
index f3bb168..69c6b08 100755
--- a/website2/website/scripts/build-site.sh
+++ b/website2/website/scripts/build-site.sh
@@ -1,4 +1,4 @@
-!/bin/bash
+#!/bin/bash
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +6,9 @@
 # to you 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
@@ -31,4 +31,9 @@
 
 rm -rf ${ROOT_DIR}/generated-site/content
 mkdir -p ${ROOT_DIR}/generated-site/content
+## copy generated site
 cp -R build/incubator-heron/* ${ROOT_DIR}/generated-site/content
+## copy java docs
+cp -R ${ROOT_DIR}/website2/website/public/api/java/* ${ROOT_DIR}/generated-site/content/api/java/
+## copy pydocs
+cp -R ${ROOT_DIR}/website2/website/static/api/python/* ${ROOT_DIR}/generated-site/content/api/python/
\ No newline at end of file
diff --git a/website2/website/scripts/python-doc-gen.sh b/website2/website/scripts/python-doc-gen.sh
index 23f664a..5ad1f35 100755
--- a/website2/website/scripts/python-doc-gen.sh
+++ b/website2/website/scripts/python-doc-gen.sh
@@ -17,14 +17,14 @@
 # under the License.
 
 # Install Dependencies
-sudo apt-get update && sudo apt install -y automake cmake libtool-bin g++ \
- python-setuptools python-dev python-wheel python python-pip unzip tree openjdk-8-jdk virtualenv
+#sudo apt-get update && sudo apt install -y automake cmake libtool-bin g++ \
+# python-setuptools python-dev python-wheel python python-pip unzip tree openjdk-8-jdk virtualenv
 
 # Install Bazel 0.26
-wget -O ./bazel-0.26.0-installer-linux-x86_64.sh https://github.com/bazelbuild/bazel/releases/download/0.26.0/bazel-0.26.0-installer-linux-x86_64.sh && \
-chmod +x ./bazel-0.26.0-installer-linux-x86_64.sh && \
-./bazel-0.26.0-installer-linux-x86_64.sh --user && \
-export PATH="$PATH:$HOME/bin"
+#wget -O ./bazel-0.26.0-installer-linux-x86_64.sh https://github.com/bazelbuild/bazel/releases/download/0.26.0/bazel-0.26.0-installer-linux-x86_64.sh && \
+# chmod +x ./bazel-0.26.0-installer-linux-x86_64.sh && \
+#./bazel-0.26.0-installer-linux-x86_64.sh --user && \
+# export PATH="$PATH:$HOME/bin"
 
 set -e
 
diff --git a/website2/website/sidebars.json b/website2/website/sidebars.json
index c95b1e8..b467216 100755
--- a/website2/website/sidebars.json
+++ b/website2/website/sidebars.json
@@ -19,6 +19,7 @@
       "topology-development-streamlet-scala"
     ],
     "Client API Docs": [
+      "client-api-docs-overview"
     ],
     "Guides": [
       "guides-effectively-once-java-topologies",
diff --git a/website2/website/siteConfig.js b/website2/website/siteConfig.js
index daaf172..d8be8ad 100644
--- a/website2/website/siteConfig.js
+++ b/website2/website/siteConfig.js
@@ -89,9 +89,11 @@
 
   // For no header links in the top nav bar -> headerLinks: [],
   headerLinks: [
+    {href: '/api/java', label: "Javadocs"},
+    {href: '/api/python', label: "Pydocs"},
     {doc: 'getting-started-local-single-node', label: 'Docs'},
     {href: '#community', label: 'Community'},
-    {blog: true, label: 'Blog'},
+    //{blog: true, label: 'Blog'},
     {href: '#apache', label: 'Apache'},
     // {page: 'download', label: 'Download'},
     // Drop down for languages
diff --git a/website2/website/versioned_docs/version-0.20.0-incubating/client-api-docs-overview.md b/website2/website/versioned_docs/version-0.20.0-incubating/client-api-docs-overview.md
new file mode 100644
index 0000000..15046db
--- /dev/null
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/client-api-docs-overview.md
@@ -0,0 +1,26 @@
+---
+id: version-0.20.0-incubating-client-api-docs-overview
+title: Client API Docs
+sidebar_label: Client API Docs
+original_id: client-api-docs-overview
+---
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+-->
+
+You can view JavaDocs [here](http://heron.incubator.apache.org/api/java)
+
+You can view Pydocs [here](http://heron.incubator.apache.org/api/python)
\ No newline at end of file
diff --git a/website2/website/versioned_docs/version-0.20.0/cluster-config-instance.md b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-instance.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/cluster-config-instance.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-instance.md
index e228bf3..ec33e02 100644
--- a/website2/website/versioned_docs/version-0.20.0/cluster-config-instance.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-instance.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-cluster-config-instance
+id: version-0.20.0-incubating-cluster-config-instance
 title: Heron Instance
 sidebar_label: Heron Instance
 original_id: cluster-config-instance
diff --git a/website2/website/versioned_docs/version-0.20.0/cluster-config-metrics.md b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-metrics.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/cluster-config-metrics.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-metrics.md
index 3c94a83..bc9db0d 100644
--- a/website2/website/versioned_docs/version-0.20.0/cluster-config-metrics.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-metrics.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-cluster-config-metrics
+id: version-0.20.0-incubating-cluster-config-metrics
 title: Metrics Manager
 sidebar_label: Metrics Manager
 original_id: cluster-config-metrics
diff --git a/website2/website/versioned_docs/version-0.20.0/cluster-config-overview.md b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-overview.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/cluster-config-overview.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-overview.md
index a7dfa9d..8182ae2 100644
--- a/website2/website/versioned_docs/version-0.20.0/cluster-config-overview.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-overview.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-cluster-config-overview
+id: version-0.20.0-incubating-cluster-config-overview
 title: Cluster Config Overview
 sidebar_label: Cluster Config Overview
 original_id: cluster-config-overview
diff --git a/website2/website/versioned_docs/version-0.20.0/cluster-config-stream.md b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-stream.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/cluster-config-stream.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-stream.md
index e047c08..7ae2d0c 100644
--- a/website2/website/versioned_docs/version-0.20.0/cluster-config-stream.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-stream.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-cluster-config-stream
+id: version-0.20.0-incubating-cluster-config-stream
 title: Stream Manager
 sidebar_label: Stream Manager
 original_id: cluster-config-stream
diff --git a/website2/website/versioned_docs/version-0.20.0/cluster-config-system-level.md b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-system-level.md
similarity index 96%
rename from website2/website/versioned_docs/version-0.20.0/cluster-config-system-level.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-system-level.md
index 3d878ca..3d7447e 100644
--- a/website2/website/versioned_docs/version-0.20.0/cluster-config-system-level.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-system-level.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-cluster-config-system-level
+id: version-0.20.0-incubating-cluster-config-system-level
 title: System Level Configuration
 sidebar_label: System Level Configuration
 original_id: cluster-config-system-level
diff --git a/website2/website/versioned_docs/version-0.20.0/cluster-config-tmaster.md b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-tmaster.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/cluster-config-tmaster.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-tmaster.md
index 34b50e2..9566bf7 100644
--- a/website2/website/versioned_docs/version-0.20.0/cluster-config-tmaster.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/cluster-config-tmaster.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-cluster-config-tmaster
+id: version-0.20.0-incubating-cluster-config-tmaster
 title: Topology Master
 sidebar_label: Topology Master
 original_id: cluster-config-tmaster
diff --git a/website2/website/versioned_docs/version-0.20.0/compiling-code-organization.md b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-code-organization.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/compiling-code-organization.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/compiling-code-organization.md
index 32eb47b..aa423f9 100644
--- a/website2/website/versioned_docs/version-0.20.0/compiling-code-organization.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-code-organization.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-compiling-code-organization
+id: version-0.20.0-incubating-compiling-code-organization
 title: Code Organization
 sidebar_label: Code Organization
 original_id: compiling-code-organization
diff --git a/website2/website/versioned_docs/version-0.20.0/compiling-docker.md b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-docker.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/compiling-docker.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/compiling-docker.md
index 552f739..95074fd 100644
--- a/website2/website/versioned_docs/version-0.20.0/compiling-docker.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-docker.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-compiling-docker
+id: version-0.20.0-incubating-compiling-docker
 title: Compiling With Docker
 sidebar_label: Compiling With Docker
 original_id: compiling-docker
diff --git a/website2/website/versioned_docs/version-0.20.0/compiling-linux.md b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-linux.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/compiling-linux.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/compiling-linux.md
index eac1e71..836954b 100644
--- a/website2/website/versioned_docs/version-0.20.0/compiling-linux.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-linux.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-compiling-linux
+id: version-0.20.0-incubating-compiling-linux
 title: Compiling on Linux
 sidebar_label: Compiling on Linux
 original_id: compiling-linux
diff --git a/website2/website/versioned_docs/version-0.20.0/compiling-osx.md b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-osx.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/compiling-osx.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/compiling-osx.md
index 1bbcc85..996b3d1 100644
--- a/website2/website/versioned_docs/version-0.20.0/compiling-osx.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-osx.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-compiling-osx
+id: version-0.20.0-incubating-compiling-osx
 title: Compiling on OS X
 sidebar_label: Compiling on OS X
 original_id: compiling-osx
diff --git a/website2/website/versioned_docs/version-0.20.0/compiling-overview.md b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-overview.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/compiling-overview.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/compiling-overview.md
index 41a8b12..9a47079 100644
--- a/website2/website/versioned_docs/version-0.20.0/compiling-overview.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-overview.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-compiling-overview
+id: version-0.20.0-incubating-compiling-overview
 title: Compiling Heron
 sidebar_label: Compiling Overview
 original_id: compiling-overview
diff --git a/website2/website/versioned_docs/version-0.20.0/compiling-running-tests.md b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-running-tests.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/compiling-running-tests.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/compiling-running-tests.md
index 167411c..96ea390 100644
--- a/website2/website/versioned_docs/version-0.20.0/compiling-running-tests.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/compiling-running-tests.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-compiling-running-tests
+id: version-0.20.0-incubating-compiling-running-tests
 title: Running Tests
 sidebar_label: Running Tests
 original_id: compiling-running-tests
diff --git a/website2/website/versioned_docs/version-0.20.0/deployment-api-server.md b/website2/website/versioned_docs/version-0.20.0-incubating/deployment-api-server.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/deployment-api-server.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/deployment-api-server.md
index ff5facb..827ad5c 100644
--- a/website2/website/versioned_docs/version-0.20.0/deployment-api-server.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/deployment-api-server.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-deployment-api-server
+id: version-0.20.0-incubating-deployment-api-server
 title: The Heron API Server
 sidebar_label: The Heron API Server
 original_id: deployment-api-server
diff --git a/website2/website/versioned_docs/version-0.20.0/deployment-configuration.md b/website2/website/versioned_docs/version-0.20.0-incubating/deployment-configuration.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/deployment-configuration.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/deployment-configuration.md
index 956da9d..6dd8f0d 100644
--- a/website2/website/versioned_docs/version-0.20.0/deployment-configuration.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/deployment-configuration.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-deployment-configuration
+id: version-0.20.0-incubating-deployment-configuration
 title: Configuring a Cluster
 sidebar_label: Configuration
 original_id: deployment-configuration
diff --git a/website2/website/versioned_docs/version-0.20.0/deployment-overview.md b/website2/website/versioned_docs/version-0.20.0-incubating/deployment-overview.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/deployment-overview.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/deployment-overview.md
index 7b6d6ac9..adcbf6b 100644
--- a/website2/website/versioned_docs/version-0.20.0/deployment-overview.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/deployment-overview.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-deployment-overview
+id: version-0.20.0-incubating-deployment-overview
 title: Deployment Overiew
 sidebar_label: Deployment Overiew
 original_id: deployment-overview
diff --git a/website2/website/versioned_docs/version-0.20.0/extending-heron-metric-sink.md b/website2/website/versioned_docs/version-0.20.0-incubating/extending-heron-metric-sink.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/extending-heron-metric-sink.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/extending-heron-metric-sink.md
index caf312f..1de2564 100644
--- a/website2/website/versioned_docs/version-0.20.0/extending-heron-metric-sink.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/extending-heron-metric-sink.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-extending-heron-metric-sink
+id: version-0.20.0-incubating-extending-heron-metric-sink
 title: Implementing a Custom Metrics Sink
 sidebar_label: Custom Metrics Sink
 original_id: extending-heron-metric-sink
diff --git a/website2/website/versioned_docs/version-0.20.0/extending-heron-scheduler.md b/website2/website/versioned_docs/version-0.20.0-incubating/extending-heron-scheduler.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/extending-heron-scheduler.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/extending-heron-scheduler.md
index 9049b48..578076a 100644
--- a/website2/website/versioned_docs/version-0.20.0/extending-heron-scheduler.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/extending-heron-scheduler.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-extending-heron-scheduler
+id: version-0.20.0-incubating-extending-heron-scheduler
 title: Implementing a Custom Scheduler
 sidebar_label: Custom Scheduler
 original_id: extending-heron-scheduler
diff --git a/website2/website/versioned_docs/version-0.20.0/getting-started-local-single-node.md b/website2/website/versioned_docs/version-0.20.0-incubating/getting-started-local-single-node.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/getting-started-local-single-node.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/getting-started-local-single-node.md
index 8e92019..1146e62 100644
--- a/website2/website/versioned_docs/version-0.20.0/getting-started-local-single-node.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/getting-started-local-single-node.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-getting-started-local-single-node
+id: version-0.20.0-incubating-getting-started-local-single-node
 title: Local (Single Node)
 sidebar_label: Local (Single Node)
 original_id: getting-started-local-single-node
@@ -21,7 +21,8 @@
     under the License.
 -->
 
-> The current version of Heron is **{{heron:version}}**
+> The current version of Heron is {{heron:version}}
+
 
 The easiest way to get started learning Heron is to install the Heron client tools, which are currently available for:
 
diff --git a/website2/website/versioned_docs/version-0.20.0/getting-started-migrate-storm-topologies.md b/website2/website/versioned_docs/version-0.20.0-incubating/getting-started-migrate-storm-topologies.md
similarity index 96%
rename from website2/website/versioned_docs/version-0.20.0/getting-started-migrate-storm-topologies.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/getting-started-migrate-storm-topologies.md
index b3413d9..60f95ae 100644
--- a/website2/website/versioned_docs/version-0.20.0/getting-started-migrate-storm-topologies.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/getting-started-migrate-storm-topologies.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-getting-started-migrate-storm-topologies
+id: version-0.20.0-incubating-getting-started-migrate-storm-topologies
 title: Migrate Storm Topologies
 sidebar_label: Migrate Storm Topologies
 original_id: getting-started-migrate-storm-topologies
@@ -37,13 +37,13 @@
 <dependency>
   <groupId>org.apache.heron</groupId>
   <artifactId>heron-api</artifactId>
-  <version>{{< heronVersion >}}</version>
+  <version>{{heron:version}}</version>
   <scope>compile</scope>
 </dependency>
 <dependency>
   <groupId>org.apache.heron</groupId>
   <artifactId>heron-storm</artifactId>
-  <version>{{< heronVersion >}}</version>
+  <version>{{heron:version}}</version>
   <scope>compile</scope>
 </dependency>
 ```
diff --git a/website2/website/versioned_docs/version-0.20.0/getting-started-troubleshooting-guide.md b/website2/website/versioned_docs/version-0.20.0-incubating/getting-started-troubleshooting-guide.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/getting-started-troubleshooting-guide.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/getting-started-troubleshooting-guide.md
index ff32fcf..7fa23ae 100644
--- a/website2/website/versioned_docs/version-0.20.0/getting-started-troubleshooting-guide.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/getting-started-troubleshooting-guide.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-getting-started-troubleshooting-guide
+id: version-0.20.0-incubating-getting-started-troubleshooting-guide
 title: Troubleshooting Guide
 sidebar_label: Troubleshooting Guide
 original_id: getting-started-troubleshooting-guide
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-data-model.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-data-model.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/guides-data-model.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-data-model.md
index 123b479..7c71b8e 100644
--- a/website2/website/versioned_docs/version-0.20.0/guides-data-model.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-data-model.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-guides-data-model
+id: version-0.20.0-incubating-guides-data-model
 title: Heron Data Model
 sidebar_label: Heron Data Model
 original_id: guides-data-model
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-effectively-once-java-topologies.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-effectively-once-java-topologies.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/guides-effectively-once-java-topologies.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-effectively-once-java-topologies.md
index 21f0994..e71982a 100644
--- a/website2/website/versioned_docs/version-0.20.0/guides-effectively-once-java-topologies.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-effectively-once-java-topologies.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-guides-effectively-once-java-topologies
+id: version-0.20.0-incubating-guides-effectively-once-java-topologies
 title: Effectively Once Java Topologies
 sidebar_label: Effectively Once Java Topologies
 original_id: guides-effectively-once-java-topologies
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-packing-algorithms.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-packing-algorithms.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/guides-packing-algorithms.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-packing-algorithms.md
index baf39d0..259cec8 100644
--- a/website2/website/versioned_docs/version-0.20.0/guides-packing-algorithms.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-packing-algorithms.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-guides-packing-algorithms
+id: version-0.20.0-incubating-guides-packing-algorithms
 title: Packing Algorithms
 sidebar_label: Packing Algorithms
 original_id: guides-packing-algorithms
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-python-topologies.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-python-topologies.md
similarity index 77%
rename from website2/website/versioned_docs/version-0.20.0/guides-python-topologies.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-python-topologies.md
index 2ae4d53..bc55105 100644
--- a/website2/website/versioned_docs/version-0.20.0/guides-python-topologies.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-python-topologies.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-guides-python-topologies
+id: version-0.20.0-incubating-guides-python-topologies
 title: Python Topologies
 sidebar_label: Python Topologies
 original_id: guides-python-topologies
@@ -53,7 +53,7 @@
 
 Once you've defined spouts and bolts for a topology, you can then compose the topology in one of two ways:
 
-* You can use the [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder) class inside of a main function.
+* You can use the `TopologyBuilder` class inside of a main function.
 
     Here's an example:
 
@@ -68,7 +68,7 @@
         builder.build_and_submit()
     ```
 
-* You can subclass the [`Topology`](/api/python/topology.m.html#heronpy.topology.Topology) class.
+* You can subclass the `Topology` class.
 
     Here's an example:
 
@@ -82,9 +82,9 @@
         my_bolt = CountBolt.spec(par=3, inputs={spout: Grouping.fields("word")})
     ```
 
-## Defining topologies using the [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder) class
+## Defining topologies using the `TopologyBuilder` class
 
-If you create a Python topology using a [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder), you need to instantiate a `TopologyBuilder` inside of a standard Python main function, like this:
+If you create a Python topology using a `TopologyBuilder`, you need to instantiate a `TopologyBuilder` inside of a standard Python main function, like this:
 
 ```python
 from heronpy.api.topology import TopologyBuilder
@@ -94,7 +94,7 @@
     builder = TopologyBuilder("MyTopology")
 ```
 
-Once you've created a `TopologyBuilder` object, you can add bolts using the [`add_bolt`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder.add_bolt) method and spouts using the [`add_spout`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder.add_spout) method. Here's an example:
+Once you've created a `TopologyBuilder` object, you can add bolts using the `add_bolt` method and spouts using the `add_spout` method. Here's an example:
 
 ```python
 builder = TopologyBuilder("MyTopology")
@@ -102,14 +102,14 @@
 builder.add_spout("my_spout", WordSpout, par=2)
 ```
 
-Both the `add_bolt` and `add_spout` methods return the corresponding [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec) object.
+Both the `add_bolt` and `add_spout` methods return the corresponding `HeronComponentSpec1 object.
 
 The `add_bolt` method takes four arguments and an optional `config` parameter:
 
 Argument | Data type | Description | Default
 :--------|:----------|:------------|:-------
 `name` | `str` | The unique identifier assigned to this bolt | |
-`bolt_cls` | class | The subclass of [`Bolt`](/api/python/bolt/bolt.m.html#heronpy.bolt.bolt.Bolt) that defines this bolt | |
+`bolt_cls` | class | The subclass of `Bolt` that defines this bolt | |
 `par` | `int` | The number of instances of this bolt in the topology | |
 `config` | `dict` | Specifies the configuration for this spout | `None`
 
@@ -118,14 +118,14 @@
 Argument | Data type | Description | Default
 :--------|:----------|:------------|:-------
 `name` | `str` | The unique identifier assigned to this spout | |
-`spout_cls` | class | The subclass of [`Spout`](/api/python/spout/spout.m.html#heronpy.spout.spout.Spout) that defines this spout | |
+`spout_cls` | class | The subclass of `Spout` that defines this spout | |
 `par` | `int` | The number of instances of this spout in the topology | |
-`inputs` | `dict` or `list` | Either a `dict` mapping from [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec) to [`Grouping`](/api/python/stream.m.html#heronpy.stream.Grouping) *or* a list of [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec)s, in which case the [`shuffle`](/api/python/stream.m.html#heronpy.stream.Grouping.SHUFFLE) grouping is used
+`inputs` | `dict` or `list` | Either a `dict` mapping from `HeronComponentSpec` to `Grouping` *or* a list of `HeronComponentSpec`, in which case the `shuffle` grouping is used
 `config` | `dict` | Specifies the configuration for this spout | `None`
 
 ### Example
 
-The following is an example implementation of a word count topology in Python that subclasses [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder).
+The following is an example implementation of a word count topology in Python that subclasses `TopologyBuilder`.
 
 ```python
 from your_spout import WordSpout
@@ -149,7 +149,7 @@
 
 ### Topology-wide configuration
 
-If you're building a Python topology using a `TopologyBuilder`, you can specify configuration for the topology using the [`set_config`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder.set_config) method. A topology's config is a `dict` in which the keys are a series constants from the [`api_constants`](/api/python/api_constants.m.html) module and values are configuration values for those parameters.
+If you're building a Python topology using a `TopologyBuilder`, you can specify configuration for the topology using the `set_config` method. A topology's config is a `dict` in which the keys are a series constants from the `api_constants` module and values are configuration values for those parameters.
 
 Here's an example:
 
@@ -171,7 +171,7 @@
 
 If you want to [submit](../../../operators/heron-cli#submitting-a-topology) Python topologies to a Heron cluster, they need to be packaged as a [PEX](https://pex.readthedocs.io/en/stable/whatispex.html) file. In order to produce PEX files, we recommend using a build tool like [Pants](http://www.pantsbuild.org/python_readme.html) or [Bazel](https://github.com/benley/bazel_rules_pex).
 
-If you defined your topology by subclassing the [`TopologyBuilder`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder) class and built a `word_count.pex` file for that topology in the `~/topology` folder. You can submit the topology to a cluster called `local` like this:
+If you defined your topology by subclassing the `TopologyBuilder` class and built a `word_count.pex` file for that topology in the `~/topology` folder. You can submit the topology to a cluster called `local` like this:
 
 ```bash
 $ heron submit local \
@@ -185,9 +185,9 @@
 > * See [this repo](https://github.com/streamlio/pants-dev-environment) for an example of a Heron topology written in Python and deployable as a Pants-packaged PEX.
 > * See [this repo](https://github.com/streamlio/bazel-dev-environment) for an example of a Heron topology written in Python and deployable as a Bazel-packaged PEX.
 
-## Defining a topology by subclassing the [`Topology`](/api/python/topology.m.html#heronpy.topology.Topology) class
+## Defining a topology by subclassing the `Topology` class
 
-If you create a Python topology by subclassing the [`Topology`](/api/python/topology.m.html#heronpy.topology.Topology) class, you need to create a new topology class, like this:
+If you create a Python topology by subclassing the `Topology` class, you need to create a new topology class, like this:
 
 ```python
 from my_spout import WordSpout
@@ -203,13 +203,13 @@
     my_bolt = CountBolt.spec(par=3, inputs=my_bolt_inputs)
 ```
 
-All you need to do is place [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec)s as the class attributes
+All you need to do is place `HeronComponentSpec`s as the class attributes
 of your topology class, which are returned by the `spec()` method of
 your spout or bolt class. You do *not* need to run a `build` method or anything like that; the `Topology` class will automatically detect which spouts and bolts are included in the topology.
 
 > If you use this method to define a new Python topology, you do *not* need to have a main function.
 
-For bolts, the [`spec`](/api/python/bolt/bolt.m.html#heronpy.bolt.bolt.Bolt.spec) method for spouts takes three optional arguments::
+For bolts, the `spec` method for spouts takes three optional arguments::
 
 Argument | Data type | Description | Default
 :--------|:----------|:------------|:-------
@@ -218,12 +218,12 @@
 `config` | `dict` | Specifies the configuration for this bolt | `None`
 
 
-For spouts, the [`spec`](/api/python/spout/spout.m.html#heronpy.spout.spout.Spout.spec) method takes four optional arguments:
+For spouts, the `spec` method takes four optional arguments:
 
 Argument | Data type | Description | Default
 :--------|:----------|:------------|:-------
 `name` | `str` | The unique identifier assigned to this spout or `None` if you want to use the variable name of the return `HeronComponentSpec` as the unique identifier for this spout | `None` |
-`inputs` | `dict` or `list` | Either a `dict` mapping from [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec) to [`Grouping`](/api/python/stream.m.html#heronpy.stream.Grouping) *or* a list of [`HeronComponentSpec`](/api/python/component/component_spec.m.html#heronpy.component.component_spec.HeronComponentSpec)s, in which case the [`shuffle`](/api/python/stream.m.html#heronpy.stream.Grouping.SHUFFLE) grouping is used
+`inputs` | `dict` or `list` | Either a `dict` mapping from `HeronComponentSpec`to `Grouping` *or* a list of `HeronComponentSpec`s, in which case the `shuffle` grouping is used
 `par` | `int` | The number of instances of this spout in the topology | `1` |
 `config` | `dict` | Specifies the configuration for this spout | `None`
 
@@ -246,7 +246,7 @@
 
 ### Launching
 
-If you defined your topology by subclassing the [`Topology`](/api/python/topology.m.html#heronpy.topology.Topology) class,
+If you defined your topology by subclassing the `Topology` class,
 your main Python file should *not* contain a main method. You will, however, need to instruct Heron which class contains your topology definition.
 
 Let's say that you've defined a topology by subclassing `Topology` and built a PEX stored in `~/topology/dist/word_count.pex`. The class containing your topology definition is `topology.word_count.WordCount`. You can submit the topology to a cluster called `local` like this:
@@ -260,7 +260,7 @@
 
 ### Topology-wide configuration
 
-If you're building a Python topology by subclassing `Topology`, you can specify configuration for the topology using the [`set_config`](/api/python/topology.m.html#heronpy.topology.TopologyBuilder.set_config) method. A topology's config is a `dict` in which the keys are a series constants from the [`api_constants`](/api/python/api_constants.m.html) module and values are configuration values for those parameters.
+If you're building a Python topology by subclassing `Topology`, you can specify configuration for the topology using the `set_config` method. A topology's config is a `dict` in which the keys are a series constants from the `api_constants` module and values are configuration values for those parameters.
 
 Here's an example:
 
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-simulator-mode.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-simulator-mode.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/guides-simulator-mode.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-simulator-mode.md
index 43c86a0..b5ff05c 100644
--- a/website2/website/versioned_docs/version-0.20.0/guides-simulator-mode.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-simulator-mode.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-guides-simulator-mode
+id: version-0.20.0-incubating-guides-simulator-mode
 title: Simulator Mode
 sidebar_label: Simulator Mode
 original_id: guides-simulator-mode
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-topology-tuning.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-topology-tuning.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/guides-topology-tuning.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-topology-tuning.md
index f350ec9..53932f0 100644
--- a/website2/website/versioned_docs/version-0.20.0/guides-topology-tuning.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-topology-tuning.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-guides-topology-tuning
+id: version-0.20.0-incubating-guides-topology-tuning
 title: Topology Tuning Guide
 sidebar_label: Topology Tuning Guide
 original_id: guides-topology-tuning
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-troubeshooting-guide.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-troubeshooting-guide.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/guides-troubeshooting-guide.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-troubeshooting-guide.md
index 5e978cc..363748f 100644
--- a/website2/website/versioned_docs/version-0.20.0/guides-troubeshooting-guide.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-troubeshooting-guide.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-guides-troubeshooting-guide
+id: version-0.20.0-incubating-guides-troubeshooting-guide
 title: Topology Troubleshooting Guide
 sidebar_label: Topology Troubleshooting Guide
 original_id: guides-troubeshooting-guide
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-tuple-serialization.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-tuple-serialization.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/guides-tuple-serialization.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-tuple-serialization.md
index 7e8819c..cee53ae 100644
--- a/website2/website/versioned_docs/version-0.20.0/guides-tuple-serialization.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-tuple-serialization.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-guides-tuple-serialization
+id: version-0.20.0-incubating-guides-tuple-serialization
 title: Tuple Serialization
 sidebar_label: Tuple Serialization
 original_id: guides-tuple-serialization
diff --git a/website2/website/versioned_docs/version-0.20.1/guides-ui-guide.md b/website2/website/versioned_docs/version-0.20.0-incubating/guides-ui-guide.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.1/guides-ui-guide.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/guides-ui-guide.md
index 6e85af0..3a02204 100644
--- a/website2/website/versioned_docs/version-0.20.1/guides-ui-guide.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/guides-ui-guide.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.1-guides-ui-guide
+id: version-0.20.0-incubating-guides-ui-guide
 title: Heron UI Guide
 sidebar_label: Heron UI Guide
 original_id: guides-ui-guide
diff --git a/website2/website/versioned_docs/version-0.20.0/heron-architecture.md b/website2/website/versioned_docs/version-0.20.0-incubating/heron-architecture.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/heron-architecture.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/heron-architecture.md
index 1b4c025..a4847f9 100644
--- a/website2/website/versioned_docs/version-0.20.0/heron-architecture.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/heron-architecture.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-heron-architecture
+id: version-0.20.0-incubating-heron-architecture
 title: Heron Architecture
 sidebar_label: Heron Architecture
 original_id: heron-architecture
diff --git a/website2/website/versioned_docs/version-0.20.0/heron-delivery-semantics.md b/website2/website/versioned_docs/version-0.20.0-incubating/heron-delivery-semantics.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/heron-delivery-semantics.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/heron-delivery-semantics.md
index a2a2f66..2a9adb0 100644
--- a/website2/website/versioned_docs/version-0.20.0/heron-delivery-semantics.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/heron-delivery-semantics.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-heron-delivery-semantics
+id: version-0.20.0-incubating-heron-delivery-semantics
 title: Heron Delivery Semantics
 sidebar_label: Heron Delivery Semantics
 original_id: heron-delivery-semantics
diff --git a/website2/website/versioned_docs/version-0.20.0/heron-design-goals.md b/website2/website/versioned_docs/version-0.20.0-incubating/heron-design-goals.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/heron-design-goals.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/heron-design-goals.md
index 7c4e7e6..3d22779 100644
--- a/website2/website/versioned_docs/version-0.20.0/heron-design-goals.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/heron-design-goals.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-heron-design-goals
+id: version-0.20.0-incubating-heron-design-goals
 title: Heron Design Goals
 sidebar_label: Heron Design Goals
 original_id: heron-design-goals
diff --git a/website2/website/versioned_docs/version-0.20.0/heron-resources-resources.md b/website2/website/versioned_docs/version-0.20.0-incubating/heron-resources-resources.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/heron-resources-resources.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/heron-resources-resources.md
index c0abdae..adcd299 100644
--- a/website2/website/versioned_docs/version-0.20.0/heron-resources-resources.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/heron-resources-resources.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-heron-resources-resources
+id: version-0.20.0-incubating-heron-resources-resources
 title: Heron Resources
 sidebar_label: Heron Resources
 original_id: heron-resources-resources
diff --git a/website2/website/versioned_docs/version-0.20.0/heron-streamlet-concepts.md b/website2/website/versioned_docs/version-0.20.0-incubating/heron-streamlet-concepts.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/heron-streamlet-concepts.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/heron-streamlet-concepts.md
index 2294caa..d3b10d4 100644
--- a/website2/website/versioned_docs/version-0.20.0/heron-streamlet-concepts.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/heron-streamlet-concepts.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-heron-streamlet-concepts
+id: version-0.20.0-incubating-heron-streamlet-concepts
 title: Heron Streamlets
 sidebar_label: Heron Streamlets
 original_id: heron-streamlet-concepts
diff --git a/website2/website/versioned_docs/version-0.20.0/heron-topology-concepts.md b/website2/website/versioned_docs/version-0.20.0-incubating/heron-topology-concepts.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/heron-topology-concepts.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/heron-topology-concepts.md
index 873e005..4534a41 100644
--- a/website2/website/versioned_docs/version-0.20.0/heron-topology-concepts.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/heron-topology-concepts.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-heron-topology-concepts
+id: version-0.20.0-incubating-heron-topology-concepts
 title: Heron Topologies
 sidebar_label: Heron Topologies
 original_id: heron-topology-concepts
diff --git a/website2/website/versioned_docs/version-0.20.0/observability-graphite.md b/website2/website/versioned_docs/version-0.20.0-incubating/observability-graphite.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/observability-graphite.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/observability-graphite.md
index 60fceff..addaf5a 100644
--- a/website2/website/versioned_docs/version-0.20.0/observability-graphite.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/observability-graphite.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-observability-graphite
+id: version-0.20.0-incubating-observability-graphite
 title: Observability with Graphite
 sidebar_label: Graphite
 original_id: observability-graphite
diff --git a/website2/website/versioned_docs/version-0.20.0/observability-prometheus.md b/website2/website/versioned_docs/version-0.20.0-incubating/observability-prometheus.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/observability-prometheus.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/observability-prometheus.md
index 6457cbd..067aa1d 100644
--- a/website2/website/versioned_docs/version-0.20.0/observability-prometheus.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/observability-prometheus.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-observability-prometheus
+id: version-0.20.0-incubating-observability-prometheus
 title: Observability with Prometheus
 sidebar_label: Prometheus
 original_id: observability-prometheus
diff --git a/website2/website/versioned_docs/version-0.20.0/observability-scribe.md b/website2/website/versioned_docs/version-0.20.0-incubating/observability-scribe.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/observability-scribe.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/observability-scribe.md
index 3e091db..7e47983 100644
--- a/website2/website/versioned_docs/version-0.20.0/observability-scribe.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/observability-scribe.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-observability-scribe
+id: version-0.20.0-incubating-observability-scribe
 title: Observability with Scribe
 sidebar_label: Scribe
 original_id: observability-scribe
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-aurora-cluster.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-aurora-cluster.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-aurora-cluster.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-aurora-cluster.md
index fd777bc..20aee7a 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-aurora-cluster.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-aurora-cluster.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-aurora-cluster
+id: version-0.20.0-incubating-schedulers-aurora-cluster
 title: Aurora Cluster
 sidebar_label: Aurora Cluster
 original_id: schedulers-aurora-cluster
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-aurora-local.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-aurora-local.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-aurora-local.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-aurora-local.md
index 28b4ade..aa3f700 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-aurora-local.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-aurora-local.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-aurora-local
+id: version-0.20.0-incubating-schedulers-aurora-local
 title: Setting up Heron with Aurora Cluster Locally on Linux
 sidebar_label: Aurora Locally
 original_id: schedulers-aurora-local
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-k8s-by-hand.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-k8s-by-hand.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
index 13191fa9..095a1c3 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-k8s-by-hand.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-k8s-by-hand
+id: version-0.20.0-incubating-schedulers-k8s-by-hand
 title: Kubernetes by hand
 sidebar_label: Kubernetes by hand
 original_id: schedulers-k8s-by-hand
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-k8s-with-helm.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-with-helm.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-k8s-with-helm.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-with-helm.md
index 2923838..adbda6b 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-k8s-with-helm.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-with-helm.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-k8s-with-helm
+id: version-0.20.0-incubating-schedulers-k8s-with-helm
 title: Kubernetes with Helm
 sidebar_label: Kubernetes with Helm
 original_id: schedulers-k8s-with-helm
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-local.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-local.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-local.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-local.md
index 18f434b..617b1f3 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-local.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-local.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-local
+id: version-0.20.0-incubating-schedulers-local
 title: Local Cluster
 sidebar_label: Local Cluster
 original_id: schedulers-local
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-mesos-local-mac.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-mesos-local-mac.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-mesos-local-mac.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-mesos-local-mac.md
index c3be0f0..a5f85cf 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-mesos-local-mac.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-mesos-local-mac.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-mesos-local-mac
+id: version-0.20.0-incubating-schedulers-mesos-local-mac
 title: Setting up Heron with Mesos Cluster Locally on Mac
 sidebar_label: Mesos Cluster Locally
 original_id: schedulers-mesos-local-mac
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-nomad.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-nomad.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-nomad.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-nomad.md
index bf2496a..7557500 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-nomad.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-nomad.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-nomad
+id: version-0.20.0-incubating-schedulers-nomad
 title: Nomad
 sidebar_label: Nomad
 original_id: schedulers-nomad
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-slurm.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-slurm.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-slurm.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-slurm.md
index 1267887..87f01fe 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-slurm.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-slurm.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-slurm
+id: version-0.20.0-incubating-schedulers-slurm
 title: Slurm Cluster (Experimental)
 sidebar_label: Slurm Cluster
 original_id: schedulers-slurm
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-standalone.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-standalone.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-standalone.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-standalone.md
index a6506f3..4a2d058 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-standalone.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-standalone.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-standalone
+id: version-0.20.0-incubating-schedulers-standalone
 title: Heron Multi-node Standalone Cluster
 sidebar_label: Heron Multi-node Standalone Cluster
 original_id: schedulers-standalone
diff --git a/website2/website/versioned_docs/version-0.20.0/schedulers-yarn.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-yarn.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/schedulers-yarn.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/schedulers-yarn.md
index c38503d..a216363 100644
--- a/website2/website/versioned_docs/version-0.20.0/schedulers-yarn.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-yarn.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-schedulers-yarn
+id: version-0.20.0-incubating-schedulers-yarn
 title: Apache Hadoop YARN Cluster (Experimental)
 sidebar_label: YARN Cluster
 original_id: schedulers-yarn
diff --git a/website2/website/versioned_docs/version-0.20.0/state-managers-local-fs.md b/website2/website/versioned_docs/version-0.20.0-incubating/state-managers-local-fs.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/state-managers-local-fs.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/state-managers-local-fs.md
index 990fda6..265c88f 100644
--- a/website2/website/versioned_docs/version-0.20.0/state-managers-local-fs.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/state-managers-local-fs.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-state-managers-local-fs
+id: version-0.20.0-incubating-state-managers-local-fs
 title: Local File System
 sidebar_label: Local File System
 original_id: state-managers-local-fs
diff --git a/website2/website/versioned_docs/version-0.20.0/state-managers-zookeeper.md b/website2/website/versioned_docs/version-0.20.0-incubating/state-managers-zookeeper.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/state-managers-zookeeper.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/state-managers-zookeeper.md
index 12fb108..cfde183 100644
--- a/website2/website/versioned_docs/version-0.20.0/state-managers-zookeeper.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/state-managers-zookeeper.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-state-managers-zookeeper
+id: version-0.20.0-incubating-state-managers-zookeeper
 title: Zookeeper
 sidebar_label: Zookeeper
 original_id: state-managers-zookeeper
diff --git a/website2/website/versioned_docs/version-0.20.0/topology-development-eco-api.md b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-eco-api.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/topology-development-eco-api.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/topology-development-eco-api.md
index 5caa6cf..d8f9036 100644
--- a/website2/website/versioned_docs/version-0.20.0/topology-development-eco-api.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-eco-api.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-topology-development-eco-api
+id: version-0.20.0-incubating-topology-development-eco-api
 title: The ECO API for Java
 sidebar_label: The ECO API for Java
 original_id: topology-development-eco-api
diff --git a/website2/website/versioned_docs/version-0.20.0/topology-development-streamlet-api.md b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-streamlet-api.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/topology-development-streamlet-api.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/topology-development-streamlet-api.md
index 74c649a..aefdcef 100644
--- a/website2/website/versioned_docs/version-0.20.0/topology-development-streamlet-api.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-streamlet-api.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-topology-development-streamlet-api
+id: version-0.20.0-incubating-topology-development-streamlet-api
 title: The Heron Streamlet API for Java
 sidebar_label: The Heron Streamlet API for Java
 original_id: topology-development-streamlet-api
@@ -356,8 +356,6 @@
 
 ### Join operations
 
-> For a more in-depth conceptual discussion of joins, see the [Heron Streamlet API](../../../concepts/streamlet-api#join-operations) doc.
-
 Join operations unify two streamlets *on a key* (join operations thus require KV streamlets). Each `KeyValue` object in a streamlet has, by definition, a key. When a join operation is added to a processing graph, 
 
 ```java
diff --git a/website2/website/versioned_docs/version-0.20.0/topology-development-streamlet-scala.md b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-streamlet-scala.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/topology-development-streamlet-scala.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/topology-development-streamlet-scala.md
index d8fec7c..a871b5d 100644
--- a/website2/website/versioned_docs/version-0.20.0/topology-development-streamlet-scala.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-streamlet-scala.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-topology-development-streamlet-scala
+id: version-0.20.0-incubating-topology-development-streamlet-scala
 title: The Heron Streamlet API for Scala
 sidebar_label: The Heron Streamlet API for Scala
 original_id: topology-development-streamlet-scala
diff --git a/website2/website/versioned_docs/version-0.20.0/topology-development-topology-api-java.md b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-topology-api-java.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/topology-development-topology-api-java.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/topology-development-topology-api-java.md
index 109f5a9..5508687 100644
--- a/website2/website/versioned_docs/version-0.20.0/topology-development-topology-api-java.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-topology-api-java.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-topology-development-topology-api-java
+id: version-0.20.0-incubating-topology-development-topology-api-java
 title: The Heron Topology API for Java
 sidebar_label: The Heron Topology API for Java
 original_id: topology-development-topology-api-java
@@ -47,7 +47,7 @@
 <dependency>
     <groupId>org.apache.heron</groupId>
     <artifactId>heron-api</artifactId>
-    <version>{{< heronVersion >}}</version>
+    <version>{{heron:version}}</version>
 </dependency>
 ```
 
diff --git a/website2/website/versioned_docs/version-0.20.0/topology-development-topology-api-python.md b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-topology-api-python.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/topology-development-topology-api-python.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/topology-development-topology-api-python.md
index 3ba8eca..7a3e77f 100644
--- a/website2/website/versioned_docs/version-0.20.0/topology-development-topology-api-python.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/topology-development-topology-api-python.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-topology-development-topology-api-python
+id: version-0.20.0-incubating-topology-development-topology-api-python
 title: The Heron Topology API for Python
 sidebar_label: The Heron Topology API for Python
 original_id: topology-development-topology-api-python
@@ -21,7 +21,7 @@
     under the License.
 -->
 
-> The current version of `heronpy` is [{{% heronpyVersion %}}](https://pypi.python.org/pypi/heronpy/{{% heronpyVersion %}}).
+> The current version of `heronpy` is [{{heron:version}}](https://pypi.python.org/pypi/heronpy/{{heron:version}}).
 
 Support for developing Heron topologies in Python is provided by a Python library called [`heronpy`](https://pypi.python.org/pypi/heronpy).
 
diff --git a/website2/website/versioned_docs/version-0.20.0/uploaders-amazon-s3.md b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-amazon-s3.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/uploaders-amazon-s3.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/uploaders-amazon-s3.md
index 0778042..90a5502 100644
--- a/website2/website/versioned_docs/version-0.20.0/uploaders-amazon-s3.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-amazon-s3.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-uploaders-amazon-s3
+id: version-0.20.0-incubating-uploaders-amazon-s3
 title: Amazon S3
 sidebar_label: Amazon S3
 original_id: uploaders-amazon-s3
diff --git a/website2/website/versioned_docs/version-0.20.0/uploaders-hdfs.md b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-hdfs.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/uploaders-hdfs.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/uploaders-hdfs.md
index f221c13..d402213 100644
--- a/website2/website/versioned_docs/version-0.20.0/uploaders-hdfs.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-hdfs.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-uploaders-hdfs
+id: version-0.20.0-incubating-uploaders-hdfs
 title: HDFS
 sidebar_label: HDFS
 original_id: uploaders-hdfs
diff --git a/website2/website/versioned_docs/version-0.20.0/uploaders-http.md b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-http.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/uploaders-http.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/uploaders-http.md
index 5871627..75f2c84 100644
--- a/website2/website/versioned_docs/version-0.20.0/uploaders-http.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-http.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-uploaders-http
+id: version-0.20.0-incubating-uploaders-http
 title: HTTP
 sidebar_label: HTTP
 original_id: uploaders-http
diff --git a/website2/website/versioned_docs/version-0.20.0/uploaders-local-fs.md b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-local-fs.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/uploaders-local-fs.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/uploaders-local-fs.md
index c32ce7f..fbd911b 100644
--- a/website2/website/versioned_docs/version-0.20.0/uploaders-local-fs.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-local-fs.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-uploaders-local-fs
+id: version-0.20.0-incubating-uploaders-local-fs
 title: Local File System
 sidebar_label: Local File System
 original_id: uploaders-local-fs
diff --git a/website2/website/versioned_docs/version-0.20.0/uploaders-scp.md b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-scp.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/uploaders-scp.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/uploaders-scp.md
index 140a59b..5013154 100644
--- a/website2/website/versioned_docs/version-0.20.0/uploaders-scp.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/uploaders-scp.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-uploaders-scp
+id: version-0.20.0-incubating-uploaders-scp
 title: Secure Copy (SCP)
 sidebar_label: Secure Copy (SCP)
 original_id: uploaders-scp
diff --git a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-cli.md b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-cli.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/user-manuals-heron-cli.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-cli.md
index 5c0f714..1f8de7f 100644
--- a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-cli.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-cli.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-user-manuals-heron-cli
+id: version-0.20.0-incubating-user-manuals-heron-cli
 title: Managing Topologies with Heron CLI
 sidebar_label: Heron Client
 original_id: user-manuals-heron-cli
diff --git a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-explorer.md b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-explorer.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/user-manuals-heron-explorer.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-explorer.md
index 6930e8d..093f8ec 100644
--- a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-explorer.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-explorer.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-user-manuals-heron-explorer
+id: version-0.20.0-incubating-user-manuals-heron-explorer
 title: Heron Explorer
 sidebar_label: Heron Explorer
 original_id: user-manuals-heron-explorer
diff --git a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-shell.md b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-shell.md
similarity index 97%
rename from website2/website/versioned_docs/version-0.20.0/user-manuals-heron-shell.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-shell.md
index 2d61369..c2509e5 100644
--- a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-shell.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-shell.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-user-manuals-heron-shell
+id: version-0.20.0-incubating-user-manuals-heron-shell
 title: Heron Shell
 sidebar_label: Heron Shell
 original_id: user-manuals-heron-shell
diff --git a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-tracker-runbook.md b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-tracker-runbook.md
similarity index 98%
rename from website2/website/versioned_docs/version-0.20.0/user-manuals-heron-tracker-runbook.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-tracker-runbook.md
index 4ec7d3e..7fc7473 100644
--- a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-tracker-runbook.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-tracker-runbook.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-user-manuals-heron-tracker-runbook
+id: version-0.20.0-incubating-user-manuals-heron-tracker-runbook
 title: Heron Tracker
 sidebar_label: Heron Tracker Runbook
 original_id: user-manuals-heron-tracker-runbook
diff --git a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-ui.md b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-ui.md
similarity index 94%
rename from website2/website/versioned_docs/version-0.20.0/user-manuals-heron-ui.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-ui.md
index a5a88ce..d379772 100644
--- a/website2/website/versioned_docs/version-0.20.0/user-manuals-heron-ui.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-heron-ui.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-user-manuals-heron-ui-runbook
+id: version-0.20.0-incubating-user-manuals-heron-ui-runbook
 title: Heron UI Runbook
 sidebar_label: Heron UI Runbook
 original_id: user-manuals-heron-ui-runbook
@@ -53,7 +53,7 @@
 * `--tracker_url` - The base url for tracker. All the information about the
   topologies is fetched from tracker. Default url is `http://localhost:8888`.
 * `--address` - Address to listen; Default address is `0.0.0.0`
-* `--base_url` - The base url path if operating behind proxy; Default is [`None`](https://github.com/apache/incubator-heron/blob/5ee2490c025c7684c097962cf6d25f54ead73cf4/heron/tools/ui/src/python/main.py#L135)
+* `--base_url` - The base url path if operating behind proxy; Default is [`None`](https://github.com/apache/incubator-heron/blob/master/heron/tools/ui/src/python/main.py#L145)
 
 ```bash
 $ heron-ui
diff --git a/website2/website/versioned_docs/version-0.20.0/user-manuals-tracker-rest.md b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-tracker-rest.md
similarity index 99%
rename from website2/website/versioned_docs/version-0.20.0/user-manuals-tracker-rest.md
rename to website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-tracker-rest.md
index 135d73c..7d4a970 100644
--- a/website2/website/versioned_docs/version-0.20.0/user-manuals-tracker-rest.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/user-manuals-tracker-rest.md
@@ -1,5 +1,5 @@
 ---
-id: version-0.20.0-user-manuals-tracker-rest
+id: version-0.20.0-incubating-user-manuals-tracker-rest
 title: Heron Tracker REST API
 sidebar_label: Heron Tracker REST API
 original_id: user-manuals-tracker-rest
diff --git a/website2/website/versioned_docs/version-0.20.0/guides-ui-guide.md b/website2/website/versioned_docs/version-0.20.0/guides-ui-guide.md
deleted file mode 100644
index 30a082b..0000000
--- a/website2/website/versioned_docs/version-0.20.0/guides-ui-guide.md
+++ /dev/null
@@ -1,206 +0,0 @@
----
-id: version-0.20.0-guides-ui-guide
-title: Heron UI Guide
-sidebar_label: Heron UI Guide
-original_id: guides-ui-guide
----
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
--->
-
-### Overview
-
-This guide describes how to make best use of Heron UI for monitoring and
-debugging topologies.
-
-The UI provides a lot of information about a topology or a part of it quickly,
-thus reducing debugging time considerably. Some of these features are
-listed below. A complete set of features can be found in following sections.
-
-1. See logical plan of a topology
-2. See physical plan of a topology
-3. Configs of a topology
-4. See some basic metrics for each of the instances and components
-5. Links to get logs, memory histogram, jstack, heapdump and exceptions of
-   a particular instance
-
-#### Topologies Page
-
-Heron UI is a user interface that uses the Heron Tracker to display detailed, colorful visual representations of topologies, including the logical and physical plan for each topology. 
-
-Start the Heron tracker using `heron-tracker &` which uses default heron_tracker.yaml configuration file. It's a centralized gateway for cluster-wide information about topologies, including which topologies are running, being launched, being killed, etc. It exposes Json Restful endpoint and relies on Zookeeper nodes.
-
-Launc the Heron UI by the command:
-
-```bash
-heron-ui &
-```
-
-By default Heron UI will be started at `http://localhost:8888`
-
-Below is the home page of Heron UI.
-
-The following information or actions can be found on this page.
-
-1. List of all topologies
-2. Number of topologies filtered after search (total by default)
-3. A topology's overview
-4. Filter the topologies using `cluster`
-5. Filter the topologies using string matching in names, clusters, environs,
-   roles, versions, or submitters
-6. Sort the topologies based on a particular column
-7. Click on the topology name to find more info about the topology
-
-![All topologies](assets/all-topologies.png)
-
-#### Topology Page
-
-Below is the main page to monitor a topology.
-
-1. Name of the topology
-2. [Logical plan](heron-topology-concepts#logical-plan) of the topology
-3. [Physical plan](heron-topology-concepts#physical-plan) of the topology
-4. Health metrics for the topology
-5. General info about the topology
-6. General metrics for the topology
-7. Click components for more details
-8. Click instances for more details
-9. Click on aggregated metrics to color instances by metrics
-10. Link to topology level configs
-11. Link to job page  only if the scheduler provides a link
-   <!-- (TODO: Link to this guide) -->
-12. Link to viz dashboard for this topology only if Tracker is configured with
-   one. <!-- (TODO: Link to this configuration) -->
-
-![Topology1](assets/topology1.png)
-
-![Topology2](assets/topology2.png)
-
-Each node in logical plan can be clicked for more specific info about that
-component.
-
-1. Averaged or max metrics for all instances of this component
-2. Aggregated metrics for all instances of this component
-3. List of all instances and their aggregated metrics
-4. [Instance level operations](#instance-actions-pages), which are described in more details below
-
-![Topology Component](assets/topology-component.png)
-
-Clicking on an instance will highlight that instance in the list.
-
-1. Aggregated metrics are only for this instance
-2. Quick access to logs, exceptions and job pages for this instance
-3. Component counters are still aggregated for all instances
-4. The selected instance is highlighted
-
-![Topology Instance](assets/topology-instance.png)
-
-#### Aggregate Topology Metrics
-
-Selecting a metric will highlight the components and instances based on their
-health with respect to the metric, green being healthy, red indicating a problem.
-This is a quick way to find out which instances are having issues.
-
-![Topology Capacity](assets/topology-capacity.png)
-
-![Topology Failures](assets/topology-failures.png)
-
-#### Config Page
-
-These are the topology configurations <!-- (TODO: Add link to Topology
-Configurations) --> that your topology is configured with. Note that spout and
-bolt level configurations are not part of topology config.
-
-![Config](assets/config.png)
-
-#### <a name="instance-actions-pages">Instance Action Pages</a>
-
-These actions are available for all the instances. They are described in the
-next sections.
-
-![Instance Links](assets/topology-instance-links.png)
-
-#### Logs Page
-
-These are the logs generated by the selected instance. The whole logs file can
-also be downloaded.
-
-![Logs](assets/logs.png)
-
-#### Job Page
-
-Below is the directory view of the container. All instances from a container
-will point to the same job page. Following information is available on this page,
-amongst other things.
-
-1. The jar or tar file associated with this topology
-2. Logs for heron-executor <!-- TODO: Link heron-executor -->
-3. `log-files` folder which has instance logs, as well as `stream manager` or
-   `tmaster` logs.
-
-![Jobpage](assets/jobpage1.png)
-
-![Jobpage logfiles](assets/jobpage2-logfiles.png)
-
-#### Exceptions Page
-
-This page lists all exceptions logged by this instance. The exceptions are
-deduplicated, and for each exception, the page shows the number of times this
-exception occurred, the latest and the oldest occurance times.
-
-![Exceptions](assets/exceptions.png)
-
-#### PID Page
-
-This link can be used to find the process ID for an instance. Since each instance
-runs in its own JVM process, this will be unique for a host. The PID is also
-used for other tasks, such as getting jstack or heap dump for an instance.
-
-![PID](assets/pid.png)
-
-#### Jstack Page
-
-Click on this link to run the `jstack` command on the host against the PID for
-the instance. The output of the command is printed on the page in the browser
-itself.
-
-![Jstack](assets/jstack.png)
-
-#### Memory Histogram Page
-
-Click on this link to run the `jmap -histo` command on the host against the PID
-for the instance. The output of the command is printed on the page in the
-browser itself.
-
-![Histo](assets/histo.png)
-
-#### Memory Dump page
-
-Click on this link to run the `jmap -dump:format=b,file=/tmp/heap.bin` command
-agaist the PID for the instance. Follow the instructions on the page to download
-the heap dump file. This link does not download the file.
-
-![Memory Dump](assets/dump.png)
-
-#### Kill Heron UI server
-
-To kill Heron UI server run the following command:
-
-```bash
-kill $(pgrep -f heron-ui)
-```
-
-To stop all the Heron tools, kill the Heron Tracker as well using `kill $(pgrep -f heron-tracker)`.
diff --git a/website2/website/versioned_sidebars/version-0.20.0-incubating-sidebars.json b/website2/website/versioned_sidebars/version-0.20.0-incubating-sidebars.json
new file mode 100644
index 0000000..81d7bef
--- /dev/null
+++ b/website2/website/versioned_sidebars/version-0.20.0-incubating-sidebars.json
@@ -0,0 +1,101 @@
+{
+  "version-0.20.0-incubating-docs": {
+    "Getting Started": [
+      "version-0.20.0-incubating-getting-started-local-single-node",
+      "version-0.20.0-incubating-getting-started-migrate-storm-topologies",
+      "version-0.20.0-incubating-getting-started-troubleshooting-guide"
+    ],
+    "Deployment": [
+      "version-0.20.0-incubating-deployment-overview",
+      "version-0.20.0-incubating-deployment-configuration",
+      "version-0.20.0-incubating-deployment-api-server"
+    ],
+    "Topology Development APIs": [
+      "version-0.20.0-incubating-topology-development-streamlet-api",
+      "version-0.20.0-incubating-topology-development-eco-api",
+      "version-0.20.0-incubating-topology-development-topology-api-java",
+      "version-0.20.0-incubating-topology-development-topology-api-python",
+      "version-0.20.0-incubating-topology-development-streamlet-scala"
+    ],
+    "Client API Docs": [
+      "version-0.20.0-incubating-client-api-docs-overview"
+    ],
+    "Guides": [
+      "version-0.20.0-incubating-guides-effectively-once-java-topologies",
+      "version-0.20.0-incubating-guides-python-topologies",
+      "version-0.20.0-incubating-guides-data-model",
+      "version-0.20.0-incubating-guides-tuple-serialization",
+      "version-0.20.0-incubating-guides-ui-guide",
+      "version-0.20.0-incubating-guides-topology-tuning",
+      "version-0.20.0-incubating-guides-packing-algorithms",
+      "version-0.20.0-incubating-guides-simulator-mode",
+      "version-0.20.0-incubating-guides-troubeshooting-guide"
+    ],
+    "Heron Concepts": [
+      "version-0.20.0-incubating-heron-design-goals",
+      "version-0.20.0-incubating-heron-topology-concepts",
+      "version-0.20.0-incubating-heron-streamlet-concepts",
+      "version-0.20.0-incubating-heron-architecture",
+      "version-0.20.0-incubating-heron-delivery-semantics"
+    ],
+    "State Managers": [
+      "version-0.20.0-incubating-state-managers-zookeeper",
+      "version-0.20.0-incubating-state-managers-local-fs"
+    ],
+    "Uploaders": [
+      "version-0.20.0-incubating-uploaders-local-fs",
+      "version-0.20.0-incubating-uploaders-hdfs",
+      "version-0.20.0-incubating-uploaders-http",
+      "version-0.20.0-incubating-uploaders-amazon-s3",
+      "version-0.20.0-incubating-uploaders-scp"
+    ],
+    "Schedulers": [
+      "version-0.20.0-incubating-schedulers-k8s-by-hand",
+      "version-0.20.0-incubating-schedulers-k8s-with-helm",
+      "version-0.20.0-incubating-schedulers-aurora-cluster",
+      "version-0.20.0-incubating-schedulers-aurora-local",
+      "version-0.20.0-incubating-schedulers-local",
+      "version-0.20.0-incubating-schedulers-standalone",
+      "version-0.20.0-incubating-schedulers-nomad",
+      "version-0.20.0-incubating-schedulers-mesos-local-mac",
+      "version-0.20.0-incubating-schedulers-slurm",
+      "version-0.20.0-incubating-schedulers-yarn"
+    ],
+    "Cluster Configuration": [
+      "version-0.20.0-incubating-cluster-config-overview",
+      "version-0.20.0-incubating-cluster-config-system-level",
+      "version-0.20.0-incubating-cluster-config-instance",
+      "version-0.20.0-incubating-cluster-config-metrics",
+      "version-0.20.0-incubating-cluster-config-stream",
+      "version-0.20.0-incubating-cluster-config-tmaster"
+    ],
+    "Observability": [
+      "version-0.20.0-incubating-observability-prometheus",
+      "version-0.20.0-incubating-observability-graphite",
+      "version-0.20.0-incubating-observability-scribe"
+    ],
+    "User Manuals": [
+      "version-0.20.0-incubating-user-manuals-heron-cli",
+      "version-0.20.0-incubating-user-manuals-heron-explorer",
+      "version-0.20.0-incubating-user-manuals-tracker-rest",
+      "version-0.20.0-incubating-user-manuals-heron-tracker-runbook",
+      "version-0.20.0-incubating-user-manuals-heron-ui-runbook",
+      "version-0.20.0-incubating-user-manuals-heron-shell"
+    ],
+    "Compiling": [
+      "version-0.20.0-incubating-compiling-overview",
+      "version-0.20.0-incubating-compiling-linux",
+      "version-0.20.0-incubating-compiling-osx",
+      "version-0.20.0-incubating-compiling-docker",
+      "version-0.20.0-incubating-compiling-running-tests",
+      "version-0.20.0-incubating-compiling-code-organization"
+    ],
+    "Extending Heron": [
+      "version-0.20.0-incubating-extending-heron-scheduler",
+      "version-0.20.0-incubating-extending-heron-metric-sink"
+    ],
+    "Heron Resources": [
+      "version-0.20.0-incubating-heron-resources-resources"
+    ]
+  }
+}
diff --git a/website2/website/versioned_sidebars/version-0.20.0-sidebars.json b/website2/website/versioned_sidebars/version-0.20.0-sidebars.json
deleted file mode 100644
index 089c9dc..0000000
--- a/website2/website/versioned_sidebars/version-0.20.0-sidebars.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "version-0.20.0-docs": {
-    "Getting Started": [
-      "version-0.20.0-getting-started-local-single-node",
-      "version-0.20.0-getting-started-migrate-storm-topologies",
-      "version-0.20.0-getting-started-troubleshooting-guide"
-    ],
-    "Deployment": [
-      "version-0.20.0-deployment-overview",
-      "version-0.20.0-deployment-configuration",
-      "version-0.20.0-deployment-api-server"
-    ],
-    "Topology Development APIs": [
-      "version-0.20.0-topology-development-streamlet-api",
-      "version-0.20.0-topology-development-eco-api",
-      "version-0.20.0-topology-development-topology-api-java",
-      "version-0.20.0-topology-development-topology-api-python",
-      "version-0.20.0-topology-development-streamlet-scala"
-    ],
-    "Client API Docs": [],
-    "Guides": [
-      "version-0.20.0-guides-effectively-once-java-topologies",
-      "version-0.20.0-guides-python-topologies",
-      "version-0.20.0-guides-data-model",
-      "version-0.20.0-guides-tuple-serialization",
-      "version-0.20.0-guides-ui-guide",
-      "version-0.20.0-guides-topology-tuning",
-      "version-0.20.0-guides-packing-algorithms",
-      "version-0.20.0-guides-simulator-mode",
-      "version-0.20.0-guides-troubeshooting-guide"
-    ],
-    "Heron Concepts": [
-      "version-0.20.0-heron-design-goals",
-      "version-0.20.0-heron-topology-concepts",
-      "version-0.20.0-heron-streamlet-concepts",
-      "version-0.20.0-heron-architecture",
-      "version-0.20.0-heron-delivery-semantics"
-    ],
-    "State Managers": [
-      "version-0.20.0-state-managers-zookeeper",
-      "version-0.20.0-state-managers-local-fs"
-    ],
-    "Uploaders": [
-      "version-0.20.0-uploaders-local-fs",
-      "version-0.20.0-uploaders-hdfs",
-      "version-0.20.0-uploaders-http",
-      "version-0.20.0-uploaders-amazon-s3",
-      "version-0.20.0-uploaders-scp"
-    ],
-    "Schedulers": [
-      "version-0.20.0-schedulers-k8s-by-hand",
-      "version-0.20.0-schedulers-k8s-with-helm",
-      "version-0.20.0-schedulers-aurora-cluster",
-      "version-0.20.0-schedulers-aurora-local",
-      "version-0.20.0-schedulers-local",
-      "version-0.20.0-schedulers-standalone",
-      "version-0.20.0-schedulers-nomad",
-      "version-0.20.0-schedulers-mesos-local-mac",
-      "version-0.20.0-schedulers-slurm",
-      "version-0.20.0-schedulers-yarn"
-    ],
-    "Cluster Configuration": [
-      "version-0.20.0-cluster-config-overview",
-      "version-0.20.0-cluster-config-system-level",
-      "version-0.20.0-cluster-config-instance",
-      "version-0.20.0-cluster-config-metrics",
-      "version-0.20.0-cluster-config-stream",
-      "version-0.20.0-cluster-config-tmaster"
-    ],
-    "Observability": [
-      "version-0.20.0-observability-prometheus",
-      "version-0.20.0-observability-graphite",
-      "version-0.20.0-observability-scribe"
-    ],
-    "User Manuals": [
-      "version-0.20.0-user-manuals-heron-cli",
-      "version-0.20.0-user-manuals-heron-explorer",
-      "version-0.20.0-user-manuals-tracker-rest",
-      "version-0.20.0-user-manuals-heron-tracker-runbook",
-      "version-0.20.0-user-manuals-heron-ui-runbook",
-      "version-0.20.0-user-manuals-heron-shell"
-    ],
-    "Compiling": [
-      "version-0.20.0-compiling-overview",
-      "version-0.20.0-compiling-linux",
-      "version-0.20.0-compiling-osx",
-      "version-0.20.0-compiling-docker",
-      "version-0.20.0-compiling-running-tests",
-      "version-0.20.0-compiling-code-organization"
-    ],
-    "Extending Heron": [
-      "version-0.20.0-extending-heron-scheduler",
-      "version-0.20.0-extending-heron-metric-sink"
-    ],
-    "Heron Resources": [
-      "version-0.20.0-heron-resources-resources"
-    ]
-  }
-}
diff --git a/website2/website/versions.json b/website2/website/versions.json
index 9da3c49..6a63039 100644
--- a/website2/website/versions.json
+++ b/website2/website/versions.json
@@ -1,4 +1,4 @@
 [
-  "0.20.1",
-  "0.20.0"
+  "0.20.1-incubating",
+  "0.20.0-incubating"
 ]