Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/storm-site into asfgit-site
diff --git a/Gemfile.lock b/Gemfile.lock
index 2250684..b949c38 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,4 +237,4 @@
redcarpet (~> 3.2, >= 3.2.3)
BUNDLED WITH
- 1.16.1
+ 2.1.0.pre.1
diff --git a/README.md b/README.md
index eaf17dc..839e6fc 100644
--- a/README.md
+++ b/README.md
@@ -29,9 +29,11 @@
You must first generate Javadoc for the new release. Check out the Storm repository from https://github.com/apache/storm, and check out the version of the code you are releasing.
+You must have already installed the storm-shaded-deps module, so please run `mvn clean install -pl storm-shaded-deps -am` if you haven't built Storm already.
+
In the Storm project root run
```
-mvn javadoc:aggregate -DreportOutputDirectory=./docs/ -DdestDir=javadocs -Dnotimestamp=true -P '!include-shaded-deps'
+mvn javadoc:aggregate -DreportOutputDirectory=./docs/ -DdestDir=javadocs -Dnotimestamp=true -pl '!storm-shaded-deps'
```
In the storm-site project, release documentation is placed under the releases directory named after the release version. See [below](#how-release-specific-docs-work) for details about release specific documentation.
diff --git a/releases/1.2.3/Setting-up-development-environment.md b/releases/1.2.3/Setting-up-development-environment.md
index bfa98a2..72e3472 100644
--- a/releases/1.2.3/Setting-up-development-environment.md
+++ b/releases/1.2.3/Setting-up-development-environment.md
@@ -5,7 +5,7 @@
---
This page outlines what you need to do to get a Storm development environment set up. In summary, the steps are:
-1. Download a [Storm release](..//downloads.html) , unpack it, and put the unpacked `bin/` directory on your PATH
+1. Download a [Storm release](../../downloads.html) , unpack it, and put the unpacked `bin/` directory on your PATH
2. To be able to start and stop topologies on a remote cluster, put the cluster information in `~/.storm/storm.yaml`
More detail on each of these steps is below.
diff --git a/releases/2.0.0/Setting-up-development-environment.md b/releases/2.0.0/Setting-up-development-environment.md
index bfa98a2..72e3472 100644
--- a/releases/2.0.0/Setting-up-development-environment.md
+++ b/releases/2.0.0/Setting-up-development-environment.md
@@ -5,7 +5,7 @@
---
This page outlines what you need to do to get a Storm development environment set up. In summary, the steps are:
-1. Download a [Storm release](..//downloads.html) , unpack it, and put the unpacked `bin/` directory on your PATH
+1. Download a [Storm release](../../downloads.html) , unpack it, and put the unpacked `bin/` directory on your PATH
2. To be able to start and stop topologies on a remote cluster, put the cluster information in `~/.storm/storm.yaml`
More detail on each of these steps is below.
