You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:45:26 UTC
[18/51] [abbrv] [partial] brooklyn-docs git commit: move subdir from incubator up a level as it is promoted to its own repo (first non-incubator commit!)

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/merging-contributed-code.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/merging-contributed-code.md b/brooklyn-docs/website/developers/committers/merging-contributed-code.md
deleted file mode 100644
index 02cbd07..0000000
--- a/brooklyn-docs/website/developers/committers/merging-contributed-code.md
+++ /dev/null
@@ -1,118 +0,0 @@
----
-layout: website-normal
-title: Merging Contributed Code
----
-
-The Apache Brooklyn Git repositories are hosted in the ASF infrastructure and mirrored to Github. This is the current
-repository layout:
-
-- [Apache](https://git-wip-us.apache.org/repos/asf?s=incubator-brooklyn) - the main and official repository
-- [GitHub](https://github.com/apache/incubator-brooklyn) - mirror of the ASF repository, used to accept contributions
-  and do code reviews
-
-
-Before
-------
-
-For everything except the most trivial changes, the submitter must have a CLA on file. Check the [list of Apache
-committers, and non-commiters with ICLAs on record](https://people.apache.org/committer-index.html) and prompt the
-contributor to file an appropriate CLA if required.
-
-For all significant changes, there must be a Jira issue. If a Jira issue is not referenced in the PR and/or commit
-messages, prompt the contributor to open a Jira issue.
-
-
-Rules of thumb
---------------
-
-1. Every contribution is a piece of intellectual property.  This is the precious sustenance that nourishes our
-   project.  Please treat it with respect.
-2. Always give credit where it is due, ensure every merged commit reflects properly the individual who authored that
-   commit.  Preserve both the name and email address.
-3. Ensure your name and email address are there as the committer prior to pushing it to the Apache repositories.
-4. Always strive for linear commit history, avoid merge commits while pulling in contributor's changes.
-
-
-Setting up your repository
---------------------------
-
-Clone the canonical ASF repo using this command. The `--origin` option tells git to name the remote `apache` instead
-of the default, `origin`; this will reduce ambiguity when we later add a second remote upstream.
-
-    git clone --origin apache https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git
-
-Add a second remote, for the GitHub repository.
-
-    git remote add github https://github.com/apache/incubator-brooklyn.git
-
-For the GitHub remote, add an additional `fetch` reference which will cause
-every pull request to be made available as a remote branch in your workspace.
-
-    git config --local --add remote.github.fetch '+refs/pull/*/head:refs/remotes/github/pr/*'
-
-Finally, run `git fetch --all` to update from all remote repositories - you will see all the pull requests appear:
-
-    * [new ref]         refs/pull/98/head -> github/pr/98
-    * [new ref]         refs/pull/99/head -> github/pr/99
-
-
-Merging a pull request
-----------------------
-
-Fetch the latest remote branches, which will cause a remote branch for the PR to become available to you.
-
-    git fetch --all
-
-If you want to inspect the PR and/or run tests, check out the branch:
-
-    git checkout github/pr/1234
-
-To perform the merge, first update your master branch to the latest:
-
-    git checkout master
-    git pull --rebase
-
-Then merge and push:
-
-    git merge --no-ff -m 'This closes #1234' github/pr/1234
-    git push apache master
-
-Note that this commit message is important, as this is what will trigger the
-pull request to be automatically closed, and the `--no-ff` means that a merge
-commit will always be created.
-
-
-Alternative options
--------------------
-
-### Adding the remote reference to the contributor's repository
-
-Fetch the branch of the user you want to merge from
-
-    git fetch https://github.com/user-to-merge-from/incubator-brooklyn.git branch-to-merge-from
-
-If you commonly merge from a particular user, you'll want to add their repo as a remote to make fetching branches easier.
-
-    git remote add user-to-merge-from https://github.com/user-to-merge-from/incubator-brooklyn.git
-    git fetch user-to-merge-from
-
-
-### Merging from a patch file
-
-Save the patch from the Github patch link (just append '.patch' to the pull request link to get it). This patch will
-keep the authorship of the commit, so we should use it instead of the diff.
-
-Apply the patch preserving the original author:
-
-    git am pull-request-9876.patch
-
-
-Additional information
-----------------------
-
-Particularly for new committers, you may find the following information useful:
-
-* [Guide for new project
-  committers](https://www.apache.org/dev/new-committers-guide.html)
-* [Committers FAQ](https://www.apache.org/dev/committers.html)
-* [Git at Apache](https://git-wip-us.apache.org/)

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/announce.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/announce.md b/brooklyn-docs/website/developers/committers/release-process/announce.md
deleted file mode 100644
index f982631..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/announce.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-layout: website-normal
-title: Announce the release
-navgroup: developers
----
-
-After svnpubsub has updated, the artifacts will be visible at https://www.apache.org/dist/incubator/brooklyn/, and distributed to Apache mirrors around the world shortly after.
-
-An announcement email can then be made:
-
-### Subject: [ANNOUNCE] Apache Brooklyn 0.7.0-incubating released
-{% highlight text %}
-The Apache Brooklyn team is proud to announce the latest release of Apache
-Brooklyn 0.7.0-incubating.
-
-Apache Brooklyn is a framework for modelling, monitoring, and managing
-applications through autonomic blueprints. More details on Apache Brooklyn
-can be found at https://brooklyn.apache.org/
-
-Version 0.7.0 is a major step for Apache Brooklyn. It is the first full
-release of the project as part of the Apache incubator.
-
-Thanks go to our community for their improvements, feedback and guidance, and
-to Brooklyn’s commercial users for funding much of this development.
-
-As well as a source code release, we offer a full binary distribution
-download, and a full set of Maven artifacts for developers.
-
-Release notes:
-https://brooklyn.apache.org/v/0.7.0-incubating/misc/release-notes.html
-
-Download:
-https://brooklyn.apache.org/download/
-
-User guide:
-https://brooklyn.apache.org/v/0.7.0-incubating/
-
-Maven artifacts have also been made available on repository.apache.org and
-Maven Central.
-
-Disclaimer:
-Apache Brooklyn is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by Incubator. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have
-stabilized in a manner consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the
-project has yet to be fully endorsed by the ASF.
-
-Thanks
-Richard Downer
-release manager for 0.7.0-incubating
-on behalf of the Brooklyn PPMC
-{% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/environment-variables.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/environment-variables.md b/brooklyn-docs/website/developers/committers/release-process/environment-variables.md
deleted file mode 100644
index 886d3c7..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/environment-variables.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: website-normal
-title: Environment variables for the release
-navgroup: developers
----
-
-Many example commands in this section using variable names as placeholders for information that will vary between
-releases. To allow these example commands to run unmodified, set these environment variables appropriately.
-
-{% highlight bash %}
-# The version currently set on the master branch (BROOKLYN_VERSION_BELOW)
-OLD_MASTER_VERSION=0.9.0-SNAPSHOT
-# The next version to be set on the master branch
-NEW_MASTER_VERSION=0.NNN+1.0-SNAPSHOT
-
-# The version we are releasing now. While Brooklyn is in the Apache Incubator, this must be suffixed `-incubating`.
-VERSION_NAME=0.NNN.0-incubating
-
-# The release candidate number we are making now.
-RC_NUMBER=1
-{% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/fix-release.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/fix-release.md b/brooklyn-docs/website/developers/committers/release-process/fix-release.md
deleted file mode 100644
index 254d906..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/fix-release.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: website-normal
-title: Fix on the release branch
-navgroup: developers
----
-
-Make whatever changes are necessary on the release branch, supported by discussions on the mailing list.
-
-Repeat the instructions to [make release artifacts](make-release-artifacts.html).
-
-Remember that after the release is done, you should cherry-pick the changes to a new feature branch based on `master`
-and open a pull request, so that the next version will incorporate the bug fixes.
-

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/index.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/index.md b/brooklyn-docs/website/developers/committers/release-process/index.md
deleted file mode 100644
index 0e09c0b..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/index.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-layout: website-normal
-title: Release Process
-navgroup: developers
-children:
-- { path: prerequisites.md }
-- { path: environment-variables.md }
-- { path: release-version.md }
-- { path: make-release-artifacts.md }
-- { path: verify-release-artifacts.md }
-- { path: publish-temp.md }
-- { path: vote.md }
-- { path: fix-release.md }
-- { path: vote-ipmc.md }
-- { path: publish.md }
-- { path: announce.md }
----
-1. [Prerequisites](prerequisites.html) - steps that a new release manager must do (but which only need to be done once)
-2. [Set environment variables](environment-variables.html) - many example snippets here use environment variables to
-   avoid repetition - this page describes what they are
-2. [Create a release branch and set the version](release-version.html)
-3. [Make the release artifacts](make-release-artifacts.html)
-4. [Verify the release artifacts](verify-release-artifacts.html)
-5. [Publish the release artifacts to the staging area](publish-temp.html)
-6. [Vote on the dev@brooklyn list](vote.html)
-   1. If the vote fails - [fix the release branch](fix-release.html) and resume from step 3
-7. [Vote on the general@incubator list](vote-ipmc.html)
-   1. If the vote fails - [fix the release branch](fix-release.html) and resume from step 3
-8. [Publish the release artifacts to the public location](publish.html)
-9. [Announce the release](announce.html)

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/make-release-artifacts.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/make-release-artifacts.md b/brooklyn-docs/website/developers/committers/release-process/make-release-artifacts.md
deleted file mode 100644
index 8b14c7d..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/make-release-artifacts.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-layout: website-normal
-title: Make the release artifacts
-navgroup: developers
----
-
-A release script is provided in `brooklyn-dist/release/make-release-artifacts.sh`. This script will prepare all the release artifacts.
-It is written to account for several Apache requirements, so you are strongly advised to use it rather than "rolling your own".
-
-The release script will:
-
-- **Create source code and binary distribution artifacts** and place them in a temporary staging directory on your workstation, usually `brooklyn-dist/release/tmp/`.
-- **Create Maven artifacts and upload them to a staging repository** located on the Apache Nexus server.
-
-The script has a single required parameter `-r` which is given the release candidate number - so `-r1` will create
-release candidate 1 and will name the artifacts appropriately.
-
-Before running this however, it is a good idea to check the `apache-release` profile build is healthy.
-This will catch glitches such as PGP or javadoc problems without doing time-consuming uploads:
-
-{% highlight bash %}
-mvn clean install -Papache-release
-{% endhighlight %}
-
-To run the script:
-
-{% highlight bash %}
-./brooklyn-dist/release/make-release-artifacts.sh -r$RC_NUMBER
-{% endhighlight %}
-
-It will show you the release information it has deduced, and ask yes-or-no if it can proceed. Please note that the
-script will thoroughly clean the Git workspace of all uncommited and unadded files.
-
-**You really probably want to run this against a secondary checkout.** It will wipe `.project` files and other IDE metadata, and bad things can happen if an IDE tries to write while the script is running. Also as it takes a long time, this means your workspace is not tied up. One quick and easy way to do this is to `git clone` the local directory of your primary checkout to a secondary location.
-
-A few minutes into the script you will be prompted for the passphrase to your GnuPG private key. You should only be
-asked this question once; the GnuPG agent will cache the password for the remainder of the build.
-
-Please note that uploading to the Nexus staging repository is a slow process. Expect this stage of the build to take
-2 hours.
-
-The release script will:
-
-1. Prepare a staging directory for the source code release
-2. Create .tar.gz and .zip artifacts of the source code
-3. Invoke Maven to build the source code (including running unit tests), and deploy artifacts to a Maven remote
-   repository
-4. Save the .tar.gz and .zip artifacts produced by the build of `brooklyn-dist`
-5. For each of the produced files, produce MD5, SHA1, SHA256 and GnuPG signatures
-
-At the end of the script, it will show you the files it has produced and their location.
-
-Make a signed tag for this release, and then push the tag:
-
-{% highlight bash %}
-git tag -s -m "Tag release ${VERSION_NAME} release candidate ${RC_NUMBER}" apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-git push apache apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-{% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/prerequisites.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/prerequisites.md b/brooklyn-docs/website/developers/committers/release-process/prerequisites.md
deleted file mode 100644
index 9977201..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/prerequisites.md
+++ /dev/null
@@ -1,136 +0,0 @@
----
-layout: website-normal
-title: Release Prerequisites
-navgroup: developers
----
-
-Subversion repositories for release artifacts
----------------------------------------------
-
-Apache releases are posted to dist.apache.org, which is a Subversion repository.
-
-We have two directories here:
-
-- https://dist.apache.org/repos/dist/release/incubator/brooklyn - this is where IPMC approved releases go. Do not upload
-  here until we have a vote passed on dev@brooklyn and incubator-general. Check out this folder and name it
-  `apache-dist-release-brooklyn`
-- https://dist.apache.org/repos/dist/dev/incubator/brooklyn - this is where releases to be voted on go. Make the release
-  artifact, and post it here, then post the [VOTE] thread with links here. Check out this folder and name it
-  `apache-dist-dev-brooklyn`.
-
-Example:
-
-{% highlight bash %}
-svn co https://dist.apache.org/repos/dist/release/incubator/brooklyn apache-dist-release-brooklyn
-svn co https://dist.apache.org/repos/dist/dev/incubator/brooklyn apache-dist-dev-brooklyn
-{% endhighlight %}
-
-When working with these folders, **make sure you are working with the correct one**, otherwise you may be publishing
-pre-release software to the global release mirror network!
-
-
-Software packages
------------------
-
-The following software packages are required during the build. Make sure you have them installed.
-
-- A Java Development Kit, version 1.7
-- `maven` and `git`
-- `xmlstarlet` is required by the release script to process version numbers in `pom.xml` files;
-  on mac, `port install xmlstarlet` should do the trick.
-- `zip` and `unzip`
-- `gnupg2`, and `gnupg-agent` if it is packaged separately (it is on Ubuntu Linux)
-- `pinentry` for secure entry of GPG passphrases. If you are building remotely on a Linux machine, `pinentry-curses` is
-  recommended; building on a mac, `port install pinentry-mac` is recommended.
-- `md5sum` and `sha1sum` - these are often present by default on Linux, but not on Mac;
-  `port install md5sha1sum` should remedy that.
-- if `gpg` does not resolve (it is needed for maven), create an alias or script pointing at `gpg2 "$@"`
-
-
-GPG keys
---------
-
-The release manager must have a GPG key to be used to sign the release. See below to install `gpg2`
-(with a `gpg` alias).  The steps here also assume you have the following set
-(not using `whoami` if that's not appropriate):
-
-{% highlight bash %}
-GPG_KEY=`whoami`@apache.org
-SVN_USERNAME=`whoami`
-{% endhighlight %}
-
-If you have an existing GPG key, but it does not include your Apache email address, you can add your email address as
-described [in this Superuser.com posting](https://superuser.com/a/293283). Otherwise, create a new GPG key giving your
-Apache email address, using `gpg2 --gen-key` then `gpg2 --export-key $GPG_KEY > my-apache.key` and 
-`gpg2 --export-secret-key -a $GPG_KEY > my-apache.private.key` in the right directory (`~/.ssh` is a good one).
-
-Upload your GPG public key (complete with your Apache email address on it) to a public keyserver - e.g. run
-`gpg2 --export --armor $GPG_KEY` and paste it into the “submit” box on http://pgp.mit.edu/
-
-Look up your key fingerprint with `gpg2 --fingerprint $GPG_KEY` - it’s the long sequence of hex numbers
-separated by spaces. Log in to [https://id.apache.org/](https://id.apache.org/) then copy-and-paste the fingerprint into
-“OpenPGP Public Key Primary Fingerprint”. Submit.
-
-Now add your key to the `apache-dist-release-brooklyn/KEYS` file:
-
-{% highlight bash %}
-cd apache-dist-release-brooklyn
-(gpg2 --list-sigs richard@apache.org && gpg2 --armor --export richard@apache.org) >> KEYS
-svn --username $SVN_USERNAME commit -m 'Update incubator/brooklyn/KEYS for $GPG_KEY'
-{% endhighlight %}
-
-References: 
-* [Post on the general@incubator list](https://mail-archives.apache.org/mod_mbox/incubator-general/201410.mbox/%3CCAOGo0VawupMYRWJKm%2Bi%2ByMBqDQQtbv-nQkfRud5%2BV9PusZ2wnQ%40mail.gmail.com%3E)
-* [GPG cheatsheet](http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html)
-
-If you experience trouble with PGP subsequently (when running maven):
-* On Mac make sure that `~/.gnupg/gpg-agent.conf` refers to the right file for `pinentry-program`;
-  it must point at a *binary* and preferably a pop-up which is keychain-aware,
-  such as with macports `/Applications/MacPorts/pinentry-mac.app/Contents/MacOS/pinentry-mac`
-* When the `pinentry` dialog pops up, tick to "Save to keychain", otherwise it will keep popping up
-  and may time out and fail the build
-* See [GnuPG/Pinentry Enigmail debugging](https://www.enigmail.net/support/gnupg2_issues.php) for tips on diagnosing gpg-agent communication (from the process to this agent and from this agent to the pinentry program)
-* See [GnuPG Agent Options](https://www.gnupg.org/documentation/manuals/gnupg/Agent-Options.html) for extended gpg-agent debug
-
-
-Maven configuration
--------------------
-
-The release will involve uploading artifacts to Apache's Nexus instance - therefore you will need to configure your
-Maven install with the necessary credentials.
-
-You will need to add something like this to your `~/.m2/settings.xml` file:
-
-{% highlight xml %}
-<?xml version="1.0"?>
-<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
-          xmlns="http://maven.apache.org/SETTINGS/1.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <!-- ... -->
-
-    <servers>
-
-        <!-- ... -->
-
-        <!-- Required for uploads to Apache's Nexus instance. These are LDAP credentials - the same credentials you
-           - would use to log in to Git and Jenkins (but not JIRA) -->
-        <server>
-            <id>apache.snapshots.https</id>
-            <username>xxx</username>
-            <password>xxx</password>
-        </server>
-        <server>
-            <id>apache.releases.https</id>
-            <username>xxx</username>
-            <password>xxx</password>
-        </server>
-
-        <!-- ... -->
-
-    </servers>
-
-    <!-- ... -->
-
-</settings>
-{% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/publish-temp.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/publish-temp.md b/brooklyn-docs/website/developers/committers/release-process/publish-temp.md
deleted file mode 100644
index 9727c52..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/publish-temp.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-layout: website-normal
-title: Publish to the staging area
-navgroup: developers
----
-
-Publish the source and binary distributions to the pre-release area
--------------------------------------------------------------------
-
-You will need to have checked out the Apache distribution Subversion repository located at
-https://dist.apache.org/repos/dist/dev/incubator/brooklyn. Please refer to [Prerequisites](prerequisites.html) for
-information.
-
-In your workspace for the `dist.apache.org` repo, create a directory with the artifact name and version:
-
-{% highlight bash %}
-mkdir apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-{% endhighlight %}
-
-Copy into this directory all of the artifacts from the previous step - `-src` and `-bin`, `.tar.gz` and `.zip`, and all
-associated `.md5`, `.sha1`, `.sha256` and `.asc` signatures. Then commit:
-
-{% highlight bash %}
-svn add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-svn commit --message "Add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER} to dist/dev/incubator/brooklyn"
-{% endhighlight %}
-
-These steps can be performed as part of the `make-release-artifacts.sh` script used earlier
-if `${APACHE_DIST_SVN_DIR}` points to the appropriate subversion directory.
-
-
-Close the staging repository on Apache's Nexus server
------------------------------------------------------
-
-*Closing* the staging repository locks it from further changes, and provides a public URL for the repository that can
-be used for downloading the artifacts.
-
-Go to the Apache Nexus server at [https://repository.apache.org/](https://repository.apache.org/) and log in using the
-link in the top right (the credentials are the same as your Git and Jenkins credentials). Go to the "Staging
-Repositories" page, and tick the repository with the name starting `orgapachebrooklyn`. Click the **Close** button.
-Provide a description which includes the version and release candidate, e.g. `Apache Brooklyn 0.7.0-incubating-rc1`.

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/publish.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/publish.md b/brooklyn-docs/website/developers/committers/release-process/publish.md
deleted file mode 100644
index 436dbc4..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/publish.md
+++ /dev/null
@@ -1,160 +0,0 @@
----
-layout: website-normal
-title: Publish to the public
-navgroup: developers
----
-
-Publish the source and binary distributions to the pre-release area
--------------------------------------------------------------------
-
-You will need to have checked out the Apache distribution Subversion repository located at
-https://dist.apache.org/repos/dist/release/incubator/brooklyn. Please refer to [Prerequisites](prerequisites.html) for
-information.
-
-In your workspace for the `dist.apache.org` repo, create a directory with the artifact name and version:
-
-{% highlight bash %}
-mkdir apache-brooklyn-${VERSION_NAME}
-{% endhighlight %}
-
-Refer back to the pre-release area Subversion (see [Publish to the staging area](publish-temp.html)), and copy all of
-the release candidate artifacts - `-src` and `-bin`, `.tar.gz` and `.zip`, and all associated `.md5`, `.sha1`, `.sha256`
-and `.asc` signatures - into this new folder.
-
-Rename all of the files to remove the `-rcN` designation. If you have the `mmv` tool installed, this can be done with
-this command:
-
-{% highlight bash %}
-mmv -v '*-rc'$RC_NUMBER'-*' '#1-#2'
-{% endhighlight %}
-
-The hash files will need patching to refer to the filenames without the `-rcN` designation:
-
-{% highlight bash %}
-sed -i.bak 's/-rc'$RC_NUMBER'-/-/' *.md5 *.sha1 *.sha256
-rm -f *.bak
-{% endhighlight %}
-
-Note that the PGP signatures do not embed the filename so they do not need to be modified
-
-As a final check, re-test the hashes and signatures:
-
-{% highlight bash %}
-for ext in -src.tar.gz -src.zip -bin.tar.gz -bin.zip; do
-    artifact=apache-brooklyn-${VERSION_NAME}${ext}
-    md5sum -c ${artifact}.md5
-    shasum -a1 -c ${artifact}.sha1
-    shasum -a256 -c ${artifact}.sha256
-    gpg2 --verify ${artifact}.asc ${artifact}
-done
-{% endhighlight %}
-
-(You may get warnings such as: `gpg: WARNING: This key is not certified with a trusted signature!` 
-and `There is no indication that the signature belongs to the owner.` This happens if you have not trusted
-the person's key. A key-signing party is a good way to extend this web of trust).
-
-
-Then, add them to Subversion and commit.
-
-{% highlight bash %}
-svn add apache-brooklyn-${VERSION_NAME}
-svn commit --message "Add apache-brooklyn-${VERSION_NAME} to dist/release/incubator/brooklyn"
-{% endhighlight %}
-
-
-Publish the staging repository on Apache's Nexus server
--------------------------------------------------------
-
-*Releasing* the staging repository causes its contents to be copied to the main Apache Nexus repository. This in turn
-is propagated to Maven Central, meaning all of our users can access the artifacts using a default Maven configuration
-(there's no need to add a `<repository>` to their `pom.xml` or `~/.m2/settings.xml`).
-
-Go to the Apache Nexus server at [https://repository.apache.org/](https://repository.apache.org/) and log in using the
-link in the top right (the credentials are the same as your Git and Jenkins credentials). Go to the "Staging
-Repositories" page, and tick the repository with the name starting `orgapachebrooklyn`. Click the **Release** button.
-Provide a description which includes the version, e.g. `Apache Brooklyn 0.7.0-incubating`.
-
-Note there is only one orgapachebrooklyn staging repository at a time; this will be the one created for the release
-candidate with whatever name was used there (e.g. it might include "rc" in the name). If you really want, you can 
-double-check under the "content" that brooklyn-dist has artifacts without rc in the name.
-
-
-Update the website
-------------------
-
-*Instructions on uploading to the website are beyond the scope of these instructions. Refer to the 
-[appropriate instructions](https://github.com/apache/incubator-brooklyn/tree/master/brooklyn-docs).*
-
-### Publish documentation for the new release
-
-Go to the release branch and perform a build:
-
-{% highlight bash %}
-git checkout ${VERSION_NAME}
-mvn clean install -DskipTests
-{% endhighlight %}
-
-Ensure the SVN repo is up-to-date (very painful otherwise!)
-
-{% highlight bash %}
-cd ${BROOKLYN_SITE_DIR-../incubator-brooklyn-site-public}
-svn up
-cd -
-{% endhighlight %}
-
-Generate the permalink docs for the release:
-
-{% highlight bash %}
-cd brooklyn-docs
-./_build/build.sh guide-version --install
-{% endhighlight %}
-
-Now publish _site/v/*${VERSION_NAME}* to the public website.
-
-Update the "latest" docs to this release:
-
-{% highlight bash %}
-./_build/build.sh guide-latest --install
-{% endhighlight %}
-
-Now publish _site/v/latest to the public website:
-
-{% highlight bash %}
-cd ${BROOKLYN_SITE_DIR-../../incubator-brooklyn-site-public}
-svn add * --force
-export DELETIONS=$( svn status | sed -e '/^!/!d' -e 's/^!//' )
-if [ ! -z "${DELETIONS}" ] ; then svn rm ${DELETIONS} ; fi
-{% endhighlight %}
-
-
-### Update the main website to link to the new release
-
-This should be done on the `master` branch:
-
-{% highlight bash %}
-git checkout master
-{% endhighlight %}
-
-1. Edit the file `brooklyn-docs/_config.yml` - change `brooklyn-stable-version` to be the newly-release version, and
-   `brooklyn-version` to be the current SNAPSHOT version on the master branch.
-2. Edit the file `brooklyn-docs/website/download/verify.md` to add links to the MD5/SHA1/SHA256 hashes and PGP signatures for the
-   new version.
-3. Edit the file `brooklyn-docs/website/meta/versions.md` to add the new version.
-4. Build the updated site with `./_build/build.sh website-root --install`.
-5. Publish to the public website.
-6. Commit your changes to master, e.g. with a message like "Update latest docs to 0.8.0-incubating"
-
-
-Tag the release in git
-----------------------
-
-Make a signed tag for this release, based on the tag for the release candidate, and then push the tag:
-
-{% highlight bash %}
-git tag -s -m "Tag release ${VERSION_NAME}" apache-brooklyn-${VERSION_NAME} apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-git push apache apache-brooklyn-${VERSION_NAME}
-{% endhighlight %}
-
-Note the tag `apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}` should have been created as part of the
-RC creation - see [make-release-artifacts](make-release-artifacts.html).
-

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/release-version.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/release-version.md b/brooklyn-docs/website/developers/committers/release-process/release-version.md
deleted file mode 100644
index a22314b..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/release-version.md
+++ /dev/null
@@ -1,83 +0,0 @@
----
-layout: website-normal
-title: Release branch and set version
-navgroup: developers
----
-
-This will allow development to continue on master without affecting the release; it also allows quick-fixes to the
-release branch to address last-minute problems (which must of course be merged/cherry-picked back into master later).
-
-Determine the correct name for the version. Note that while in incubation, we must include “incubating” in our release
-name - common practice for this is to append “-incubating” to the release version.
-
-Do not use -rc1, -rc2 etc. in version strings. Use the version that will be the actual published version. (The artifacts
-that get uploaded to the dist.apache.org/dev will include “-rc1” etc. in the folder name, but the contents will be *as
-final*. Therefore, turning the rc into the final is simply a case of taking the rc file and publishing it to the release
-folder with the correct name.)
-
-References:
-- [Post on general@incubator](https://mail-archives.apache.org/mod_mbox/incubator-general/201409.mbox/%3CCAK2iWdS1H9dkJcSdohky6hFqJdP0XyuhAG%2B%3D1Aspxcjt5RmnJw%40mail.gmail.com%3E)
-- [Post on general@incubator](https://mail-archives.apache.org/mod_mbox/incubator-general/201409.mbox/%3CCAOGo0VaEz4cEUbgMgqhh3hiiiubnspiGkQ%3DQv08bOwPqRtzAvQ%40mail.gmail.com%3E)
-
-
-Create the release branch and set the release version number
-------------------------------------------------------------
-
-Create a branch with the same name as the version, based off master:
-
-{% highlight bash %}
-git checkout master
-git pull --rebase # assumes that the Apache canonical repository is the default upstream for your master - amend if necessary
-git checkout -b $VERSION_NAME
-git push -u apache $VERSION_NAME
-{% endhighlight %}
-
-Now change the version numbers in this branch throughout the project using the script `brooklyn-dist/release/change-version.sh` and commit it:
-
-{% highlight bash %}
-./brooklyn-dist/release/change-version.sh BROOKLYN $OLD_MASTER_VERSION $VERSION_NAME
-git add .
-# Now inspect the staged changes and ensure there are no surprises
-git commit -m "Change version to $VERSION_NAME"
-git push
-{% endhighlight %}
-
-
-
-Update the version on master
-----------------------------
-
-The `master` branch will now need updating to refer to the next planned version. (This step is not required if making
-a "milestone" release or similar.)
-
-The release notes should be cleared out and the version history augmented with the new version.
-
-Example:
-
-{% highlight bash %}
-git checkout master
-./brooklyn-dist/release/change-version.sh BROOKLYN $OLD_MASTER_VERSION $NEW_MASTER_VERSION
-git add .
-# Now inspect the staged changes and ensure there are no surprises
-{% endhighlight %}
-
-Open `brooklyn-docs/guide/misc/release-notes.md` and `brooklyn-docs/website/meta/versions.md` in your favourite editor and amend.
-For release notes this means bumping the reference to the previous version in the "Backwards Compatibility" section
-and putting some placeholder text elsewhere.
-
-Then:
-
-{% highlight bash %}
-git commit -m "Change version to $NEW_MASTER_VERSION"
-git push
-{% endhighlight %}
-
-
-Switch back to the release branch
----------------------------------
-
-Move back to the release branch:
-
-{% highlight bash %}
-git checkout $VERSION_NAME
-{% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/verify-release-artifacts.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/verify-release-artifacts.md b/brooklyn-docs/website/developers/committers/release-process/verify-release-artifacts.md
deleted file mode 100644
index 40c8b20..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/verify-release-artifacts.md
+++ /dev/null
@@ -1,165 +0,0 @@
----
-layout: website-normal
-title: Verify the release artifacts
-navgroup: developers
----
-
-Below is described a series of "sanity checks" that should be performed before uploading the artifacts to the
-pre-release area. They are also useful for community members that want to check the artifact before voting (community
-members may also want to check the [list of required software packages](prerequisites.html#software-packages) to ensure
-they have the GnuPG and md5sum/sha1sum installed.
-
-Setup
------
-
-The scripts below use several environment variables to cut out repetition and enable easy repeatability for the next
-release. You should determine the following information and set your environment:
-
-{% highlight bash %}
-# The version we are releasing now. While Brooklyn is in the Apache Incubator, this must be suffixed `-incubating`.
-VERSION_NAME=0.7.0-incubating
-
-# The release candidate number we are making now.
-RC_NUMBER=1
-
-# A reference to your Git repository for Brooklyn
-BASE_REPO=~/repos/apache-asf/incubator-brooklyn
-
-# The Git commit hash from which the release was made - get this from the release script, or the Release Manager's announcement
-GIT_COMMIT=edcf928ee65cc29a84376c822759e468a9f016fe
-{% endhighlight %}
-
-Import the PGP keys of the release Managers:
-
-{% highlight bash %}
-curl https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS | gpg2 --import
-{% endhighlight %}
-
-
-Download the artifacts
-----------------------
-
-If you've just built the RC, simply go to that directory and skip this step.
-
-If you're verifying a build someone else has made, first download the files including all keys using:
-
-{% highlight bash %}
-TEMP_DIR=~/tmp/brooklyn/release/${VERSION_NAME}-rc${RC_NUMBER}
-BASE_NAME=apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-BASE_URL=https://dist.apache.org/repos/dist/dev/incubator/brooklyn/${BASE_NAME}
-
-mkdir -p ${TEMP_DIR}
-cd ${TEMP_DIR}
-for ext in -src.tar.gz -src.zip -bin.tar.gz -bin.zip; do
-    artifact=${BASE_NAME}${ext}
-    for i in ${artifact} ${artifact}.asc ${artifact}.md5 ${artifact}.sha1 ${artifact}.sha256; do
-      curl ${BASE_URL}/$i -O
-    done
-done
-{% endhighlight %}
-
-(Alternatively if you have `apache-dist-dev-repo` checked out,
-you can do an `svn up` in there and `cd apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}`.)
-
-
-Verify the hashes and signatures of artifacts
----------------------------------------------
-
-Then check the hashes and signatures, ensuring you get a positive message from each one:
-
-{% highlight bash %}
-for ext in -src.tar.gz -src.zip -bin.tar.gz -bin.zip; do
-    artifact=apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}${ext}
-    md5sum -c ${artifact}.md5
-    shasum -a1 -c ${artifact}.sha1
-    shasum -a256 -c ${artifact}.sha256
-    gpg2 --verify ${artifact}.asc ${artifact}
-done
-{% endhighlight %}
-
-
-Verify expanded source archive matches contents of RC tag
----------------------------------------------------------
-
-These commands will compare the contents of the source release to the contents of the equivalent Git commit. Note that
-there will be some differences: we cannot release binary files in the source release, so some test artifacts will
-appear to be missing from the source release, and the source release excludes the documentation, website and release
-scripts.
-
-{% highlight bash %}
-cd $BASE_REPO
-git checkout $GIT_COMMIT
-git clean -d -f -x # WARNING: this will forcibly clean your workspace!
-
-cd $TEMP_DIR
-mkdir unpacked-src
-# Either:
-tar xzf ${BASE_NAME}-src.tar.gz -C unpacked-src/
-# or:
-unzip ${BASE_NAME}-src.zip -d unpacked-src/
-# (or preferably both!)
-diff -qr unpacked-src/$BASE_NAME $BASE_REPO
-{% endhighlight %}
-
-
-Verify the operation of the binary distribution
------------------------------------------------
-
-{% highlight bash %}
-cd $TEMP_DIR
-mkdir unpacked-bin
-# Either:
-tar xzf ${BASE_NAME}-bin.tar.gz -C unpacked-bin/
-# or:
-unzip ${BASE_NAME}-bin.tar.gz -d unpacked-bin/
-# (or preferably both!)
-cd unpacked-bin
-./bin/brooklyn launch
-{% endhighlight %}
-
-Try deploying a simple app, such as the YAML:
-
-{% highlight yaml %}
-location: localhost
-services:
-- type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
-{% endhighlight %}
-
-
-Inspect the Maven staging repository
-------------------------------------
-
-Go to the Apache Nexus server at [https://repository.apache.org/](https://repository.apache.org/) and log in using the
-link in the top right (the credentials are the same as your Git and Jenkins credentials). Go to the "Staging
-Repositories" page, and click the repository with the name starting `orgapachebrooklyn`.
-
-Give this a brief inspection to ensure that it looks reasonable. In particular:
-
-- The expected projects are there. (There is no need to do an exhaustive check - but if there is only a couple of
-  projects there, then something has clearly gone wrong!)
-- The projects contain artifacts with the expected version number.
-- The artifacts for a project look reasonable - and there is a `.asc` file (detached PGP cleartext signature) for each
-  artifact.
-
-
-About the sanity check
-----------------------
-
-This is the most basic sanity check. This is now suitable to be uploaded to the pre-release area and an announcement
-made with voting open. This is then the point for the RM and the community to perform more detailed testing on the RC
-artifacts and submit bug reports and votes.
-
-
-If the sanity check fails
--------------------------
-
-Note the problems causing the failure, and file bug reports, start mailing list discussions etc., as appropriate.
-
-#### For the release manager who was preparing an RC for upload
-
-You should completely discard the defective artifacts.
-
-You will also need to drop the Maven staging repository on Apache's Nexus server: go to the Apache Nexus server at
-[https://repository.apache.org/](https://repository.apache.org/) and log in using the link in the top right (the
-credentials are the same as your Git and Jenkins credentials). Go to the "Staging Repositories" page, and tick the
-repository with the name starting `orgapachebrooklyn`. Click the **Drop** button.

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/vote-ipmc.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/vote-ipmc.md b/brooklyn-docs/website/developers/committers/release-process/vote-ipmc.md
deleted file mode 100644
index 5278acc..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/vote-ipmc.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-layout: website-normal
-title: Vote on general@incubator
-navgroup: developers
----
-
-Copy-paste the e-mail below, being sure to substitute:
-
-- version number
-- RC number
-- “source release of” or “release of”
-- URLs for the [VOTE] and [RESULT][VOTE] messages on dev@brooklyn
-- URLs containing version numbers
-- URL for your own asc key
-- Checksums
-
-### Subject: [VOTE] Release Apache Brooklyn 0.7.0-incubating [rc1]
-
-{% highlight text %}
-This is to call for a vote for the release of Apache Brooklyn 0.7.0-incubating.
-
-The Apache Brooklyn community have voted in favour of making this release:
-Vote thread:
-https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201507.mbox/%3CCABQFKi1WapCMRUqQ93E7Qow5onKgL3nyG3HW9Cse7vo%2BtUChRQ%40mail.gmail.com%3E
-Result email:
-https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201507.mbox/%3CCABQFKi2aJHHfXGC0xsMFU0odfB5X6FF5xhpHbs93%2BNfS-fNRZw%40mail.gmail.com%3E
-
-We now ask the IPMC to vote on this release.
-
-This release comprises of a source code distribution, and a corresponding
-binary distribution, and Maven artifacts.
-
-The source and binary distributions, including signatures, digests, etc. can
-be found at:
-https://dist.apache.org/repos/dist/dev/incubator/brooklyn/apache-brooklyn-0.7.0-incubating-rc1
-
-The artifact SHA-256 checksums are as follows:
-c3b5c581f14b44aed786010ac7c8c2d899ea0ff511135330395a2ff2a30dd5cf *apache-brooklyn-0.7.0-incubating-rc1-bin.tar.gz
-cef49056ba6e5bf012746a72600b2cee8e2dfca1c39740c945c456eacd6b6fca *apache-brooklyn-0.7.0-incubating-rc1-bin.zip
-8069bfc54e7f811f6b57841167b35661518aa88cabcb070bf05aae2ff1167b5a *apache-brooklyn-0.7.0-incubating-rc1-src.tar.gz
-acd2229c44e93e41372fd8b7ea0038f15fe4aaede5a3bcc5056f28a770543b82 *apache-brooklyn-0.7.0-incubating-rc1-src.zip
-
-The Nexus staging repository for the Maven artifacts is located at:
-https://repository.apache.org/content/repositories/orgapachebrooklyn-1004
-
-All release artifacts are signed with the following key:
-https://people.apache.org/keys/committer/richard.asc
-
-KEYS file available here:
-https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS
-
-The artifacts were built from Git commit ID
-24a23c5a4fd5967725930b8ceaed61dfbd225980
-https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git;a=commit;h=24a23c5a4fd5967725930b8ceaed61dfbd225980
-
-
-Please vote on releasing this package as Apache Brooklyn 0.7.0-incubating.
-
-The vote will be open for at least 72 hours.
-[ ] +1 Release this package as Apache Brooklyn 0.7.0-incubating
-[ ] +0 no opinion
-[ ] -1 Do not release this package because ...
-
-
-Thanks,
-[Release manager name]
-{% endhighlight %}
-
-Email out the vote result
--------------------------
-
-This is a similar process to counting the votes on the dev@brooklyn list. You will need 3 IPMC members to issue a “+1
-binding” vote, and no IPMC “0 binding” or “-1 binding” votes. Once the voting period has elapsed and the required votes
-received, email out a vote result email. Again this should be a new email thread with the subject prefixed
-“[RESULT][VOTE]”.
-
-### Subject: [RESULT][VOTE] Release Apache Brooklyn 0.7.0-incubating [rc1]
-
-{% highlight text %}
-The vote for releasing Apache Brooklyn 0.7.0-incubating passed with 3 binding +1s, 0 non-binding +1s, and no 0 or -1.
-
-Vote thread link:
-https://mail-archives.apache.org/mod_mbox/incubator-general/201507.mbox/%3CCABQFKi1xMzduVruYXdA15BQkZGVaYnmOChSfUvMw3uWcHA1Beg%40mail.gmail.com%3E
-
-
-Binding +1s:
-Hadrian Zbarcea
-Justin Mclean
-Jean-Baptiste Onofré
-
-
-Thanks to everyone that tested our release and voted.
-
-We will shortly publish the release artifacts.
-
-
-Thanks,
-[Release manager name]
-{% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/committers/release-process/vote.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/committers/release-process/vote.md b/brooklyn-docs/website/developers/committers/release-process/vote.md
deleted file mode 100644
index e459bdd..0000000
--- a/brooklyn-docs/website/developers/committers/release-process/vote.md
+++ /dev/null
@@ -1,139 +0,0 @@
----
-layout: website-normal
-title: Vote on dev@brooklyn
-navgroup: developers
----
-
-Start the vote
---------------
-
-A script to generate the voting email can be found in `brooklyn-dist/release/print-vote-email.sh`,
-taking a single argument being the staging repo link. For example:
-
-    brooklyn-dist/release/print-vote-email.sh orgapachebrooklyn-1234 | pbcopy
-
-You should move the subject and put your name at the end, and simply eyeball the rest. This should be sent to **dev@brooklyn.incubator.apache.org**.
-
-Alternatively, copy-paste the e-mail template below, being sure to substitute:
-
-- VERSION_NAME
-- RC_NUMBER
-- URLs containing version numbers
-- URL for your own PGP key
-- Checksums
-- URL for the Maven staging repository
-
-### Subject: [VOTE] Release Apache Brooklyn ${VERSION_NAME} [rc${RC_NUMBER}]
-
-{% highlight text %}
-This is to call for a vote for the release of Apache Brooklyn ${VERSION_NAME}.
-
-This release comprises of a source code distribution, and a corresponding
-binary distribution, and Maven artifacts.
-
-The source and binary distributions, including signatures, digests, etc. can
-be found at:
-https://dist.apache.org/repos/dist/dev/incubator/brooklyn/apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-
-The artifact SHA-256 checksums are as follows:
-c3b5c581f14b44aed786010ac7c8c2d899ea0ff511135330395a2ff2a30dd5cf *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-bin.tar.gz
-cef49056ba6e5bf012746a72600b2cee8e2dfca1c39740c945c456eacd6b6fca *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-bin.zip
-8069bfc54e7f811f6b57841167b35661518aa88cabcb070bf05aae2ff1167b5a *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-src.tar.gz
-acd2229c44e93e41372fd8b7ea0038f15fe4aaede5a3bcc5056f28a770543b82 *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-src.zip
-
-The Nexus staging repository for the Maven artifacts is located at:
-https://repository.apache.org/content/repositories/orgapachebrooklyn-1004
-
-All release artifacts are signed with the following key:
-https://people.apache.org/keys/committer/richard.asc
-
-KEYS file available here:
-https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS
-
-The artifacts were built from Git commit ID
-24a23c5a4fd5967725930b8ceaed61dfbd225980
-https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git;a=commit;h=24a23c5a4fd5967725930b8ceaed61dfbd225980
-
-
-Please vote on releasing this package as Apache Brooklyn ${VERSION_NAME}.
-
-The vote will be open for at least 72 hours.
-[ ] +1 Release this package as Apache Brooklyn ${VERSION_NAME}
-[ ] +0 no opinion
-[ ] -1 Do not release this package because ...
-
-
-Thanks,
-[Release manager name]
-{% endhighlight %}
-
-
-Reply to vote
--------------
-
-Here is an example checklist (thanks Andrew Phillips for your thoroughness on jclouds!)
-
-Checklist (all items optional, mark only those personally verified):
-
-- [ ] Checksums and PGP signatures are valid.
-- [ ] Expanded source archive matches contents of RC tag.
-- [ ] Expanded source archive builds and passes tests.
-- [ ] LICENSE is present and correct.
-- [ ] NOTICE is present and correct, including copyright date.
-- [ ] All files have license headers where appropriate.
-- [ ] All dependencies have compatible licenses.
-- [ ] No compiled archives bundled in source archive.
-- [ ] I follow this project's commits list.
-
-
-Count the vote results
-----------------------
-
-If the release email stated a deadline (normally 72 hours), then you should wait at least that long. If there are
-insufficient votes you may need to extend the deadline - as an informal aim, we should look to get 2/3rds of the PPMC
-and some mentors voting +1. If a release-critical issue is raised and confirmed, then you may end the vote early with a
-negative result.
-
-Votes from PPMC members are binding; votes from others are non-binding. In the case of non-binding negative votes,
-please consider these carefully even if you are not bound by them.
-
-If there are any negative or zero votes, consider these carefully. Aim to “convert” negative or zero votes into positive
-by addressing any concerns. A negative vote is not necessarily a veto[citation required], but it should be a clear
-warning sign to not proceed if somebody strongly believes that the release should not proceed as is.
-
-Finally, count up the +1s and separate into binding (PPMC) and non-binding.
-
-Email the vote result
----------------------
-
-This is a new email thread with a different subject
-(the same as before with `[RESULT]` prepended).
-
-Note that you must find the URL for the previous thread at [mail-archives.apache.org](https://mail-archives.apache.org/).
-
-### Subject: [RESULT]\[VOTE] Release Apache Brooklyn ${VERSION_NAME} [rc${RC_NUMBER}]
-
-{% highlight text %}
-The vote for releasing Apache Brooklyn ${VERSION_NAME} passed with 5 binding +1s, 1 non-binding +1s, and no 0 or -1.
-
-Vote thread link:
-https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201507.mbox/%3CCABQFKi1WapCMRUqQ93E7Qow5onKgL3nyG3HW9Cse7vo%2BtUChRQ%40mail.gmail.com%3E
-
-Binding +1s:
-Hadrian Zbarcea (IPMC)
-Richard Downer
-Sam Corbett
-Aled Sage
-Andrea Turli
-
-Non-binding +1s:
-Ciprian Ciubotariu
-
-Thanks to everyone that tested our release and voted.
-
-We will shortly begin a vote on the incubator-general list.
-
-
-Thanks.
-
-{% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/fork-after.png
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/fork-after.png b/brooklyn-docs/website/developers/fork-after.png
deleted file mode 100644
index 3148ff3..0000000
Binary files a/brooklyn-docs/website/developers/fork-after.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/fork-before.png
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/fork-before.png b/brooklyn-docs/website/developers/fork-before.png
deleted file mode 100644
index 276eb9d..0000000
Binary files a/brooklyn-docs/website/developers/fork-before.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/fork-new.png
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/fork-new.png b/brooklyn-docs/website/developers/fork-new.png
deleted file mode 100644
index 34c2053..0000000
Binary files a/brooklyn-docs/website/developers/fork-new.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/how-to-contribute.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/how-to-contribute.md b/brooklyn-docs/website/developers/how-to-contribute.md
deleted file mode 100644
index 0c39521..0000000
--- a/brooklyn-docs/website/developers/how-to-contribute.md
+++ /dev/null
@@ -1,109 +0,0 @@
----
-layout: website-normal
-title: How to Contribute
-children:
-- { section: Contributor License Agreement, title: CLA }
-- { section: Create an Issue in Jira, title: Jira }
-- { section: Contributing using GitHub, title: GitHub }
-- { section: Reviews }
-- { section: Handy Places }
----
-
-Welcome and thank you for your interest in contributing to Apache Brooklyn! This guide will take you through the
-process of making contributions to the Apache Brooklyn code base.
-
-<div class="panel panel-info">
-<div class="panel-heading" markdown="1">
-#### TL;DR
-</div>
-<div class="panel-body" markdown="1">
-
-* Pull request to [GitHub](http://github.com/apache/incubator-brooklyn).
-* Sign the [Apache CLA](https://www.apache.org/licenses/#clas) if it's non-trivial.
-* For bigger changes, open a [Jira](https://issues.apache.org/jira/browse/BROOKLYN)
-   and/or [email the list](../community/mailing-lists.html).
-
-</div>
-</div>
-
-## Contributor License Agreement
-
-Apache Brooklyn is licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). All
-contributions will be under this license, so please read and understand this license before contributing.
-
-For all but the most trivial patches, you are required to file a Contributor License Agreement with the Apache
-Software Foundation. Please read the [guide to CLAs](https://www.apache.org/licenses/#clas) to find out how to file a
-CLA with the Foundation.
-
-
-## Before You Start
-
-### Join the Community
-
-If it's your first contribution or it's a particularly big or complex contribution, things typically go much more
-smoothly when they start off with a conversation. 
-Significant changes are normally discussed on the mailing list in any case,
-sometimes with a [feature proposal](https://drive.google.com/drive/#folders/0B3XurVLRa7pIUHNFV3NuVVRkRlE/0B3XurVLRa7pIblN4NGRNN2dYUGM/0B3XurVLRa7pIMlZQSUxrdTh4Wmc) document.
-
-Visit our [Community](index.html) page to see how to contact Brooklyners via IRC or email.
-
-### Create an Issue in Jira
-
-The first step is usually to create or find an issue in [Brooklyn's Jira](https://issues.apache.org/jira/browse/BROOKLYN)
-for your feature request or fix. For small changes this isn't necessary, but it's good to see if your change fixes an
-existing issue anyway.
-
-
-### Contributing using GitHub
-
-This is our preferred way for contributing code. Our GitHub repository is located at
-[https://github.com/apache/incubator-brooklyn](https://github.com/apache/incubator-brooklyn)
-
-Your commit messages must properly describes the changes that have been made and their purpose
-([here are some guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)). If your
-contributions fix a Jira issue, then ensure that you reference the issue (like `BROOKLYN-9876`) in the commit message.
-
-Create a pull request (PR) in GitHub for the change you're interested in making. The comment section of the PR must
-contain a link to the Jira issue (if it has one).
-
-Some good references for working with GitHub are below.  We ask that you keep your change rebased to master as much
-as possible, and we will ask you to rebase again if master has moved before accepting your patch.
-
-- [Setting Up Git with GitHub](https://help.github.com/articles/set-up-git)
-- [Forking a Repository](https://help.github.com/articles/fork-a-repo)
-- [Submitting Pull Requests](https://help.github.com/articles/using-pull-requests)
-- [Rebasing your Branch](https://help.github.com/articles/interactive-rebase)
-
-Finally, add a comment in the Jira issue with a link to the pull request so we know the code is ready to be reviewed.
-
-### Reviews
-
-The Apache Brooklyn community will review your pull request before it is merged. This process can take a while, so
-please be patient. If we are slow to respond, please feel free to post a reminder to the PR, Jira issue, IRC channel
-or mailing list - see the [Community](../community/) page to see how to contact us.
-
-During the review process you may be asked to make some changes to your submission. While working through feedback,
-it can be beneficial to create new commits so the incremental change is obvious.  This can also lead to a complex set
-of commits, and having an atomic change per commit is preferred in the end.  Use your best judgement and work with
-your reviewer as to when you should revise a commit or create a new one.
-
-A pull request is considered ready to be merged once it gets at lease one +1 from a committer. Once all the changes
-have been completed and the pull request is accepted, you may be asked to rebase it against the latest code. You may
-also wish to squash some commits together and make other history revisions, to leave the commit history clean and
-easily understood.
-
-
-### Contributing without using GitHub
-
-If you prefer to not use GitHub, then that is fine - we are also happy to accept patches attached to a Jira issue.
-Our canonical repository is located at `https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git`; for example:
-
-    $ git clone https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git
-
-When producing patches, please use `git format-patch` or a similar mechanism - this will ensure that you are properly
-attributed as the author of the patch when a committer merges it.
-
-
-## Handy Places
-
-Development bookmarks are available [here](links.html).

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/index.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/index.md b/brooklyn-docs/website/developers/index.md
deleted file mode 100644
index eb74497..0000000
--- a/brooklyn-docs/website/developers/index.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-layout: website-normal
-title: Developers
-children:
-- how-to-contribute.md
-- /guide/dev/
-- committers/
-- code-standards.md
-- { link: 'http://github.com/apache/incubator-brooklyn', title: 'GitHub' }
-- { link: 'https://issues.apache.org/jira/browse/BROOKLYN', title: 'Bug Tracker (JIRA)' }
----
-
-Hello developers!
-These pages are aimed at people who want to get involved with reading, changing, testing and otherwise
-working with the bleeding edge Brooklyn code.
-
-<div class="panel panel-danger">
-<div class="panel-heading" markdown="1">
-#### Caution
-</div>
-<div class="panel-body" markdown="1">
-As these pages contain information about accessing the bleeding edge code and artifacts produced from it,
-you should be aware that the code and binaries you will encounter may be unstable.
-The Apache Software Foundation has not performed the level of validation and due diligence done 
-on formally released artifacts. 
-Proceed only if you understand the potential consequences of using unreleased code
-and are comfortable doing so.
-</div>
-</div>
-
-We heartily welome contributions and new members.
-There's nothing official needed to get involved; 
-simply come say hello somewhere in the [community](../community/index.html):
-
-- [Mailing lists](../community/mailing-lists.html)
-- [IRC channel](../community/irc.html)
-- [JIRA for bug tracking](https://issues.apache.org/jira/browse/BROOKLYN)
-
-Once you have some code or a blueprint you want to share, 
-there are a few instructions to note on [how to contribute](how-to-contribute.html).
-
-If you're looking to learn more about the codebase itself, 
-have a look at [Developer Guide]({{ site.path.guide }}/dev/).
-There are also a number of [development bookmarks](links.html) for the tools we use
-(git, jenkins, jira).
-

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/links.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/links.md b/brooklyn-docs/website/developers/links.md
deleted file mode 100644
index e684e1c..0000000
--- a/brooklyn-docs/website/developers/links.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: website-normal
-title: Development Bookmarks
-menu_proxy_for: index.md
----
-
-{% include fields.md %}
-
-Handy places:
-
-* **Code** is in Github at [https://github.com/apache/incubator-brooklyn/](https://github.com/apache/incubator-brooklyn/)
-
-* **Issues** are in Jira at [https://issues.apache.org/jira/browse/BROOKLYN/](https://issues.apache.org/jira/browse/BROOKLYN/)
-
-* **Maven repositories** are:
-  * [Apache releases]({{ apache_releases_repo_groupid_url }})
-  * [Apache snapshots]({{ apache_snapshots_repo_groupid_url }})
-  * Other repositories are at [http://developers.cloudsoftcorp.com/download/maven2/](http://developers.cloudsoftcorp.com/download/maven2/) for releases 
-  and [http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/](http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/) for snapshots
-            
-* **CI server** is a jenkins server at: [https://builds.apache.org/job/incubator-brooklyn-master-build/](https://builds.apache.org/job/incubator-brooklyn-master-build/)
-

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/developers/pull-request.png
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/developers/pull-request.png b/brooklyn-docs/website/developers/pull-request.png
deleted file mode 100644
index 70407f2..0000000
Binary files a/brooklyn-docs/website/developers/pull-request.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/documentation/faq.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/documentation/faq.md b/brooklyn-docs/website/documentation/faq.md
deleted file mode 100644
index 7af5f80..0000000
--- a/brooklyn-docs/website/documentation/faq.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: FAQ
-layout: website-normal
----
-
-## What's the difference between Brooklyn and...
-
-#### Chef and Puppet and other server config management tools?
-
-#### Cloudformation and Heat and other infrastructure declarative tools?
- 
-#### CloudFoundry and other PaaS platforms?
-
-  
-## Why is this page blank?
-
-Supplying the answers are a TODO.
-
-
-## How do I supply answers?
-
-Click the "Edit this Page" link in the bottom right.
-
-
-# Common Problems:
-
-## java.lang.OutOfMemoryError: unable to create new native thread
-
-You could encounter this error when running with many entities.
-
-Please **increase the ulimit** if you see such error:
-
-On the VM running Apache Brooklyn, we recommend ensuring nproc and nofile are reasonably high (e.g. higher than 1024, which is often the default).
-We recommend setting it limits to a value above 16000.
-
-If you want to check the current limits run `ulimit -a`.
-
-Here are instructions for how to increase the limits for RHEL like distributions.
-Run `sudo vi /etc/security/limits.conf` and add (if it is "brooklyn" user running Apache Brooklyn):
-
-    brooklyn           soft    nproc           16384
-    brooklyn           hard    nproc           16384
-    brooklyn           soft    nofile          16384
-    brooklyn           hard    nofile          16384
-
-
-Generally you do not have to reboot to apply ulimit values. They are set per session.
-So after you have the correct values, quit the ssh session and log back in.
-
-For more details, see one of the many posts such as http://tuxgen.blogspot.co.uk/2014/01/centosrhel-ulimit-and-maximum-number-of.html

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/documentation/glossary.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/documentation/glossary.md b/brooklyn-docs/website/documentation/glossary.md
deleted file mode 100644
index 0651068..0000000
--- a/brooklyn-docs/website/documentation/glossary.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-layout: website-normal
-title: Glossary
----
-
-[//]: # (Abusing link groups to write comments that are not rendered in the document..)
-[//]: # (The links below reference the id attributes generated for the headers.)
-[//]: # (For example, the Autonomic section can be referred to with a link to #autonomic.)
-[//]: # (So if you alter any of the headers you should update the relevant link group too.)
-
-[autonomic]: #autonomic
-[blueprint]: #blueprint
-[effector]: #effector
-[entity]: #entity
-[policy]: #policy
-[sensor]: #sensor
-[YAML]: #yaml
-
-[//]: # (Note: Autonomic and blueprint section could link to learnmore page.)
-
-
-#### Autonomic
-
-Refers to the self-managing characteristics of distributed computing resources,
-adapting to unpredictable changes while hiding intrinsic complexity to
-operators and users.
-
-
-#### Blueprint
-
-A description of an application or system, which can be used for its automated
-deployment and runtime management. The blueprint describes a model of the
-application (i.e. its components, their configuration, and their
-relationships), along with policies for runtime management. The blueprint can
-be described in [YAML][].
-
-###### See also
-* [Documentation]({{site.path.website}}/learnmore/catalog/index.html) for the entity,
-  policy and enricher blueprints that Apache Brooklyn supports out-of-the-box.
-
-
-#### Effector
-
-An operation on an [entity][].
-
-
-#### Entity
-
-A component of an application or system. This could be a physical component, a
-service, a grouping of components, or a logical construct describing part of an
-application/system. It is a "managed element" in autonomic computing parlance.
-
-
-#### Policy
-
-Part of an autonomic management system, performing runtime management. A policy
-is associated with an [entity][]; it normally manages the health of that entity
-or an associated group of entities (e.g. HA policies or auto-scaling policies).
-
-
-#### Sensor
-
-An attribute of an [entity][].
-
-
-#### YAML
-
-A human-readable data format.
-
-###### See also
-* [Wikipedia article](http://en.wikipedia.org/wiki/YAML) on YAML
-
-
-#### Apache Jclouds
-
-An open source Java library that provides a consistent interface to many
-clouds. Apache Brooklyn uses Apache Jclouds as its core cloud abstraction.
-
-###### See also
-* [Project homepage](https://jclouds.apache.org/)
-
-
-#### CAMP and TOSCA
-
-OASIS Cloud Application Management for Platforms (CAMP) and OASIS Topology and
-Orchestration Specification for Cloud Applications (TOSCA) are specifications
-that aim to standardise the portability and management of cloud applications.
-
-###### See also
-* [CAMP homepage](https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=camp)
-* [TOSCA homepage](https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=tosca)
-

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/documentation/increase-entropy.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/documentation/increase-entropy.md b/brooklyn-docs/website/documentation/increase-entropy.md
deleted file mode 100644
index 53d5768..0000000
--- a/brooklyn-docs/website/documentation/increase-entropy.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Increase Entropy
-layout: website-normal
----
-If you are installing AMP on a virtual machine, you may find it useful to increase the Linux kernel entropy to speed up the ssh connections to the managed entities. You can install and configure `rng-tools` or just use /dev/urandom`.
-
-### Installing rng-tool
-if you are using a RHEL-based OS:
-{% highlight bash %}
-yum -y -q install rng-tools
-echo "EXTRAOPTIONS=\"-r /dev/urandom\"" | cat >> /etc/sysconfig/rngd
-/etc/init.d/rngd start
-{% endhighlight %}
-
-if you are using a Debian-based OS:
-{% highlight bash %}
-apt-get -y install rng-tools
-echo "HRNGDEVICE=/dev/urandom" | cat >> /etc/default/rng-tools
-/etc/init.d/rng-tools start
-{% endhighlight %}
-
-The following links contain further [information for RHEL or CentOS](http://my.itwnik.com/how-to-increase-linux-kernel-entropy/), and [Ubuntu](http://www.howtoforge.com/helping-the-random-number-generator-to-gain-enough-entropy-with-rng-tools-debian-lenny).
-
-### Using /dev/urandom
-You can also just mv /dev/random then create it again linked to /dev/urandom, by issuing the following commands:
-
-{% highlight bash %}
-sudo mv /dev/random /dev/random-real
-sudo ln -s /dev/urandom /dev/random
-{% endhighlight %}
-

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/documentation/index.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/documentation/index.md b/brooklyn-docs/website/documentation/index.md
deleted file mode 100644
index 5c07fa1..0000000
--- a/brooklyn-docs/website/documentation/index.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-layout: website-normal
-title: Documentation
-children:
-- /guide/
-- /guide/dev/
-- ../meta/versions.md
-- other-docs.md
----
-
-{% comment %}
-TODO add a bunch more here
-
-TODO add FAQ
-{% endcomment %}
-
-## Official User Guide
-
-Our main user manual is organised by release version. Please pick the version that you are using:
-
-- [{{ site.brooklyn-stable-version }}]({{ site.path.v }}/latest) -
-  This is the latest stable version.
-
-- [Older versions]({{ site.path.website }}/meta/versions.html)
-
-
-## Other Docs
-
-Other mini-docs are available [here](other-docs.html),
-or see the [Learn More]({{ site.path.website }}/learnmore) section of the site.

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/documentation/other-docs.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/documentation/other-docs.md b/brooklyn-docs/website/documentation/other-docs.md
deleted file mode 100644
index 0b80ce7..0000000
--- a/brooklyn-docs/website/documentation/other-docs.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: Other Resources
-layout: website-normal
-children:
-- { path: glossary.md }
-- { path: ../meta/versions.md }
-- { path: ../meta/sitemap.md }
----
-
-{% include list-children.html %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/download/index.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/download/index.md b/brooklyn-docs/website/download/index.md
deleted file mode 100644
index 077e068..0000000
--- a/brooklyn-docs/website/download/index.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-layout: website-normal
-title: Download
-children:
-- { path: /guide/misc/download.md, title: Details }
-- { path: verify.md, title: Verify }
-- /guide/misc/release-notes.md
-- ../meta/versions.md
----
-
-<div class="row">
-<div class="col-md-6" markdown="1">
-
-<div class="panel panel-default">
-  <div class="panel-heading" markdown="1">
-#### **Distribution** (Recommended)
-  </div>
-  <div class="panel-body" markdown="1">
-<div style="height: 9em;" markdown="1">
-A pre-built package that contains Apache Brooklyn and all of its dependencies in a single, easy-to-run package. 
-*Suitable for Linux and Windows servers and workstations with Java installed
-(Java 1.7 or 1.8 are supported, including OpenJDK, Oracle, and IBM varieties).*
-</div>
-
-**Choose your preferred file format to see the list of mirrors where you can download this file.**
-
-<div class="text-center">
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-bin.tar.gz" role="button">Tarball</a>
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-bin.zip" role="button">Zip</a>
-  <br /><small>These are not direct download links, sorry</small>
-</div>
-  </div>
-</div>
-
-</div><!-- col -->
-<div class="col-md-6" markdown="1">
-
-<div class="panel panel-default">
-  <div class="panel-heading" markdown="1">
-#### Source Code
-  </div>
-  <div class="panel-body" markdown="1">
-<div style="height: 9em;" markdown="1">
-The source code for Apache Brooklyn. Use this to build your own binaries and make private modifications. *If you want to
-contribute code changes to Apache Brooklyn, we recommend you get the source code from version control. Visit the
-[Developers pages](../developers/index.html) to find out more.*
-</div>
-
-**Choose your preferred file format to see the list of mirrors where you can download this file.**
-
-<div class="text-center">
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-src.tar.gz" role="button">Tarball</a>
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-src.zip" role="button">Zip</a>
-  <br /><small>These are not direct download links, sorry</small>
-</div>
-  </div>
-</div>
-
-</div><!-- col -->
-</div><!-- row -->
-
-A full list of download links including Maven coordinates are [here]({{ site.path.guide }}/misc/download.html).
-<br/><br/>
-
-## What Next?
-
-<div class="row">
-<div class="col-md-6" markdown="1">
-
-<div class="panel panel-default">
-  <div class="panel-heading" markdown="1">
-#### Verify Your Download
-  </div>
-  <div class="panel-body" markdown="1" style="height: 7em;">
-
-[Hashes and signatures](verify.html) of all our artifacts are available, if you wish to verify that they are genuine.
-
-  </div>
-</div>
-
-</div><!-- col -->
-<div class="col-md-6" markdown="1">
-
-<div class="panel panel-default">
-  <div class="panel-heading" markdown="1">
-#### **Get Started!**
-  </div>
-  <div class="panel-body" markdown="1" style="height: 7em;">
-
-Take a look at our guide to getting started.
-
-<div class="text-center">
-  <a class="btn btn-primary" href="{{ site.path.guide }}/start/running.html" role="button">Get Started!</a>
-</div>
-
-</div>
-
-</div><!-- col -->
-</div><!-- row -->

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/download/verify.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/download/verify.md b/brooklyn-docs/website/download/verify.md
deleted file mode 100644
index 7fff787..0000000
--- a/brooklyn-docs/website/download/verify.md
+++ /dev/null
@@ -1,151 +0,0 @@
----
-layout: website-normal
-title: Verify the Integrity of Downloads
----
-
-You can verify the integrity of the downloaded files using their PGP signatures or SHA-1 checksums.
-
-## Verifying Hashes
-
-To verify the downloads, first get the MD5, SHA1 and/or SHA256 hashes using these links. 
-Note that all links are for first-class Apache Software Foundation mirrors 
-so there is already reduced opportunity for anyone maliciously tampering with these files.
-
-<table class="table">
-<tr>
-<th>Artifact</th>
-<th colspan="3">Hashes</th>
-</tr>
-
-<tr>
-<td>apache-brooklyn-0.8.0-incubating-bin.tar.gz</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha256">sha256</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.8.0-incubating-bin.zip</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha256">sha256</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.8.0-incubating-src.tar.gz</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha256">sha256</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.8.0-incubating-src.zip</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha256">sha256</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-incubating-bin.tar.gz</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.sha256">sha256</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-incubating-bin.zip</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip.sha256">sha256</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-incubating-src.tar.gz</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz.sha256">sha256</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-incubating-src.zip</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip.sha256">sha256</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-M2-incubating</td>
-<td><a href="https://www.apache.org/dist/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.sha256">sha256</a></td>
-</tr>
-</table>
-
-You can verify the SHA1 or SHA256 hashes easily by placing the files in the same folder as the download artifact and
-then running `shasum`, which is included in most UNIX-like systems:
-
-{% highlight bash %}
-shasum -c apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz.sha1
-shasum -c apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz.sha256
-{% endhighlight %}
-
-You can verify the MD5 hashes by running a command like this, and comparing the output to the contents of the `.md5` file:
-
-{% highlight bash %}
-md5 apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz
-{% endhighlight %}
-
-
-## Verifying PGP Signatures using PGP or GPG
-
-You can download PGP/GPG signatures using these links. Note that these links are for first-class Apache
-Software Foundation mirrors so there will be reduced opportunity for tampering with these files.
-
-<table class="table">
-<tr>
-<th>Artifact</th>
-<th colspan="2">Link</th>
-</tr>
-<tr>
-<td>Release Manager's public keys</td>
-<td><a href="https://www.apache.org/dist/brooklyn/KEYS">KEYS</a></td>
-</tr>
-
-<tr>
-<td>apache-brooklyn-0.7.0-incubating-bin.tar.gz</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.asc">asc</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-incubating-bin.zip</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip.asc">asc</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-incubating-src.tar.gz</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz.asc">asc</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-incubating-src.zip</td>
-<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip.asc">asc</a></td>
-</tr>
-<tr>
-<td>apache-brooklyn-0.7.0-M2-incubating.tar.gz</td>
-<td><a href="https://www.apache.org/dist/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.asc">asc</a></td>
-</tr>
-
-</table>
-
-In order to validate the release signature, download both the release `.asc` file for the release, and the `KEYS` file
-which contains the public keys of key individuals in the Apache Brooklyn project.
-
-Verify the signatures using one of the following commands:
-
-{% highlight bash %}
-pgpk -a KEYS
-pgpv brooklyn-{{ site.brooklyn-stable-version }}-dist.tar.gz.asc
-{% endhighlight %}
-
-or
-
-{% highlight bash %}
-pgp -ka KEYS
-pgp brooklyn-{{ site.brooklyn-stable-version }}-dist.zip.asc
-{% endhighlight %}
-
-or
-
-{% highlight bash %}
-gpg --import KEYS
-gpg --verify brooklyn-{{ site.brooklyn-stable-version }}-dist.tar.gz.asc
-{% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6e86cb02/brooklyn-docs/website/index.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/index.md b/brooklyn-docs/website/index.md
deleted file mode 100644
index e419488..0000000
--- a/brooklyn-docs/website/index.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-layout: website-landing
-title: Home
-landing: true
-children:
-- learnmore/
-- { path: download/, menu: null }
-- { path: /guide/start/index.md, title_in_menu: Get Started, href_path: /guide/start/index.md}
-- path: documentation/
-  menu:
-  - { path: /guide/index.md, title_in_menu: "User Guide", 
-      menu_customization: { dropdown_section_header: true } }
-  - { path: /guide/yaml/index.md, title_in_menu: YAML Blueprints, href_path: /guide/yaml/creating-yaml.md }
-  - { path: /guide/java/index.md, title_in_menu: Java Blueprints }
-  - { path: /guide/ops/index.md, title_in_menu: Operations,
-      menu_customization: { dropdown_section_header: true } }
-  - { path: /guide/dev/index.md, title_in_menu: Developer Guide }
-  - { path: meta/versions.md, title_in_menu: Versions,
-      menu_customization: { dropdown_new_section: true } }
-  - { path: documentation/other-docs.md, title_in_menu: Other Resources }
-- community/
-- developers/
----
-
-<div class="jumbotron">
-<div id="apachebrooklynbanner">&nbsp;</div>
-
-<div class="row">
-<div class="col-md-4" markdown="1">
-
-### model
-
-*Blueprints* describe your application, stored as *text files* in *version control*
-
-*Compose* from the [*dozens* of supported components](learnmore/catalog/) or your *own components* using *bash, Java, Chef...*
-
-<div class="text-muted" markdown="1">
-#### JBoss &bull; Cassandra &bull; QPid &bull; nginx &bull; [many more](learnmore/catalog/)
-</div>
-
-</div>
-<div class="col-md-4" markdown="1">
-
-### deploy
-
-Components *configured &amp; integrated* across *multiple machines* automatically
-
-*20+ public clouds*, or your *private cloud* or bare servers - and *Docker* containers
-
-<div class="text-muted" markdown="1">
-#### Amazon EC2 &bull; CloudStack &bull; OpenStack &bull; SoftLayer &bull; many more
-</div>
-
-</div>
-<div class="col-md-4" markdown="1">
-
-### manage
-
-*Monitor* key application *metrics*; *scale* to meet demand; *restart* and *replace* failed components
-
-View and modify using the *web console* or automate using the *REST API*
-
-<div class="text-muted" markdown="1">
-#### Metric-based autoscaler &bull; Restarter &amp; replacer &bull; Follow the sun &bull; Load balancing 
-</div>
-
-</div>
-</div><!-- row -->
-
-<div style="text-align: center" markdown="1">
-
-<a class="btn btn-primary btn-lg" role="button" href="learnmore/">learn more</a>
-<a class="btn btn-primary btn-lg" role="button" href="{{ site.path.guide }}/start/running.html">get started</a>
-
-</div>
-
-</div><!-- jumbotron -->