Merge branch 'master' into asf-site
diff --git a/data/cloudstack.yml b/data/cloudstack.yml
index fb926b8..4ddac50 100644
--- a/data/cloudstack.yml
+++ b/data/cloudstack.yml
@@ -1,10 +1,10 @@
 versions:
   main: 4.10.0.0
-  branch: 4.10
+  branch: '4.10'
   others:
     - 4.9.3.0
   archives:
-    - 4.10:
+    - '4.10':
        - 4.10.0.0
     - 4.9:
        - 4.9.3.0
diff --git a/source/developers.markdown b/source/developers.markdown
index c99e158..afa0c21 100644
--- a/source/developers.markdown
+++ b/source/developers.markdown
@@ -34,7 +34,7 @@
 
 <p>Apache CloudStack has a read-only mirror on <a href="https://github.com/apache/cloudstack" target="_blank">GitHub</a> that is kept in sync with the canonical Git repo maintained by the Apache Software Foundation. Submitting GitHub pull requests is the easiest way to get your contribution upstream. For detailed instructions see the link below:</p>
 
-<br><a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md" target="_blank">GitHub Contribution Guidelines</a></br>
+<br><a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md" target="_blank">GitHub Contribution Guidelines</a>
 
 <h3>Submitting a patch through JIRA</h3>
 
diff --git a/source/downloads.md.erb b/source/downloads.md.erb
index 8554a51..55419bd 100644
--- a/source/downloads.md.erb
+++ b/source/downloads.md.erb
@@ -84,7 +84,7 @@
             MD5
         </button>
     </a>
-    <a href="http://www.apache.org/dist/cloudstack/releases/<%= other_version %>1/apache-cloudstack-<%=     other_version %>-src.tar.bz2.sha512">
+    <a href="http://www.apache.org/dist/cloudstack/releases/<%= other_version %>/apache-cloudstack-<%=     other_version %>-src.tar.bz2.sha512">
         <button type="button" class="btn btn-info btn-xs">
             SHA512
         </button>
@@ -161,11 +161,11 @@
 
 <h4>Release Notes for CloudStack <%= data.cloudstack.versions.main %></h4>
 
-<p>Full release notes can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/<%= data.cloudstack.versions.branch %>/">Version <%= data.cloudstack.versions.main %> Release Notes</a> document.</p>
+<p>Full release notes can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/latest/">Version <%= data.cloudstack.versions.main %> Release Notes</a> document.</p>
 
 <p>Instructions for building from source and installing Apache CloudStack can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/">Installation Guide</a>.</p>
 
-<p>Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack <%= data.cloudstack.versions.main%> can be found in the upgrade section of the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/<%= data.cloudstack.versions.branch %>/">Release Notes</a>.</p>
+<p>Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack <%= data.cloudstack.versions.main%> can be found in the upgrade section of the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/latest/">Release Notes</a>.</p>
 
 <a name="cloudmonkey"></a>