Merge branch 'master' into asf-site
diff --git a/Gemfile b/Gemfile
index cc6358e..717f627 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,10 +2,10 @@
# the following line to use "http://" instead
source 'https://rubygems.org'
-gem "middleman", "~>3.3.12"
+gem "middleman", "~>4.3.3"
# Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
+gem "middleman-livereload", "~> 3.4.6"
# For faster file watcher updates on Windows:
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
diff --git a/data/cloudstack.yml b/data/cloudstack.yml
index c337d93..e18f0b6 100644
--- a/data/cloudstack.yml
+++ b/data/cloudstack.yml
@@ -60,8 +60,10 @@
- 4.6:
- 4.6.0
cloudmonkey:
- version: 5.3.3
+ version: 6.0.0
archives:
+ - 6.0.0
+ - 5.3.3
- 5.3.2
- 5.3.1
- 5.3.0
diff --git a/source/downloads.md.erb b/source/downloads.md.erb
index 77de896..4ef2ef2 100644
--- a/source/downloads.md.erb
+++ b/source/downloads.md.erb
@@ -195,23 +195,13 @@
Instructions for building and installing from source can be found in the included [README.md](https://gitbox.apache.org/repos/asf?p=cloudstack-cloudmonkey.git;a=blob_plain;f=README.md) file.
-#### PyPi Package
+#### Binary Builds Release
-For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the python package to the [Python Package Index](https://pypi.python.org/pypi/cloudmonkey/).
+For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the binary builds to the [Apache CloudStack CloudMonkey Github release](https://github.com/apache/cloudstack-cloudmonkey/releases) page.
-For installing the package from pypi, use:
+For installing, upgrade, usage, please see the project wiki:
- $ pip install cloudmonkey
-
-To upgrade:
-
- $ pip install --upgrade cloudmonkey
-
-Though a clean upgrade is recommended:
-
- $ pip uninstall cloudmonkey
- $ pip install cloudmonkey
-
+ https://github.com/apache/cloudstack-cloudmonkey/wiki/Getting-Started#installation
<a name="archives"></a>