Release 0.7.2

Fix plugin link
[ci skip]
2016-09-25 02:15:30 -06:00 · 2016-09-25 01:59:39 -06:00 · 2016-09-25 01:57:33 -06:00 · 2016-09-25 01:55:43 -06:00 · 2016-09-25 01:39:54 -06:00 · 2016-09-25 01:39:36 -06:00
88 changed files with 720 additions and 413 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-.vagrant
+*.deb
 .DS_Store
+.ruby-version
+.vagrant
+data/
 stack.tgz
 tmp
-*.deb
-.ruby-version
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # How to contribute

-The Dokku project would love to welcome your contributions. There are 
+The Dokku project would love to welcome your contributions. There are
 several ways to help out:

 * Create an [issue](https://github.com/dokku/dokku/issues) on GitHub, if you
@@ -11,7 +11,7 @@ several ways to help out:
 * Contribute to the [documentation](http://dokku.viewdocs.io/dokku/)
 * Come up with new ways to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795)
 * Blog about different ways you are using dokku
-* [Sponsor](https://opencollective.com/dokku#support) the Dokku project financially 
+* [Sponsor](https://opencollective.com/dokku#support) the Dokku project financially

 There are a few guidelines that we need contributors to follow so that we have
 a chance of keeping on top of things.
@@ -44,10 +44,10 @@ A great way to contribute to the project is to send a detailed report when you
 encounter an issue. We always appreciate a well-written, thorough bug report,
 and will thank you for it!

-Sometimes dokku is missing a feature you need. In some cases, those features can
+Sometimes  Dokku  is missing a feature you need. In some cases, those features can
 be found in pre-existing [plugins](http://dokku.viewdocs.io/dokku/plugins/),
 and we encourage our users to create and contribute such packages. From time to
-time, we will also pull plugins into the dokku core when the task they solve is
+time, we will also pull plugins into the Dokku core when the task they solve is
 a common one for our users.

 Check that [our issue database](https://github.com/dokku/dokku/issues)
@@ -74,7 +74,7 @@ Our Issue Report Template is available [here](https://github.com/dokku/dokku/blo

 ## Contributing

-Before you contribute to the dokku project, there are a few things that you'll
+Before you contribute to the Dokku project, there are a few things that you'll
 need to do

 * Make sure you have a [GitHub account](https://github.com/signup/free).
@@ -122,7 +122,7 @@ All changes should be be based on the latest master commit.

 ### When will my change be merged?

-Be patient! The dokku maintainers will review all pull requests and comment as
+Be patient! The Dokku maintainers will review all pull requests and comment as
 quickly as possible. There may be some back and forth while the details of your
 pull request are discussed.

--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,40 @@
 # History

+## 0.7.2
+
+This minor release contains mostly documentation changes, and should be fully backwards compatible with previous 0.7.x releases.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2392: @swg Specify python2 for get_json functions
+- #2408: @jcscottiii Use $DOKKU_VHOST_ENABLE instead of $VHOST_ENABLE in bootstrap.sh
+- #2417: @PWAckerman Remove extra quotes from DYNO environment variable
+- #2426: @michaelshobbs add force option on docker tag when available
+
+### New Features
+
+- #2418: @michaelshobbs Update to plugn 0.2.2
+- #2423: @michaelshobbs Update to herokuish 0.3.19
+
+### Documentation
+
+- #2393: @josegonzalez Deprecate all process manager plugins
+- #2394: @josegonzalez Deprecate old graphite plugin and add official graphite plugin
+- #2395: @josegonzalez Deprecate sekjun9878/redis
+- #2396: @josegonzalez Deprecate multi-buildpack plugin
+- #2397: @josegonzalez Update compatibility of dokku feature plugin
+- #2398: @josegonzalez Update compatibility of "other plugins"
+- #2404: @bascht Fix docker build syntax in image tags documentation
+- #2405: @josegonzalez Fully document the ps plugin
+- #2409: @josegonzalez Document caveats around ps:rebuild and tags/tar deployed applications
+- #2416: @njaxx Adds a mention of manually adding nginx entry
+- #2420: @c990802 Update command example for consistency
+- #2410: @IlyaSemenov Clarify domains help, improve domains unit tests
+- #2429: @enisozgen Minor documentation fixes
+- #2431: @josegonzalez Add missing redirect for deployment/deployment-tasks
+
 ## 0.7.1

 ### Bug Fixes
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -21,12 +21,12 @@ Output of the following commands
  - If using buildpacks, which custom buildpacks are in use
  - If using a `Dockerfile`, the contents of that file
  - If it exists, the contents of your `Procfile`.
- Output of failing dokku commands after running `dokku trace on`
+- Output of failing Dokku commands after running `dokku trace on`
  (BEWARE: `trace on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):

 Environment details (AWS, VirtualBox, physical, etc.):

-How was dokku installed?:
+How was Dokku installed?:

 How reproducible:

--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 DOKKU_VERSION = master

 SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.6.0/sshcommand
-PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz
+PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.2/plugn_0.2.2_linux_x86_64.tgz
 SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git
 PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.

 To install the latest stable release, you can run the following commands as a user that has access to `sudo`:

-    wget https://raw.githubusercontent.com/dokku/dokku/v0.7.1/bootstrap.sh
-    sudo DOKKU_TAG=v0.7.1 bash bootstrap.sh
+    wget https://raw.githubusercontent.com/dokku/dokku/v0.7.2/bootstrap.sh
+    sudo DOKKU_TAG=v0.7.2 bash bootstrap.sh

 ### Upgrading

@@ -32,7 +32,7 @@ You can use [Github Issues](https://github.com/dokku/dokku/issues), check [Troub

 After checking [Github Issues](https://github.com/dokku/dokku/issues), the [Troubleshooting Guide](http://dokku.viewdocs.io/dokku/getting-started/troubleshooting/) or having a chat with us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku), feel free to fork and create a Pull Request.

-While we may not merge your PR as is, they serve to start conversations and improve the general dokku experience for all users.
+While we may not merge your PR as is, they serve to start conversations and improve the general Dokku experience for all users.

 ## Sponsors

--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -109,7 +109,7 @@ install-dokku-from-package() {
  echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | tee /etc/apt/sources.list.d/dokku.list
  apt-get update -qq > /dev/null

-  [[ -n $DOKKU_VHOST_ENABLE ]]  && echo "dokku dokku/vhost_enable boolean $VHOST_ENABLE"         | sudo debconf-set-selections
+  [[ -n $DOKKU_VHOST_ENABLE ]]  && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE"   | sudo debconf-set-selections
  [[ -n $DOKKU_WEB_CONFIG ]]    && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG"       | sudo debconf-set-selections
  [[ -n $DOKKU_HOSTNAME ]]      && echo "dokku dokku/hostname string $DOKKU_HOSTNAME"            | sudo debconf-set-selections
  [[ -n $DOKKU_SKIP_KEY_FILE ]] && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | sudo debconf-set-selections
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -9,7 +9,7 @@ import subprocess
 import sys
 import threading

-VERSION = 'v0.7.1'
+VERSION = 'v0.7.2'

 hostname = ''
 try:
--- a/deb.mk
+++ b/deb.mk
@@ -1,6 +1,6 @@
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.3.18
+HEROKUISH_VERSION ?= 0.3.19
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb

@@ -15,7 +15,7 @@ You can use any language you want, so long as the script is
 executable and has the proper language requirements installed
 endef
 PLUGN_REPO_NAME ?= dokku/plugn
-PLUGN_VERSION ?= 0.2.1
+PLUGN_VERSION ?= 0.2.2
 PLUGN_ARCHITECTURE = amd64
 PLUGN_PACKAGE_NAME = plugn_$(PLUGN_VERSION)_$(PLUGN_ARCHITECTURE).deb
 PLUGN_URL = https://github.com/dokku/plugn/releases/download/v$(PLUGN_VERSION)/plugn_$(PLUGN_VERSION)_linux_x86_64.tgz
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.7.1
+Version: 0.7.2
 Section: web
 Priority: optional
 Architecture: amd64
--- a/docs/advanced-usage/backup-recovery.md
+++ b/docs/advanced-usage/backup-recovery.md
@@ -4,7 +4,7 @@

 ## Backup and Migration Tutorial

-Because Dokku is git based, rebuilding a deployed app is as easy as pushing from git. You can push to a new server by updating the dokku remote in you local app's repo.
+Because Dokku is git based, rebuilding a deployed app is as easy as pushing from git. You can push to a new server by updating the `dokku` remote in you local app's repo.

 ```shell
 git remote rm dokku
@@ -24,14 +24,14 @@ dokku postgres:import [db_name] < [db_name].dump

 ## Volumes and Static Assets

-Dokku doesn't enforce a [300mb](https://devcenter.heroku.com/articles/slug-compiler#slug-size) limit on apps, but it's best practice to keep binary assets outside of git. Since containers are considered volatile in Dokku, external stores like s3 or storage mounts should be used for non-volatile items like user uploads. The dokku storage core plugin can be used to mount local directories / volumes inside the docker container.
+Dokku doesn't enforce a [300mb](https://devcenter.heroku.com/articles/slug-compiler#slug-size) limit on apps, but it's best practice to keep binary assets outside of git. Since containers are considered volatile in Dokku, external stores like s3 or storage mounts should be used for non-volatile items like user uploads. The Dokku storage core plugin can be used to mount local directories / volumes inside the docker container.

 See the [persistent storage documentation](/dokku/advanced-usage/persistent-storage/) for more details.


 ## Disaster Recovery

-The best plan for disaster recovery is to always keep multiple (remote) copies of your local repo, static assets and periodic database dumps. In case of an emergency when your git repo and backups are completely lost, you can recover the last pushed copy from your remote dokku server (assuming you still have the ssh key).
+The best plan for disaster recovery is to always keep multiple (remote) copies of your local repo, static assets and periodic database dumps. In case of an emergency when your git repo and backups are completely lost, you can recover the last pushed copy from your remote Dokku server (assuming you still have the ssh key).

 ```shell
 mkdir [app-name] ; cd !$
--- a/docs/advanced-usage/deployment-tasks.md
+++ b/docs/advanced-usage/deployment-tasks.md
@@ -5,16 +5,16 @@
 Sometimes you need to run a command on at deployment time, but before an app is completely deployed.
 Common use cases include:

-* Checking a database is initialised
+* Checking a database is initialized
 * Running database migrations
 * Any commands required to set up the server (e.g. something like a Django `collectstatic`)

 ## `app.json` and `scripts.dokku`

 Dokku accomplishes this by using an `app.json` file. The format in use is similar to format of Heroku's [app.json](https://devcenter.heroku.com/articles/app-json-schema).
-However, dokku currently only supports the nodes `scripts.dokku.predeploy` and `scripts.dokku.postdeploy`.
+However, Dokku currently only supports the nodes `scripts.dokku.predeploy` and `scripts.dokku.postdeploy`.
 For buildpack apps, simply place an `app.json` file in the root of your repository.
-For dockerfile apps, place `app.json` in the configured `WORKDIR` directory; otherwise dokku defaults to the buildpack app behavior of looking in `/app`.
+For dockerfile apps, place `app.json` in the configured `WORKDIR` directory; otherwise Dokku defaults to the buildpack app behavior of looking in `/app`.
 >NOTE: postdeploy changes are *NOT* committed to the app image.

 ### Example app.json
--- a/docs/advanced-usage/persistent-storage.md
+++ b/docs/advanced-usage/persistent-storage.md
@@ -2,7 +2,7 @@

 > New as of 0.5.0

-The preferred method to mount external containers to a dokku managed container, is to use the dokku storage plugin.
+The preferred method to mount external containers to a Dokku managed container, is to use the Dokku storage plugin.


 ```
@@ -63,7 +63,7 @@ Your app may have services that are running in memory and need to be backed up l

 ### Build phase

-By default, dokku will only bind storage mounts during the deploy and run phases. Under certain conditions, one might want to bind a storage mount during the build phase. This can be accomplished by using the `docker-options` plugin directly.
+By default, Dokku will only bind storage mounts during the deploy and run phases. Under certain conditions, one might want to bind a storage mount during the build phase. This can be accomplished by using the `docker-options` plugin directly.

 ```shell
 dokku docker-options:add <app> build "-v /tmp/python-test:/opt/test"
@@ -82,8 +82,8 @@ The storage plugin is compatible with storage mounts created with the docker-opt

 ## Application User and Persistent Storage file ownership (buildpack apps only)

-By default, dokku will execute your buildpack application processes as the `herokuishuser` user. You may override this by setting the `DOKKU_APP_USER` config variable.
+By default, Dokku will execute your buildpack application processes as the `herokuishuser` user. You may override this by setting the `DOKKU_APP_USER` config variable.

 > NOTE: this user must exist in your herokuish image.

-Additionally, dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`.
+Additionally, Dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`.
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,30 +31,30 @@ dokku plugin

 ```
 plugn: dev
-  00_dokku-standard    0.7.1 enabled    dokku core standard plugin
-  20_events            0.7.1 enabled    dokku core events logging plugin
-  apps                 0.7.1 enabled    dokku core apps plugin
-  build-env            0.7.1 enabled    dokku core build-env plugin
-  certs                0.7.1 enabled    dokku core certificate management plugin
-  checks               0.7.1 enabled    dokku core checks plugin
-  common               0.7.1 enabled    dokku core common plugin
-  config               0.7.1 enabled    dokku core config plugin
-  docker-options       0.7.1 enabled    dokku core docker-options plugin
-  domains              0.7.1 enabled    dokku core domains plugin
-  enter                0.7.1 enabled    dokku core enter plugin
-  git                  0.7.1 enabled    dokku core git plugin
-  logs                 0.7.1 enabled    dokku core logs plugin
-  named-containers     0.7.1 enabled    dokku core named containers plugin
-  nginx-vhosts         0.7.1 enabled    dokku core nginx-vhosts plugin
-  plugin               0.7.1 enabled    dokku core plugin plugin
-  proxy                0.7.1 enabled    dokku core proxy plugin
-  ps                   0.7.1 enabled    dokku core ps plugin
-  repo                 0.7.1 enabled    dokku core repo plugin
-  shell                0.7.1 enabled    dokku core shell plugin
-  ssh-keys             0.7.1 enabled    dokku core ssh-keys plugin
-  storage              0.7.1 enabled    dokku core storage plugin
-  tags                 0.7.1 enabled    dokku core tags plugin
-  tar                  0.7.1 enabled    dokku core tar plugin
+  00_dokku-standard    0.7.2 enabled    dokku core standard plugin
+  20_events            0.7.2 enabled    dokku core events logging plugin
+  apps                 0.7.2 enabled    dokku core apps plugin
+  build-env            0.7.2 enabled    dokku core build-env plugin
+  certs                0.7.2 enabled    dokku core certificate management plugin
+  checks               0.7.2 enabled    dokku core checks plugin
+  common               0.7.2 enabled    dokku core common plugin
+  config               0.7.2 enabled    dokku core config plugin
+  docker-options       0.7.2 enabled    dokku core docker-options plugin
+  domains              0.7.2 enabled    dokku core domains plugin
+  enter                0.7.2 enabled    dokku core enter plugin
+  git                  0.7.2 enabled    dokku core git plugin
+  logs                 0.7.2 enabled    dokku core logs plugin
+  named-containers     0.7.2 enabled    dokku core named containers plugin
+  nginx-vhosts         0.7.2 enabled    dokku core nginx-vhosts plugin
+  plugin               0.7.2 enabled    dokku core plugin plugin
+  proxy                0.7.2 enabled    dokku core proxy plugin
+  ps                   0.7.2 enabled    dokku core ps plugin
+  repo                 0.7.2 enabled    dokku core repo plugin
+  shell                0.7.2 enabled    dokku core shell plugin
+  ssh-keys             0.7.2 enabled    dokku core ssh-keys plugin
+  storage              0.7.2 enabled    dokku core storage plugin
+  tags                 0.7.2 enabled    dokku core tags plugin
+  tar                  0.7.2 enabled    dokku core tar plugin
 ```

 Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
@@ -97,8 +97,6 @@ dokku plugin:uninstall postgres

 Enabling or disabling a plugin can also be useful in cases where you are debugging whether a third-party plugin is causing issues in your Dokku installation:

-```shell
-
 ```shell
 dokku plugin:disable postgres
 ```
--- a/docs/advanced-usage/proxy-management.md
+++ b/docs/advanced-usage/proxy-management.md
@@ -21,7 +21,7 @@ In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into

 By default, the deployed docker container running your app's web process will bind to the internal docker network interface (i.e. `docker inspect --format '{{ .NetworkSettings.IPAddress }}' $CONTAINER_ID`). This behavior can be modified per app by disabling the proxy (i.e. `dokku proxy:disable <app>`). In this case, the container will bind to an external interface (i.e. `0.0.0.0`) and your app container will be directly accessible by other hosts on your network.

-> If a proxy is disabled, dokku will bind your container's port to a random port on the host for every deploy, e.g. `0.0.0.0:32771->5000/tcp`.
+> If a proxy is disabled, Dokku will bind your container's port to a random port on the host for every deploy, e.g. `0.0.0.0:32771->5000/tcp`.

 By way of example, in the default case, each container is bound to the docker interface:

--- a/docs/advanced-usage/repository-management.md
+++ b/docs/advanced-usage/repository-management.md
@@ -9,7 +9,9 @@ repo:purge-cache <app>                   # Deletes the contents of the build cac

 The repository plugin is meant to allow users to perform management commands against a repository.

-## Git Garbage Collection
+## Usage
+
+### Git Garbage Collection

 This will run a git gc --agressive against the applications repo. This is performed on the Dokku host, and not within an application container.

@@ -25,7 +27,7 @@ Writing objects: 100% (396/396), done.
 Total 396 (delta 79), reused 315 (delta 0)
 ```

-## Clearing Application cache
+### Clearing Application cache

 Building containers with buildpacks currently results in a persistent `cache` directory between deploys. If you need to clear this cache directory for any reason, you may do so by running the following shell command:

--- a/docs/appendices/0.5.0-migration-guide.md
+++ b/docs/appendices/0.5.0-migration-guide.md
@@ -1,6 +1,6 @@
 # 0.5.0 Migration Guide

-## nginx-vhosts
+## `nginx-vhosts` plugin

 - The nginx-vhosts template language is now [sigil](https://github.com/gliderlabs/sigil)
  - No need to escape literal `$` characters (or other "bash-isms")
@@ -8,7 +8,7 @@
  - A detailed list of template variables can be found [here](/dokku/configuration/nginx/#available-template-variables)
 - A custom nginx-vhosts template must be named `nginx.conf.sigil`
  - The default path for this custom template is the root of your repo (i.e. `/app` in the container or `WORKDIR` if defined in a dockerfile app)
-  - Dokku no longer looks for this file in `/home/dokku/myapp` on the dokku server
+  - Dokku no longer looks for this file in `/home/dokku/myapp` on the Dokku server
  - Check out an example template [here](/dokku/configuration/nginx/)
 - Support for server-wide SSL certs have been dropped in favor of using the `certs` plugin
  - `dokku certs:add myapp < certs.tar`
--- a/docs/appendices/0.6.0-migration-guide.md
+++ b/docs/appendices/0.6.0-migration-guide.md
@@ -1,6 +1,6 @@
 # 0.6.0 Migration Guide

-## zero-downtime deployment
+## Zero-downtime deployment

 - You can now **actually** disable zero-downtime deployments per-app and per-process-type
  - Some config variables have been moved around
@@ -9,7 +9,7 @@
    - The values for the above can be a comma-separated list of process-types or the literal string `_all_`
  - See the [updated `checks`](/dokku/deployment/zero-downtime-deploys/) docs for more info

-## proxy port mapping
+## Proxy port mapping

 - You can now configure host -> container proxy port mappings
  - The UI is handled by the [proxy](/dokku/advanced-usage/proxy-management/) interface plugin by setting the `DOKKU_PROXY_PORT_MAP` config variable in the format of `scheme:host-port:container-port`. The default `nginx-vhosts` proxy plugin supports both the `http` and `https` schemes.
@@ -20,9 +20,9 @@
    - dockerfile apps without explicitly exposed ports will behave the same as a buildpack app
  - NOTE: These defaults **are not** automatically changed on subsequent pushes and must be manipulated with the aforementioned commands

-## calling the dokku binary
+## Calling the `dokku` binary

- Plugins should *not* call the dokku binary directly. Clients using the `--app` argument are potentially broken, amongst others, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call dokku internal functions. As a result, the following dokku commands are no longer publicly exposed:
+- Plugins should *not* call the `dokku` binary directly. Clients using the `--app` argument are potentially broken, amongst others, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call Dokku internal functions. As a result, the following Dokku commands are no longer publicly exposed:
 - `dokku build`
 - `dokku receive`
 - `dokku release`
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
  <msapplication>
    <tile>
-      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/mstile-310x150.png"/>
      <TileColor>#da532c</TileColor>
    </tile>
  </msapplication>
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
    "name": "Dokku",
    "icons": [
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.1\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.1\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.1\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.1\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.1\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.1\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.7.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
            "sizes": "192x192",
            "type": "image\/png",
            "density": "4.0"
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -36,13 +36,13 @@ h1 {
  background-repeat: no-repeat;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/dokku.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/dokku.png);
  text-indent: 40px;
 }
 .blurb {
  color: #424242;
  background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/gplaypattern.png);
  padding: 45px 0;
  text-align: center;
 }
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -1 +1 @@
-{ "max-versions": [ "0.3.26", "0.4.14", "0.5.8", "0.6.5", "0.7.1" ] }
+{ "max-versions": [ "0.3.26", "0.4.14", "0.5.8", "0.6.5", "0.7.2" ] }
--- a/docs/community/clients.md
+++ b/docs/community/clients.md
@@ -1,19 +1,19 @@
 # Clients

-Given the constraints, running dokku commands remotely via SSH is fine. For certain configurations, the extra complication of manually invoking ssh can be a burden.
+Given the constraints, running Dokku commands remotely via SSH is fine. For certain configurations, the extra complication of manually invoking ssh can be a burden.

-While dokku does not yet have an official client, there are a multitude of ways in which you can interact with your dokku installation. The easiest is to use the **bash** client, though you may wish to use another.
+While Dokku does not yet have an official client, there are a multitude of ways in which you can interact with your Dokku installation. The easiest is to use the **bash** client, though you may wish to use another.

 ## (bash, zsh, etc.) `dokku_client.sh`

-Of all methods, this is the *most* official method of interacting with your dokku installation. It is a bash script that interacts with a remote dokku installation via ssh. It is available in `contrib/dokku_client.sh` in the root of the dokku repository.
+Of all methods, this is the *most* official method of interacting with your Dokku installation. It is a bash script that interacts with a remote Dokku installation via ssh. It is available in `contrib/dokku_client.sh` in the root of the Dokku repository.

-To install, simply clone the dokku repository down and add the `dokku` alias pointing at the script:
+To install, simply clone the Dokku repository down and add the `dokku` alias pointing at the script:

 ```shell
 git clone git@github.com:dokku/dokku.git ~/.dokku

-# optional: make sure that the dokku_client.sh version matches your dokku version
+# optional: make sure that the dokku_client.sh version matches your Dokku version
 cd ~/.dokku
 git checkout <tag/branch>

@@ -35,13 +35,13 @@ alias dokku 'bash $HOME/.dokku/contrib/dokku_client.sh'
 alias dokku 'bash $HOME/.dokku/contrib/dokku_client.sh'
 ```

-Configure the `DOKKU_HOST` environment variable or run `dokku` from a repository with a git remote named dokku pointed at your dokku host in order to use the script as normal.
+Configure the `DOKKU_HOST` environment variable or run `dokku` from a repository with a git remote named `dokku` pointed at your Dokku host in order to use the script as normal.

 You can also configure a `DOKKU_PORT` environment variable if you are running ssh on a non-standard port. This defaults to `22`.

 ## (nodejs) dokku-toolbelt

-Dokku-toolbelt is a node-based cli wrapper that proxies requests to the dokku command running on remote hosts. You can install it via the following shell command (assuming you have nodejs and npm installed):
+Dokku-toolbelt is a node-based cli wrapper that proxies requests to the Dokku command running on remote hosts. You can install it via the following shell command (assuming you have nodejs and npm installed):

 ```shell
 npm install -g dokku-toolbelt
@@ -51,7 +51,7 @@ See [documentation here](https://www.npmjs.com/package/dokku-toolbelt) for more

 ## (python) dokku-client

-dokku-client is an extensible python-based cli wrapper for remote dokku hosts.  You can install it via the following shell command (assuming you have python and pip installed):
+dokku-client is an extensible python-based cli wrapper for remote Dokku hosts.  You can install it via the following shell command (assuming you have python and pip installed):

 ```shell
 pip install dokku-client
@@ -61,7 +61,7 @@ See [documentation here](https://github.com/adamcharnock/dokku-client) for more

 ## (ruby) Dokku CLI

-Dokku CLI is a rubygem that acts as a client for your dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):
+Dokku CLI is a rubygem that acts as a client for your Dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):

 ```shell
 gem install dokku-cli
@@ -71,7 +71,7 @@ See [documentation here](https://github.com/SebastianSzturo/dokku-cli) for more

 ## (ruby) DokkuClient

-DokkuClient is another rubygem that acts as a client for your dokku installation with built-in support for certain external plugins. You can install it via the following shell command (assuming you have ruby and rubygems installed):
+DokkuClient is another rubygem that acts as a client for your Dokku installation with built-in support for certain external plugins. You can install it via the following shell command (assuming you have ruby and rubygems installed):

 ```shell
 gem install dokku_client
@@ -81,7 +81,7 @@ See [documentation here](https://github.com/netguru/dokku_client) for more infor

 ## (ruby) Dokkufy

-Dokkufy is a rubygem that handles automation of certain tasks, such as dokku setup, plugin installation, etc. You can install it via the following shell command (assuming you have ruby and rubygems installed):
+Dokkufy is a rubygem that handles automation of certain tasks, such as Dokku setup, plugin installation, etc. You can install it via the following shell command (assuming you have ruby and rubygems installed):

 ```shell
 gem install dokkufy
@@ -91,7 +91,7 @@ See [documentation here](https://github.com/cbetta/dokkufy) for more information

 ## (ruby) Dockland

-Dockland is a rubygem that acts as a client for your dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):
+Dockland is a rubygem that acts as a client for your Dokku installation. You can install it via the following shell command (assuming you have ruby and rubygems installed):

 ```shell
 gem install dockland
--- a/docs/community/plugins.md
+++ b/docs/community/plugins.md
@@ -2,12 +2,12 @@

 Dokku itself is built out of plugins and uses [plugn](https://github.com/dokku/plugn) for its plugin system. In essence a plugin is a collection of scripts that will be run based on naming convention.

-Let's take a quick look at the current dokku nginx plugin that's shipped with dokku by default.
+Let's take a quick look at the current Dokku nginx plugin that's shipped with Dokku by default.

    nginx-vhosts/
    ├── plugin.toml  # plugin metadata
    ├── commands     # contains additional commands
-    ├── install      # runs on dokku installation
+    ├── install      # runs on Dokku installation
    └── post-deploy  # runs after an app is deployed

 ## Installing a plugin
@@ -20,12 +20,13 @@ Let's take a quick look at the current dokku nginx plugin that's shipped with do

 ## Official Plugins (Beta)

-The following plugins are available and provided by dokku maintainers. Where noted, these plugins should be considered beta software and may not have been used as thoroughly as community plugins. Please file issues against their respective issue trackers.
+The following plugins are available and provided by Dokku maintainers. Where noted, these plugins should be considered beta software and may not have been used as thoroughly as community plugins. Please file issues against their respective issue trackers.

 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [CouchDB (beta)](https://github.com/dokku/dokku-couchdb)                                          | [dokku][]             | 0.4.0+                |
 | [Elasticsearch (beta)](https://github.com/dokku/dokku-elasticsearch-plugin)                       | [dokku][]             | 0.4.0+                |
+| [Grafana/Graphite/Statsd (beta)](https://github.com/dokku/dokku-graphite-grafana)                 | [dokku][]             | 0.4.0+                |
 | [MariaDB (beta)](https://github.com/dokku/dokku-mariadb-plugin)                                   | [dokku][]             | 0.4.0+                |
 | [Memcached (beta)](https://github.com/dokku/dokku-memcached-plugin)                               | [dokku][]             | 0.4.0+                |
 | [Mongo (beta)](https://github.com/dokku/dokku-mongo-plugin)                                       | [dokku][]             | 0.4.0+                |
@@ -43,7 +44,7 @@ The following plugins are available and provided by dokku maintainers. Where not

 ## Community plugins

-Note: The following plugins have been supplied by our community and may not have been tested by dokku maintainers.
+Note: The following plugins have been supplied by our community and may not have been tested by Dokku maintainers.

 [256dpi]: https://github.com/256dpi
 [abossard]: https://github.com/dudagroup
@@ -56,8 +57,8 @@ Note: The following plugins have been supplied by our community and may not have
 [Aluxian]: https://github.com/Aluxian
 [Aomitayo]: https://github.com/Aomitayo
 [apmorton]: https://github.com/apmorton
-[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
 [basgys]: https://github.com/basgys
+[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
 [blag]: https://github.com/blag
 [cameron-martin]: https://github.com/cameron-martin
 [cedricziel]: https://github.com/cedricziel
@@ -73,7 +74,6 @@ Note: The following plugins have been supplied by our community and may not have
 [fgrehm]: https://github.com/fgrehm
 [Flink]: https://github.com/Flink
 [gdi2290]: https://github.com/gdi2290
-[heichblatt]: https://github.com/heichblatt
 [hughfletcher]: https://github.com/hughfletcher
 [iamale]: https://github.com/iamale
 [ignlg]: https://github.com/ignlg
@@ -83,6 +83,7 @@ Note: The following plugins have been supplied by our community and may not have
 [jagandecapri]: https://github.com/jagandecapri
 [jeffutter]: https://github.com/jeffutter
 [jlachowski]: https://github.com/jlachowski
+[josegonzalez]: https://github.com/josegonzalez
 [Kloadut]: https://github.com/Kloadut
 [krisrang]: https://github.com/krisrang
 [luxifer]: https://github.com/luxifer
@@ -97,6 +98,7 @@ Note: The following plugins have been supplied by our community and may not have
 [motin]: https://github.com/motin
 [musicglue]: https://github.com/musicglue
 [neam]: https://github.com/neam
+[nickcharlton]: https://github.com/nickcharlton
 [nickstenning]: https://github.com/nickstenning
 [nornagon]: https://github.com/nornagon
 [ohardy]: https://github.com/ohardy
@@ -123,20 +125,19 @@ Note: The following plugins have been supplied by our community and may not have

 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [Kloadut][]           | 0.3.x                  |
-| [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb)                             | [ohardy][]            | 0.3.x                  |
-| [MariaDB (single container)](https://github.com/krisrang/dokku-mariadb)                           | [krisrang][]          | 0.3.26+                |
-| [PostgreSQL](https://github.com/jlachowski/dokku-pg-plugin)                                       | [jlachowski][]         | 0.3.x                  |
-| [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql)                             | [ohardy][]            | 0.3.x                  |
-| [PostgreSQL (single container)](https://github.com/Flink/dokku-psql-single-container)             | [Flink][]             | 0.3.26+                |
+| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [Kloadut][]           | 0.3.x                 |
+| [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb)                             | [ohardy][]            | 0.3.x                 |
+| [MariaDB (single container)](https://github.com/krisrang/dokku-mariadb)                           | [krisrang][]          | 0.3.26+               |
+| [PostgreSQL](https://github.com/jlachowski/dokku-pg-plugin)                                       | [jlachowski][]        | 0.3.x                 |
+| [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql)                             | [ohardy][]            | 0.3.x                 |
+| [PostgreSQL (single container)](https://github.com/Flink/dokku-psql-single-container)             | [Flink][]             | 0.3.26+               |

 #### Caching

 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [Nginx Cache](https://github.com/Aluxian/dokku-nginx-cache)                                       | [Aluxian][]           | 0.5.0+                |
-| [Redis](https://github.com/sekjun9878/dokku-redis-plugin)                                         | [sekjun9878][]        | 0.3.26+                |
-| [Redis (single container)](https://github.com/ohardy/dokku-redis)                                 | [ohardy][]            | 0.3.x                  |
+| [Redis (single container)](https://github.com/ohardy/dokku-redis)                                 | [ohardy][]            | 0.3.x                 |
 | [Varnish](https://github.com/Zenedith/dokku-varnish-plugin)                                       | [Zenedith][]          | Varnish cache between nginx and application with base configuration|

 #### Queuing
@@ -157,19 +158,6 @@ Note: The following plugins have been supplied by our community and may not have
 | [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin)                                   | [stuartpb][]          | 0.3.x                 |

 [dccee02]: https://github.com/jeffutter/dokku-riakcs-plugin/commit/dccee02702e7001851917b7814e78a99148fb709
-
-### Process Managers
-
-| Plugin                                                                                            | Author                | Compatibility         |
-| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [Circus](https://github.com/apmorton/dokku-circus)                                                | [apmorton][]          |                       |
-| [Forego](https://github.com/iskandar/dokku-forego)                                                | [iskandar][]          | Compatible with 0.2.x |
-| [Forego](https://github.com/Flink/dokku-forego)                                                   | [Flink][]             | 0.4.0+                |
-| [Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)                       | [sehrope][]           | 0.4.0+                |
-| [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       | 0.3.x                 |
-| [Shoreman ](https://github.com/statianzo/dokku-shoreman)                                          | [statianzo][]         | 0.3.x                 |
-| [Supervisord](https://github.com/statianzo/dokku-supervisord)                                     | [statianzo][]         | 0.3.x                 |
-
 [c77cbf1]: https://github.com/dokku/dokku/commit/c77cbf1d3ae07f0eafb85082ed7edcae9e836147
 [28de3ec]: https://github.com/dokku/dokku/commit/28de3ecaa3231a223f83fd8d03f373308673bc40

@@ -178,23 +166,21 @@ Note: The following plugins have been supplied by our community and may not have
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [App name as env](https://github.com/cjblomqvist/dokku-app-name-env)                              | [cjblomqvist][]       | 0.3.x                 |
+| [Docker Direct](https://github.com/josegonzalez/dokku-docker-direct)                              | [josegonzalez][]      | 0.4.0+                |
 | [Dokku Clone](https://github.com/crisward/dokku-clone)                                            | [crisward][]          | 0.4.0+                |
-| [Docker Direct](https://github.com/heichblatt/dokku-docker-direct)                                | [heichblatt][]        |                       |
-| [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]      | Compatible with 0.3.17+ |
-| [Dokku Copy App Config Files](https://github.com/heichblatt/dokku-supply-config)                  | [heichblatt][]        |                       |
-| [Dokku Name](https://github.com/alex-sherwin/dokku-name)                                          | [alex-sherwin][]      | dokku >= [c77cbf1][]  |
+| [Dokku Copy App Config Files](https://github.com/josegonzalez/dokku-supply-config)                | [josegonzalez][]      | 0.4.0+                |
 | [Dokku Registry](https://github.com/agco-adm/dokku-registry)<sup>1</sup>                          | [agco-adm][]          | 0.4.0+                |
 | [Dokku Require](https://github.com/crisward/dokku-require)<sup>2</sup>                            | [crisward][]          | 0.4.0+                |
 | [git rev-parse HEAD in env](https://github.com/cjblomqvist/dokku-git-rev)                         | [cjblomqvist][]       | 0.4.0+                |
-| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.3.14+               |
+| [Global Certificates](https://github.com/josegonzalez/dokku-global-cert)                          | [josegonzalez][]      | 0.5.0+                |
+| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.4.0+                |
 | [Haproxy tcp load balancer](https://github.com/256dpi/dokku-haproxy)                              | [256dpi][]            | 0.4.0+                |
-| [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
-| [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           |                       |
-| [Nuke Containers](https://github.com/heichblatt/dokku-nuke)                                       | [heichblatt][]        |                       |
-| [Open App Ports](https://github.com/heichblatt/dokku-ports)                                       | [heichblatt][]        |                       |
+| [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
+| [Nuke Containers](https://github.com/josegonzalez/dokku-nuke)                                     | [josegonzalez][]      | 0.4.0+                |
+| [Open App Ports](https://github.com/josegonzalez/dokku-ports)                                     | [josegonzalez][]      | 0.3.x                 |
 | [Proctype Filter](https://github.com/michaelshobbs/dokku-proctype-filter)                         | [michaelshobbs][]     | 0.4.0+                |
-| [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>3</sup>            | [cedricziel][]        | 0.3.x                 |
+| [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>3</sup>            | [cedricziel][]        | 0.4.0+                |
 | [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>4</sup>                   | [cedricziel][]        | 0.3.x                 |

 [217d00a]: https://github.com/dokku/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
@@ -212,60 +198,64 @@ Note: The following plugins have been supplied by our community and may not have
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [Airbrake deploy](https://github.com/Flink/dokku-airbrake-deploy)                                 | [Flink][]             | 0.4.0+                |
-| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          | 0.2.0+ (tag 0.2.0), 0.3.0+ (tag 0.3.0), 0.4.0+ |
-| [Chef cookbooks](https://github.com/fgrehm/chef-dokku)                                            | [fgrehm][]            |                       |
-| [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install)                         | [alexanderbeletsky][] |                       |
-| [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin)                       | [thrashr888][]        |                       |
-| [Bower/Gulp](https://github.com/gdi2290/dokku-bower-gulp-build-plugin)                            | [gdi2290][]           |                       |
-| [Bower/Gulp](https://github.com/jagandecapri/dokku-bower-gulp-build-plugin)                       | [jagandecapri][]      |                       |
+| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          | 0.4.0+                |
+| [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install)                         | [alexanderbeletsky][] | 0.3.x                 |
+| [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin)                       | [thrashr888][]        | 0.3.x                 |
+| [Bower/Gulp](https://github.com/gdi2290/dokku-bower-gulp-build-plugin)                            | [gdi2290][]           | 0.3.x                 |
+| [Bower/Gulp](https://github.com/jagandecapri/dokku-bower-gulp-build-plugin)                       | [jagandecapri][]      | 0.3.x                 |
 | [Builders: bower, compass, gulp, grunt](https://github.com/ignlg/dokku-builders-plugin)           | [ignlg][]             | 0.4.0+                |
+| [Chef cookbook](https://github.com/nickcharlton/dokku-cookbook)                                   | [nickcharlton][]      |                       |
 | [Docker auto persist volumes](https://github.com/Flink/dokku-docker-auto-volumes)                 | [Flink][]             | 0.4.0+                |
-| [HipChat Notifications](https://github.com/cef/dokku-hipchat)                                     | [cef][]               |                       |
-| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski]          | <0.4.0                |
-| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-grafana)                           | [jlachowski]          | 0.4.0+, graphite & statsd plugin with grafana dashboard frontend  |
-| [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     | 0.3.26+               |
+| [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
+| [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     | 0.4.0+                |
+| [Long Timeout](https://github.com/investtools/dokku-long-timeout-plugin)                          | [investtools][]       | 0.4.0+                |
+| [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       | 0.3.x                 |
 | [Monorepo](https://github.com/iamale/dokku-monorepo)                                              | [iamale][]            | 0.4.0+                |
-| [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         |                       |
-| [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            |                       |
-| [Reset mtime](https://github.com/mixxorz/dokku-docker-reset-mtime)                                | [mixxorz][]           | 0.3.15+, Dockerfile support |
+| [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            | 0.3.x                 |
+| [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         | 0.3.x                 |
+| [Rollbar](https://github.com/iloveitaly/dokku-rollbar)                                            | [iloveitaly][]        | 0.5.0+                |
 | [Slack Notifications](https://github.com/ribot/dokku-slack)                                       | [ribot][]             | 0.4.0+                |
 | [Tor](https://github.com/michaelshobbs/dokku-tor)                                                 | [michaelshobbs][]     | 0.4.0+                |
 | [User ACL](https://github.com/mlebkowski/dokku-acl)                                               | [Maciej Łebkowski][]  | 0.4.0+                |
-| [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      |                       |
-| [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                      | [mbriskar][]          |                       |
-| [Wordpress](https://github.com/dudagroup/dokku-wordpress-template)                                | [abossard][]          | Dokku dev, mariadb, volume, domains |
-| [Long Timeout](https://github.com/investtools/dokku-long-timeout-plugin)                          | [investtools][]       | 0.4.0+ |
-| [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+ |
-| [Rollbar](https://github.com/iloveitaly/dokku-rollbar)                                            | [iloveitaly][]        | 0.5.0+ |
-
-<sup>1</sup> Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment.
+| [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      | 0.3.x                 |
+| [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                      | [mbriskar][]          | 0.4.0+                |
+| [Wordpress Setup](https://github.com/dudagroup/dokku-wordpress-template)                          | [abossard][]          |                       |

 ### Deprecated Plugins

 The following plugins have been removed as their functionality is now in Dokku Core.

-| Plugin                                                                                            | Author                | In Dokku Since                  |
-| ------------------------------------------------------------------------------------------------- | --------------------- | ------------------------------- |
-| [App User](https://github.com/michaelshobbs/dokku-app-user)                                       | [michaelshobbs][]     | v0.7.1 (herokuish 0.3.18)       |
-| [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [motin][]             | v0.3.10 (domains plugin)        |
-| [Debug](https://github.com/heichblatt/dokku-debug)                                                | [heichblatt][]        | v0.3.9 (trace command)          |
-| [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | v0.3.17 (docker-options plugin) |
-| [Events Logger](https://github.com/alessio/dokku-events)                                          | [alessio][]           | v0.3.21 (events plugin)         |
-| [Host Port binding](https://github.com/stuartpb/dokku-bind-port)                                  | [stuartpb][]          | v0.3.17 (docker-options plugin) |
-| [List Containers](https://github.com/heichblatt/dokku-list)                                       | [heichblatt][]        | v0.3.14 (ps plugin              |
-| [Link Containers](https://github.com/rlaneve/dokku-link)                                          | [rlaneve][]           | v0.3.17 (docker-options plugin) |
-| [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains plugin)        |
-| [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [Flink][]             | v0.4.2 (named-containers plugin) |
-| [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | v0.3.10 (domains plugin)        |
-| [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | v0.3.17 (docker-options plugin) |
-| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     | v0.5.0 (deployment tasks)        |
-| [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         | v0.3.0 (zero downtime deploys)  |
-| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]        | v0.3.14 (ps plugin)             |
-| [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)<sup>2</sup>    | [cameron-martin][]    | v0.3.9 (build-env plugin)       |
-| [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>2</sup>               | [musicglue][]         | v0.3.9 (build-env plugin)       |
-| [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>2</sup>                   | [motin][]             | v0.3.9 (build-env plugin)       |
-| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)    | [motin][]             | v0.3.10 (domains plugin)        |
-| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | v0.5.0 (storage plugin)         |
+| Plugin                                                                                            | Author                | In Dokku Since                            |
+| ------------------------------------------------------------------------------------------------- | --------------------- | ----------------------------------------- |
+| [App User](https://github.com/michaelshobbs/dokku-app-user)                                       | [michaelshobbs][]     | v0.7.1 (herokuish 0.3.18)                 |
+| [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [motin][]             | v0.3.10 (domains plugin)                  |
+| [Debug](https://github.com/josegonzalez/dokku-debug)                                              | [josegonzalez][]      | v0.3.9 (trace command)                    |
+| [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | v0.3.17 (docker-options plugin)           |
+| [Dokku Name](https://github.com/alex-sherwin/dokku-name)                                          | [alex-sherwin][]      | v0.4.2 (named containers plugin)          |
+| [Events Logger](https://github.com/alessio/dokku-events)                                          | [alessio][]           | v0.3.21 (events plugin)                   |
+| [Host Port binding](https://github.com/stuartpb/dokku-bind-port)                                  | [stuartpb][]          | v0.3.17 (docker-options plugin)           |
+| [Link Containers](https://github.com/rlaneve/dokku-link)                                          | [rlaneve][]           | v0.3.17 (docker-options plugin)           |
+| [List Containers](https://github.com/josegonzalez/dokku-list)                                     | [josegonzalez][]      | v0.3.14 (ps plugin)                       |
+| [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           | v0.4.0 (herokuish)                        |
+| [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains plugin)                  |
+| [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [Flink][]             | v0.4.2 (named-containers plugin)          |
+| [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | v0.3.10 (domains plugin)                  |
+| [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | v0.3.17 (docker-options plugin)           |
+| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     | v0.5.0 (deployment tasks)                 |
+| [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         | v0.3.0 (zero downtime deploys)            |
+| [Process Manager: Circus](https://github.com/apmorton/dokku-circus)                               | [apmorton][]          | v0.3.14/0.7.0 (ps/restart policy plugin)  |
+| [Process Manager: Forego](https://github.com/Flink/dokku-forego)                                  | [Flink][]             | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Forego](https://github.com/iskandar/dokku-forego)                               | [iskandar][]          | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)      | [sehrope][]           | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Shoreman ](https://github.com/statianzo/dokku-shoreman)                         | [statianzo][]         | v0.3.14/0.7.0 (ps plugin)                 |
+| [Process Manager: Supervisord](https://github.com/statianzo/dokku-supervisord)                    | [statianzo][]         | v0.3.14/0.7.0 (ps plugin)                 |
+| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]        | v0.3.14 (ps plugin)                       |
+| [Reset mtime](https://github.com/mixxorz/dokku-docker-reset-mtime)                                | [mixxorz][]           | Docker 1.8+                               |
+| [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)<sup>2</sup>    | [cameron-martin][]    | v0.3.9 (build-env plugin)                 |
+| [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>2</sup>                   | [motin][]             | v0.3.9 (build-env plugin)                 |
+| [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>2</sup>               | [musicglue][]         | v0.3.9 (build-env plugin)                 |
+| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)    | [motin][]             | v0.3.10 (domains plugin)                  |
+| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | v0.5.0 (storage plugin)                   |

 <sup>1</sup> Conflicts with [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)
 <sup>2</sup> Similar to the heroku-labs feature (see https://devcenter.heroku.com/articles/labs-user-env-compile)
@@ -280,10 +270,14 @@ The following plugins are no longer maintained by their developers.
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [app-url](https://github.com/mikecsh/dokku-app-url)                                               | [mikecsh][]           | Works with 0.2.0      |
+| [Chef cookbooks](https://github.com/fgrehm/chef-dokku)                                            | [fgrehm][]            |                       |
 | [CouchDB (multi containers)](https://github.com/Flink/dokku-couchdb-multi-containers)             | [Flink][]             | 0.4.0+                |
 | [CouchDB](https://github.com/racehub/dokku-couchdb-plugin)                                        | [RaceHub][]           | Compatible with 0.2.0 |
+| [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]      | Compatible with 0.3.17+ |
 | [Elasticsearch](https://github.com/robv/dokku-elasticsearch)                                      | [robv][]              | Not compatible with >= 0.3.0 (still uses /home/git) |
 | [Elasticsearch](https://github.com/blag/dokku-elasticsearch-plugin)<sup>1</sup>                   | [blag][]              | Compatible with 0.2.0 |
+| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski][]        | < 0.4.0               |
+| [HipChat Notifications](https://github.com/cef/dokku-hipchat)                                     | [cef][]               |                       |
 | [Memcached](https://github.com/Flink/dokku-memcached-plugin)                                      | [Flink][]             | 0.4.0+                |
 | [MongoDB (single container)](https://github.com/jeffutter/dokku-mongodb-plugin)                   | [jeffutter][]         |                       |
 | [MySQL](https://github.com/hughfletcher/dokku-mysql-plugin)                                       | [hughfletcher][]      |                       |
@@ -292,3 +286,6 @@ The following plugins are no longer maintained by their developers.
 | [PostgreSQL (single container)](https://github.com/jeffutter/dokku-postgresql-plugin)             | [jeffutter][]         | This plugin creates a single postgresql container that all your apps can use. Thus only one instance of postgresql running (good for servers without a ton of memory). |
 | [RiakCS (single container)](https://github.com/jeffutter/dokku-riakcs-plugin)                     | [jeffutter][]         | Incompatible with 0.2.0 (checked at [dccee02][]) |
 | [Redis](https://github.com/luxifer/dokku-redis-plugin)                                            | [luxifer][]           |                       |
+| [Redis](https://github.com/sekjun9878/dokku-redis-plugin)                                         | [sekjun9878][]        | 0.3.26+               |
+
+<sup>1</sup> Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment.
--- a/docs/configuration/dns.md
+++ b/docs/configuration/dns.md
@@ -14,7 +14,7 @@ Because there are so many different DNS server packages out there as well as a t

 * We assume you have a passing familiarity with DNS.  If not, you can read an [in-depth article](http://www.diaryofaninja.com/blog/2012/03/03/devops-dns-for-developers-ndash-now-therersquos-no-excuse-not-to-know) on DNS.  But basically you need to know that DNS changes names (like example.tld) into addresses (like 127.0.0.1)
 * We assume you already have a domain name registered and pointed to your favorite Managed DNS Provider or have your own BIND DNS server running.
-* You have a server on the internet and are about to follow the instructions in the [README](https://github.com/dokku/dokku/blob/master/README.md) to get dokku installed.  Don't do the install just yet though.
+* You have a server on the internet and are about to follow the instructions in the [README](https://github.com/dokku/dokku/blob/master/README.md) to get Dokku installed.  Don't do the install just yet though.

 ## Caching

@@ -29,13 +29,13 @@ Don't be afraid to ask if you need help.  Create a [new issue](https://github.co

 For the examples, we will use the domain name `example.tld` and the IP address `127.0.0.1`.

-Dokku uses DNS to differentiate between apps on your dokku-powered server.  If you are using the domain `example.tld`, and you have two apps `myapp1` and `myapp2`, dokku will make them available at `myapp1.example.tld` and `myapp2.example.tld`.
+Dokku uses DNS to differentiate between apps on your dokku-powered server.  If you are using the domain `example.tld`, and you have two apps `myapp1` and `myapp2`, Dokku will make them available at `myapp1.example.tld` and `myapp2.example.tld`.

-To get started, you need to know the IP address of your dokku server.  Connect to it and run `ifconfig` or `ip addr` to see the IP address.
+To get started, you need to know the IP address of your Dokku server.  Connect to it and run `ifconfig` or `ip addr` to see the IP address.

-Now you have to make a decision about your domain.  Do you want everything and anything at `example.tld` to go to your dokku server, or would you rather use a 'sub domain' for your dokku server?
+Now you have to make a decision about your domain.  Do you want everything and anything at `example.tld` to go to your Dokku server, or would you rather use a 'sub domain' for your Dokku server?

-In other words, do you want your applications on your dokku server accessible via `myapp.example.tld` or via `myapp.myserver.example.tld`?
+In other words, do you want your applications on your Dokku server accessible via `myapp.example.tld` or via `myapp.myserver.example.tld`?

 #### Using a sub-domain (myapp.myserver.example.tld)

--- a/docs/configuration/domains.md
+++ b/docs/configuration/domains.md
@@ -3,14 +3,14 @@
 > New as of 0.3.10

 ```
-domains:add <app> DOMAIN                 # Add a domain to app
-domains:add-global <domain>              # Add global domain name
-domains [<app>]                          # List domains
-domains:clear <app>                      # Clear all domains for app
-domains:disable <app>                    # Disable VHOST support
-domains:enable <app>                     # Enable VHOST support
-domains:remove <app> DOMAIN              # Remove a domain from app
-domains:remove-global <domain>           # Remove global domain name
+domains:add <app> <domain> [<domain> ...]      # Add domains to app
+domains:add-global <domain> [<domain> ...]     # Add global domain names
+domains [<app>]                                # List domains
+domains:clear <app>                            # Clear all domains for app
+domains:disable <app>                          # Disable VHOST support
+domains:enable <app>                           # Enable VHOST support
+domains:remove <app> <domain> [<domain> ...]   # Remove domains from app
+domains:remove-global <domain> [<domain> ...]  # Remove global domain names
 ```

 > Adding a domain before deploying an application will result in port mappings being set. This may cause issues for applications that use non-standard ports, as those will not be automatically detected. Please refer to the [proxy documentation](/dokku/advanced-usage/proxy-management/) for information as to how to reconfigure the mappings.
@@ -72,7 +72,7 @@ dokku domains:remove myapp example.com

 ## Default site

-By default, dokku will route any received request with an unknown HOST header value to the lexicographically first site in the nginx config stack. If this is not the desired behavior, you may want to add the following configuration to the global nginx configuration. This will catch all unknown HOST header values and return a `410 Gone` response. You can replace the `return 410;` with `return 444;` which will cause nginx to not respond to requests that do not match known domains (connection refused).
+By default, Dokku will route any received request with an unknown HOST header value to the lexicographically first site in the nginx config stack. If this is not the desired behavior, you may want to add the following configuration to the global nginx configuration. This will catch all unknown HOST header values and return a `410 Gone` response. You can replace the `return 410;` with `return 444;` which will cause nginx to not respond to requests that do not match known domains (connection refused).

 ```nginx
 server {
@@ -98,4 +98,4 @@ include /etc/nginx/sites-enabled/*;
 include /etc/nginx/conf.d/*.conf;
 ```

-Alternatively, you may push an app to your dokku host with a name like "00-default". As long as it lists first in `ls /home/dokku/*/nginx.conf | head`, it will be used as the default nginx vhost.
+Alternatively, you may push an app to your Dokku host with a name like "00-default". As long as it lists first in `ls /home/dokku/*/nginx.conf | head`, it will be used as the default nginx vhost.
--- a/docs/configuration/nginx.md
+++ b/docs/configuration/nginx.md
@@ -69,7 +69,7 @@ upstream {{ .APP }} {
 ```
 {{ .APP }}                          Application name
 {{ .APP_SSL_PATH }}                 Path to SSL certificate and key
-{{ .DOKKU_ROOT }}                   Global dokku root directory (ex: app dir would be `{{ .DOKKU_ROOT }}/{{ .APP }}`)
+{{ .DOKKU_ROOT }}                   Global Dokku root directory (ex: app dir would be `{{ .DOKKU_ROOT }}/{{ .APP }}`)
 {{ .DOKKU_APP_LISTENERS }}          List of IP:PORT pairs of app containers
 {{ .NGINX_PORT }}                   Non-SSL nginx listener port (same as `DOKKU_NGINX_PORT` config var)
 {{ .NGINX_SSL_PORT }}               SSL nginx listener port (same as `DOKKU_NGINX_SSL_PORT` config var)
@@ -198,7 +198,7 @@ chown dokku:dokku /home/dokku/myapp/nginx.conf.d/upload.conf
 service nginx reload
 ```

-The example above uses additional configuration files directly on the dokku host. Unlike the `nginx.conf.sigil` file, these additional files will not be copied over from your application repo, and thus need to be placed in the `/home/dokku/myapp/nginx.conf.d/` directory manually.
+The example above uses additional configuration files directly on the Dokku host. Unlike the `nginx.conf.sigil` file, these additional files will not be copied over from your application repo, and thus need to be placed in the `/home/dokku/myapp/nginx.conf.d/` directory manually.

 ## Domains plugin

--- a/docs/configuration/ssl.md
+++ b/docs/configuration/ssl.md
@@ -80,7 +80,7 @@ The `certs:remove` command only works on app-specific certificates. It will `rm`

 ## HSTS Header

-The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. dokku does not, by default, enable this header. It is thus left up to you, the user, to enable it for your site.
+The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. Dokku does not, by default, enable this header. It is thus left up to you, the user, to enable it for your site.

 Beware that if you enable the header and a subsequent deploy of your application results in an HTTP deploy (for whatever reason), the way the header works means that a browser will not attempt to request the HTTP version of your site if the HTTPS version fails.

@@ -126,3 +126,7 @@ Only use this option if:
 If it's possible to make HTTP/S requests directly to Nginx, bypassing the load balancer, or if the load balancer is not configured to set these headers, then it becomes possible for a client to set these headers to arbitrary values.

 This could result in security issue, for example, if your application looks at the value of the `X-Forwarded-Proto` to determine if the request was made over HTTPS.
+
+### SSL Port Exposure
+
+When your app is served from port `80` then the `/home/dokku/APP/nginx.conf` file will automatically be updated to instruct nginx to respond to ssl on port 443 as a new cert is added.  If your app uses a non-standard port (perhaps you have a dockerfile deploy exposing port `99999`) you may need to manually expose an ssl port via `dokku proxy:ports-add <APP> https:443:99999`.  
--- a/docs/deployment/application-deployment.md
+++ b/docs/deployment/application-deployment.md
@@ -14,7 +14,7 @@ git clone git@github.com:heroku/ruby-rails-sample.git
 Create the application on the Dokku host. You will need to ssh onto the host to run this command.

 ```shell
-# on your dokku host
+# on your Dokku host
 dokku apps:create ruby-rails-sample
 ```

@@ -23,7 +23,7 @@ dokku apps:create ruby-rails-sample
 When you create a new app, Dokku by default *does not* provide any datastores such as MySQL or PostgreSQL. You will need to install plugins to handle that, but fortunately [Dokku has official plugins](/dokku/community/plugins/#official-plugins-beta) for common datastores. Our sample app requires a PostgreSQL service:

 ```shell
-# on your dokku host
+# on your Dokku host
 # install the postgres plugin
 # plugin installation requires root, hence the user change
 sudo dokku plugin:install https://github.com/dokku/dokku-postgres.git
@@ -39,7 +39,7 @@ dokku postgres:create rails-database
 Once the service creation is complete, set the `POSTGRES_URL` environment variable by linking the service.

 ```shell
-# on your dokku host
+# on your Dokku host
 # each official datastore offers a `link` method to link a service to any application
 dokku postgres:link rails-database ruby-rails-sample
 ```
@@ -97,7 +97,7 @@ You can also support pushing multiple branches using the [receive-branch](/dokku
 If you only want to rebuild and tag a container, you can skip the deployment phase by setting `$DOKKU_SKIP_DEPLOY` to `true` by running:

 ``` shell
-# on your dokku host
+# on your Dokku host
 dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
 ```

@@ -106,7 +106,7 @@ dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
 Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `/home/dokku/.ssh/` and potentially add github.com (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. The following test should help confirm you've done it correctly.

 ```shell
-# on your dokku host
+# on your Dokku host
 su - dokku
 ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 ssh -T git@github.com
--- a/docs/deployment/application-management.md
+++ b/docs/deployment/application-management.md
@@ -9,6 +9,10 @@ apps:destroy <app>                             # Permanently destroy an app
 apps:rename <old-app> <new-app>                # Rename an app
 ```

+## Usage
+
+### Listing Applications
+
 You can easily list all available applications using the `apps` command:

 ```shell
@@ -21,7 +25,7 @@ node-js-app
 python-app
 ```

-Note that you can easily hide extra output from dokku commands by using the `--quiet` flag, which makes it easier to parse on the command-line.
+Note that you can easily hide extra output from Dokku commands by using the `--quiet` flag, which makes it easier to parse on the command-line.

 ```shell
 dokku --quiet apps
@@ -32,7 +36,7 @@ node-js-app
 python-app
 ```

-## Manually creating an application
+### Manually creating an application

 A common pattern for deploying applications to Dokku is to configure an application before deploying it. You can do so via the `apps:create` command:

@@ -50,7 +54,7 @@ Once created, you can configure the application as normal, and deploy the applic
 - create and link datastores
 - set environment variables

-## Removing a deployed app
+### Removing a deployed app

 In some cases, you may need to destroy an application, whether it is because the application is temporary or because it was misconfigured. In these cases, you can use the `apps:destroy` command. Performing any destructive actions in Dokku requires confirmation, and this command will ask for the name of the application being deleted before doing so.

@@ -80,7 +84,7 @@ Destroying node-js-app (including all add-ons)

 Destroying an application will unlink all linked services and destroy any config related to the application. Note that linked services will retain their data for later use (or removal).

-## Renaming a deployed app
+### Renaming a deployed app

 > New as of 0.4.7

--- a/docs/deployment/methods/buildpacks.md
+++ b/docs/deployment/methods/buildpacks.md
@@ -9,9 +9,9 @@ Dokku normally defaults to using [heroku buildpacks](https://devcenter.heroku.co

 ## Specifying a custom buildpack

-In certain cases you may want to specify a custom buildpack. While dokku uses herokuish to support all the [official heroku buildpacks](https://github.com/gliderlabs/herokuish#buildpacks), it is possible that the buildpack detection does not work well for your application. As well, you may wish to use a custom buildpack to handle specific application logic.
+In certain cases you may want to specify a custom buildpack. While Dokku uses herokuish to support all the [official heroku buildpacks](https://github.com/gliderlabs/herokuish#buildpacks), it is possible that the buildpack detection does not work well for your application. As well, you may wish to use a custom buildpack to handle specific application logic.

-To use a specific buildpack, you can run the following dokku command:
+To use a specific buildpack, you can run the following Dokku command:

 ```shell
 # replace APP with the name of your application
--- a/docs/deployment/methods/dockerfiles.md
+++ b/docs/deployment/methods/dockerfiles.md
@@ -19,7 +19,7 @@ Dokku will extract all tcp ports exposed using the `EXPOSE` directive (one port

 > Note: Nginx does not support proxying UDP. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`

-If you do not explicitly `EXPOSE` a port in your `Dockerfile`, dokku will configure the nginx proxy to listen on port 80 (and 443 for TLS) and forward traffic to your app listening on port 5000 inside the container. Just like buildpack apps, you can also use the `$PORT` environment variable in your app to maintain portability.
+If you do not explicitly `EXPOSE` a port in your `Dockerfile`, Dokku will configure the nginx proxy to listen on port 80 (and 443 for TLS) and forward traffic to your app listening on port 5000 inside the container. Just like buildpack apps, you can also use the `$PORT` environment variable in your app to maintain portability.

 When ports are exposed through the default nginx proxy, they are proxied externally as HTTP ports. At this time, in no case do we proxy plain TCP or UDP ports. If you would like to investigate alternative proxy methods, please refer to our [proxy management documentation](/dokku/advanced-usage/proxy-management/).

--- a/docs/deployment/methods/images.md
+++ b/docs/deployment/methods/images.md
@@ -2,8 +2,6 @@

 > New as of 0.4.0

-The dokku tags plugin allows you to add docker image tags to the currently deployed app image for versioning and subsequent deployment.
-
 ```
 tags <app>                                     # List all app image tags
 tags:create <app> <tag>                        # Add tag to latest running app image
@@ -11,6 +9,19 @@ tags:deploy <app> <tag>                        # Deploy tagged app image
 tags:destroy <app> <tag>                       # Remove app image tag
 ```

+The Dokku tags plugin allows you to add docker image tags to the currently deployed app image for versioning and subsequent deployment.
+
+> When triggering `dokku ps:rebuild APP` on an application deployed via the `tags` plugin, the following may occur:
+>
+> - Applications previously deployed via another method (`git`/`tar`): The application may revert to a state before the latest custom image tag was deployed.
+> - Applications that were only ever deployed via the `tags` plugin: No action will be taken against your application.
+>
+> Please use the `tags:deploy` command when redeploying an application deployed via docker image.
+
+## Usage
+
+### Listing tags for an application
+
 For example, you can list all tags for a given application:

 ```shell
@@ -23,6 +34,8 @@ REPOSITORY          TAG                 IMAGE ID            CREATED
 dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
 ```

+### Creating a tag
+
 You can also create new tags for that app using the `tags:create` function. Tags should conform to the docker tagging specification for your docker version. As of 1.10, that specification is available [here](https://github.com/docker/docker/blob/master/image/spec/v1.1.md), while users of older versions can check the documentation [here](https://github.com/docker/docker/blob/master/image/spec/v1.md).

 ```shell
@@ -46,6 +59,8 @@ dokku/node-js-app   latest              936a42f25901        About a minute ago
 dokku/node-js-app   v1                  936a42f25901        About a minute ago   1.025 GB
 ```

+### Deploying an image tag
+
 Finally, you can also deploy a local image using the `tags:deploy` command.

 ```shell
@@ -79,11 +94,13 @@ dokku tags:deploy node-js-app v1
       http://node-js-app.dokku.me
 ```

-## Deploying from a Docker Registry
+## Image Workflows
+
+### Deploying from a Docker Registry

 You can alternatively add image pulled from a docker Registry and deploy app from it by using tagging feature. In this example, we are deploying from Docker Hub.

-1. Create dokku app as usual
+1. Create Dokku app as usual

    ```shell
    dokku apps:create test-app
@@ -110,11 +127,11 @@ You can alternatively add image pulled from a docker Registry and deploy app fro
 > Note: When deploying an image, we will use `docker inspect` to extract the `ExposedPorts` configuration and if defined, use that to populate `DOKKU_DOCKERFILE_PORTS`. If this behavior is not desired, you can override that configuration variable with the `config:set` command.
 > Example: `dokku config:set test-app DOKKU_DOCKERFILE_PORTS="5984/tcp 80/tcp"`

-## Deploying an image from CI
+### Deploying an image from CI

 To ensure your builds are always reproducible, it's considered bad practice to store build
 artifacts in your repository. For some projects however, building artifacts during deployment
-to dokku may affect the performance of running applications.
+to Dokku may affect the performance of running applications.

 One solution is to build a finished Docker image on a CI service (or even locally) and deploy
 it directly to the host running dokku.
@@ -122,11 +139,11 @@ it directly to the host running dokku.
 1. Build image on CI (or locally)

    ```shell
-    docker build -t dokku/test-app:v12
+    docker build -t dokku/test-app:v12 .
    # Note: The image must be tagged `dokku/<app-name>:<version>`
    ```

-2. Deploy image to dokku host
+2. Deploy image to Dokku host

    ```shell
    docker save dokku/test-app:v12 | ssh my.dokku.host "docker load | dokku tags:deploy test-app v12"
@@ -139,7 +156,7 @@ Here's a more complete example using the above method:

 ```shell
 # build the image
-docker build -t dokku/test-app:v12
+docker build -t dokku/test-app:v12 .
 # copy the image to the dokku host
 docker save dokku/test-app:v12 | bzip2 | ssh my.dokku.host "bunzip2 | docker load"
 # tag and deploy the image
--- a/docs/deployment/methods/tar.md
+++ b/docs/deployment/methods/tar.md
@@ -1,4 +1,4 @@
-# Tarfile Deployment
+# Tarball Deployment

 > New as of 0.4.0

@@ -7,9 +7,18 @@ tar:from <app> <url>                           # Loads an app tarball from url
 tar:in <app>                                   # Reads an tarball containing the app from stdin
 ```

-## Deploying from a tarball
+> When triggering `dokku ps:rebuild APP` on an application deployed via the `tar` plugin, the following may occur:
+>
+> - Applications previously deployed via another method (`git`): The application may revert to a state before the latest custom image tag was deployed.
+> - Applications that were only ever deployed via the `tar` plugin: The application will be properly rebuilt.
+>
+> Please use the appropriate `tar` command when redeploying an application deployed via tarball.

-In some cases, it may be useful to deploy an application from a tarball. For instance, if you implemented a non-git based deployment plugin, tarring the generated artifact may be an easier route to interface with the existing dokku infrastructure.
+## Usage
+
+### Deploying from a tarball
+
+In some cases, it may be useful to deploy an application from a tarball. For instance, if you implemented a non-git based deployment plugin, tarring the generated artifact may be an easier route to interface with the existing Dokku infrastructure.

 You can place the tarball on an external webserver and deploy via the `tar:from` command.

@@ -17,6 +26,8 @@ You can place the tarball on an external webserver and deploy via the `tar:from`
 dokku tar:from node-js-app https://dokku.me/releases/node-js-app/v1
 ```

+### Deploying via stdin
+
 As an alternative, a deploy can be trigged from a tarball read from stdin using the `tar:in` command:

 ```shell
--- a/docs/deployment/one-off-processes.md
+++ b/docs/deployment/one-off-processes.md
@@ -36,14 +36,14 @@ dokku config:set --global DOKKU_RM_CONTAINER=1
 dokku config:unset --global DOKKU_RM_CONTAINER
 ```

-You may also use the `--rm-container` or `--rm` dokku flags to remove the containers automatically:
+You may also use the `--rm-container` or `--rm` Dokku flags to remove the containers automatically:

 ```shell
 dokku --rm-container run node-js-app ls -lah
 dokku --rm run node-js-app ls -lah
 ```

-Finally, you may wish to run a container in "detached" mode via the `--detach` dokku flag. Running a process in detached mode will immediately return a `CONTAINER_ID`. It is up to the user to then further manage this container in whatever manner they see fit, as dokku will *not* automatically terminate the container.
+Finally, you may wish to run a container in "detached" mode via the `--detach` Dokku flag. Running a process in detached mode will immediately return a `CONTAINER_ID`. It is up to the user to then further manage this container in whatever manner they see fit, as Dokku will *not* automatically terminate the container.

 ```shell
 dokku --detach run node-js-app ls -lah
@@ -108,7 +108,7 @@ dokku ps:scale node-js-app cron=1
 You can now run all your commands in that container:

 ```shell
-dokku enter api cron some-command
+dokku enter node-js-app cron some-command
 ```

 Note that you can also run multiple commands at the same time to reduce memory usage, though that may result in polluting the container environment.
@@ -119,8 +119,8 @@ For tasks that will properly resume, you **should** use the above method, as run

 Regularly scheduled tasks can be a bit of a pain with dokku. The following are general recommendations to follow to help ensure successful task runs.

- Use the dokku user's crontab
-  - If you do not, dokku will attempt to execute with sudo dokku, and your cron run with fail with `sudo: no tty present and no askpass program specified`
+- Use the `dokku` user's crontab
+  - If you do not, the `dokku` binary will attempt to execute with `sudo` dokku, and your cron run with fail with `sudo: no tty present and no askpass program specified`
 - Add a `MAILTO` environment variable to ship cron emails to yourself.
 - Add a `PATH` environment variable or specify the full path to binaries on the host.
 - Add a `SHELL` environment variable to specify bash when running commands.
--- a/docs/deployment/process-management.md
+++ b/docs/deployment/process-management.md
@@ -4,8 +4,8 @@

 ```
 ps <app>                                       # List processes running in app container(s)
-ps:rebuildall                                  # Rebuild all apps
-ps:rebuild <app>                               # Rebuild an app
+ps:rebuildall                                  # Rebuild all apps from source
+ps:rebuild <app>                               # Rebuild an app from source
 ps:restartall                                  # Restart all deployed app containers
 ps:restart <app>                               # Restart app container(s)
 ps:scale <app> <proc>=<count> [<proc>=<count>] # Set how many processes of a given process to run
@@ -19,15 +19,164 @@ By default, Dokku will only start a single `web` process - if defined - though p

 > The `web` proctype is the only proctype that will invoke custom checks as defined by a CHECKS file. It is also the only process type that will be launched in a container that is either proxied via nginx or bound to an external port.

+## Usage
+
+### Listing processes running in an app container
+
+To find out if your application's containers are running the commands you expect, simply run the `ps` command against that application.
+
+```shell
+dokku ps node-js-app
+```
+
+### Rebuilding applications
+
+There are some Dokku commands which will not automatically rebuild an application's environment, or which can be told to skip a rebuild.  For instance, you may wish to run mulitple `config:set` commands without a restart so as to speed up configuration. In these cases, you can ultimately trigger an application rebuild using `ps:rebuild`
+
+```shell
+dokku ps:rebuild node-js-app
+```
+
+You may also rebuild all applications at once, which is useful when enabling/disabling a plugin that modifies all applications:
+
+```shell
+dokku ps:rebuildall
+```
+
+> The `ps:rebuild` and `ps:rebuildall` commands only work for applications for which there is a source, and thus
+> will only always work deterministically for git-deployed application. Please see
+> the [images documentation](/dokku/deployment/methods/images/) and [tar documentation](/dokku/deployment/methods/tar/)
+> in for more information concerning rebuilding those applications.
+
+### Restarting applications
+
+Applications can be restarted, which is functionally identical to calling the `release_and_deploy` function on an application. Please not that any linked containers *must* be started before the application in order to have a successful boot.
+
+```shell
+dokku ps:restart node-js-app
+```
+
+You may also trigger a restart on all applications at one time:
+
+```shell
+dokku ps:restartall
+```
+
 ### `ps:scale` command

 Dokku can also manage scaling itself via the `ps:scale` command. This command can be used to scale multiple process types at the same time.

 ```shell
-dokku ps:scale APP web=1 worker=2
+dokku ps:scale node-js-app web=1
 ```

-### DOKKU_SCALE file
+Multiple process types can be scaled at once:
+
+```shell
+dokku ps:scale node-js-app web=1 worker=1
+```
+
+Issuing the `ps:scale` command with no process type argument will output the current scaling settings for an application:
+
+```shell
+dokku ps:scale node-js-app
+```
+
+```
+-----> Scaling for node-js-app
+-----> proctype           qty
+-----> --------           ---
+-----> web                1
+-----> worker             1
+```
+
+### Stopping applications
+
+Deployed applications can be stopped using the `ps:stop` command. This turns all running containers for an application, and will result in a `502 Bad Gateway` reponse for the default nginx proxy implementation.
+
+```shell
+dokku ps:stop node-js-app
+```
+
+### Starting applications
+
+All stopped containers can be started using the `ps:start` command. This is similar to running `ps:restart`, except no action will be taken if the application containers are running.
+
+```shell
+dokku ps:start node-js-app
+```
+
+## Restart Policies
+
+> New as of 0.7.0
+
+By default, Dokku will automatically restart containers that exit with a non-zero status up to 10 times via the [on-failure Docker restart policy](https://docs.docker.com/engine/reference/run/#restart-policies-restart).
+
+### Showing the current restart policy
+
+THe `ps:restart-policy` command will show the currently configured restart policy for an application. The default policy is `on-failure:10`
+
+```shell
+dokku ps:restart-policy node-js-app
+```
+
+```
+=====> node-js-app restart-policy:
+on-failure:10
+```
+
+### Setting the restart policy
+
+You can configure this via the `ps:set-restart-policy` command:
+
+```shell
+# always restart an exited container
+dokku ps:set-restart-policy node-js-app always
+```
+
+```
+-----> Setting restart policy: always
+```
+
+```shell
+# never restart an exited container
+dokku ps:set-restart-policy node-js-app no
+```
+
+```
+-----> Setting restart policy: no
+```
+
+```shell
+# only restart it on Docker restart if it was not manually stopped
+dokku ps:set-restart-policy node-js-app unless-stopped
+```
+
+```
+-----> Setting restart policy: unless-stopped
+```
+
+```shell
+# restart only on non-zero exit status
+dokku ps:set-restart-policy node-js-app on-failure
+```
+
+```
+-----> Setting restart policy: on-failure
+```
+
+```shell
+# restart only on non-zero exit status up to 20 times
+dokku ps:set-restart-policy node-js-app on-failure:20
+```
+
+```
+-----> Setting restart policy: on-failure:20
+```
+
+Restart policies have no bearing on server reboot, and Dokku will always attempt to restart your applications at that point unless they were manually stopped.
+
+## Manually managing process scaling

 You can optionally create a `DOKKU_SCALE` file in the root of your repository. Dokku expects this file to contain one line for every process defined in your Procfile.

@@ -39,28 +188,3 @@ worker=2
 ```

 > *NOTE*: Dokku will always use the DOKKU_SCALE file that ships with the repo to override any local settings.
-
-## Restart Policies
-
-> New as of 0.7.0
-
-By default, Dokku will automatically restart containers that exit with a non-zero status up to 10 times via the [on-failure Docker restart policy](https://docs.docker.com/engine/reference/run/#restart-policies-restart). You can configure this via the relevant `ps` commands:
-
-```shell
-# always restart an exited container
-dokku ps:set-restart-policy node-js-app always
-
-# never restart an exited container
-dokku ps:set-restart-policy node-js-app no
-
-# only restart it on Docker restart if it was not manually stopped
-dokku ps:set-restart-policy node-js-app unless-stopped
-
-# restart only on non-zero exit status
-dokku ps:set-restart-policy node-js-app on-failure
-
-# restart only on non-zero exit status up to 20 times
-dokku ps:set-restart-policy node-js-app on-failure:20
-```
-
-Restart policies have no bearing on server reboot, and Dokku will always attempt to restart your applications at that point unless they were manually stopped.
--- a/docs/deployment/remote-commands.md
+++ b/docs/deployment/remote-commands.md
@@ -12,7 +12,7 @@ Host dokku.me
 ## Behavioral modifiers

 Dokku also supports certain command-line arguments that augment it's behavior. If using these over ssh, you must use the form `ssh -t dokku@dokku.me -- <command>`
-in order to avoid ssh interpretting dokku arguments for itself.
+in order to avoid ssh interpretting Dokku arguments for itself.

 ```
 --quiet                suppress output headers
@@ -23,6 +23,6 @@ in order to avoid ssh interpretting dokku arguments for itself.

 ## Clients

-You may optionally use a client to connect to your dokku server. Most clients use the configured `git remote` to locate the dokku server, though some allow for overriding this via an environment variable or flag.
+You may optionally use a client to connect to your Dokku server. Most clients use the configured `git remote` to locate the Dokku server, though some allow for overriding this via an environment variable or flag.

 Please refer to the [clients](/dokku/community/clients/) list for more details.
--- a/docs/deployment/user-management.md
+++ b/docs/deployment/user-management.md
@@ -5,35 +5,50 @@
 ```
 ssh-keys:add <name> [/path/to/key]             # Add a new public key by pipe or path
 ssh-keys:list                                  # List of all authorized Dokku public ssh keys
-ssh-keys                                       # Manage public ssh keys that are allowed to connect to Dokku
 ssh-keys:remove <name>                         # Remove SSH public key by name
 ```

 When pushing to Dokku, ssh key based authorization is the preferred authentication method, for ease of use and increased security.

-Users in Dokku are managed via the `~/dokku/.ssh/authorized_keys` file. It is **highly** recommended that you follow the  steps below to manage users on a Dokku server.
+Users in Dokku are managed via the `~/dokku/.ssh/authorized_keys` file. It is **highly** recommended that you follow the steps below to manage users on a Dokku server.

 > Users of older versions of Dokku should use the `sshcommand` binary to manage keys. Please refer to the Dokku documentation for your version for more details.

-## Adding deploy users
+## Usage

-You can add your public key to Dokku with the following command:
+### Listing SSH Keys
+
+You can use the `ssh-keys:list` command to show all configured ssh keys. Any key added via the `dokku-installer` will be associated with the `admin` key name.
+
+```shell
+dokku ssh-keys:list
+```
+
+```
+61:21:1f:88:7f:86:d4:3a:68:9f:18:aa:41:4f:bc:3d NAME="admin" SSHCOMMAND_ALLOWED_KEYS="no-agent-forwarding,no-user-rc,no-X11-forwarding,no-port-forwarding"
+```
+
+The output contains the following information:
+
+- SSH Key Fingerprint.
+- The `KEY_NAME`.
+- A comma separated list of ssh options under the `SSHCOMMAND_ALLOWED_KEYS` name.
+
+### Adding SSH Keys
+
+You can add your public key to Dokku with the `ssh-keys:add` command. The output will be the fingerprint of the ssh key:

 ```shell
 dokku ssh-keys:add KEY_NAME path/to/id_rsa.pub
 ```

+```
+b7:76:27:4f:30:90:21:ae:d4:1e:70:20:35:3f:06:d6
+```
+
 `KEY_NAME` is the username prefer to use to refer to this particular key. Including the word `admin` in the name will grant the user privileges to add additional keys remotely.

-Key names are unique, and attempting to re-use a name will result in an error.
-
-> The unique `KEY_NAME` is for ease of identifying the keys. The ssh (git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all it's actions.
-
-As key names are unique, they can be used to remove a public ssh key:
-
-```SHELL
-dokku ssh-keys:remove KEY_NAME
-```
+> `KEY_NAME` is a unique name which is used to identify public keys. Attempting to re-use a key name will result in an error. The ssh (git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all it's actions.

 Admin users and root can also add keys remotely:

@@ -47,6 +62,14 @@ Finally, if you are using the vagrant installation, you can also use the `make v
 cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
 ```

+### Removing SSH Keys
+
+As key names are unique, they can be used to remove a public ssh key.
+
+```SHELL
+dokku ssh-keys:remove KEY_NAME
+```
+
 ## Scoping commands to specific users

 Keys are given unique names, which can be used in conjunction with the [user-auth](/dokku/development/plugin-triggers/#user-auth) plugin trigger to handle command authorization. Please see the documentation on that trigger for more information.
--- a/docs/deployment/zero-downtime-deploys.md
+++ b/docs/deployment/zero-downtime-deploys.md
@@ -10,7 +10,7 @@ checks:run <app> [process-type(s)]       Runs zero-downtime checks for all proce
 checks:skip <app> [process-type(s)]      Skip zero-downtime checks for all processes (or comma-separated process-type list)
 ```

-Following a deploy, dokku will wait `10` seconds before routing traffic to the new container to give your application time to boot up. If the application is not running after this time, then the deploy is failed and your old container will continue serving traffic. You can modify this value globally or on a per-application basis:
+Following a deploy, Dokku will wait `10` seconds before routing traffic to the new container to give your application time to boot up. If the application is not running after this time, then the deploy is failed and your old container will continue serving traffic. You can modify this value globally or on a per-application basis:

 ```shell
 dokku config:set --global DOKKU_DEFAULT_CHECKS_WAIT=30
@@ -147,7 +147,7 @@ Invalid container id specified (APP.web.3)

 If your application needs a longer period to boot up - perhaps to load data into memory, or because of slow boot time - you may also use dokku's `checks` functionality to more precisely check whether an application can serve traffic or not.

-Checks are run against the detected `web` process from your application's `Procfile`. For non-web processes, dokku will fallback to the aforementioned process uptime check.
+Checks are run against the detected `web` process from your application's `Procfile`. For non-web processes, Dokku will fallback to the aforementioned process uptime check.

 To specify checks, add a `CHECKS` file to the root of your project directory. The `CHECKS` file should be plain text and may contain:

@@ -203,7 +203,7 @@ ATTEMPTS=10 # Attempt checks 10 times
 /  My Amazing App
 ```

-You can also override the default `WAIT`, `TIMEOUT`, and `ATTEMPTS` variables for the global dokku installation:
+You can also override the default `WAIT`, `TIMEOUT`, and `ATTEMPTS` variables for the global Dokku installation:

 ```shell
 dokku config:set --global DOKKU_CHECKS_WAIT=30
@@ -219,7 +219,7 @@ dokku config:set <app> DOKKU_DEFAULT_CHECKS_WAIT=0

 ### Configuring docker stop timeout

-[By default](https://docs.docker.com/engine/reference/commandline/stop/), docker will wait 10 seconds from the time the `stop` command is passed to a container before it attempts to kill said container. This timeout can be configured on a per-app basis in dokku by setting the `DOKKU_DOCKER_STOP_TIMEOUT` configuration variable. This timeout applies to normal zero-downtime deployments as well as the `ps:stop` and `apps:destroy` commands.
+[By default](https://docs.docker.com/engine/reference/commandline/stop/), docker will wait 10 seconds from the time the `stop` command is passed to a container before it attempts to kill said container. This timeout can be configured on a per-app basis in Dokku by setting the `DOKKU_DOCKER_STOP_TIMEOUT` configuration variable. This timeout applies to normal zero-downtime deployments as well as the `ps:stop` and `apps:destroy` commands.

 ```shell
 dokku config:set $APP DOKKU_DOCKER_STOP_TIMEOUT=20
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -2,7 +2,7 @@

 If you create your own plugin:

-1. Take a look at the plugins shipped with dokku and hack away!
+1. Take a look at the plugins shipped with Dokku and hack away!
 2. Check out the [list of triggers](/dokku/development/plugin-triggers) your plugin can implement.
 3. Upload your plugin to github with a repository name in form of `dokku-<name>` (e.g. `dokku-mariadb`)
 4. Edit [this page](/dokku/community/plugins/) and add a link to it.
@@ -124,7 +124,7 @@ A few notes:
 - If your command requires that an application exists, ensure you check for it's existence in the manner prescribed above.
 - A `help` command is required, though it is allowed to be empty. Also, the command syntax will need to separated by `, ` in order to maintain columnar output alignment.
 - Commands *should* be namespaced.
- As of 0.3.3, a catch-all should be implemented which exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows dokku to output a `command not found` message.
+- As of 0.3.3, a catch-all should be implemented which exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows Dokku to output a `command not found` message.
 - Be sure you want the "set -eo pipefail" option. Look at the following example :

    ```shell
@@ -134,7 +134,7 @@ A few notes:
    fi
    ```

-  In the case where the "user/repo" is not installed, dokku exits just before the awk command,
+  In the case where the "user/repo" is not installed, Dokku exits just before the awk command,
  you will never see the message printed with echo. You just want "set -e" in this case.

  Here is the documentation of the 'set -eo pipefail' option:
@@ -156,4 +156,4 @@ A few notes:
 - From time to time you may want to allow other plugins access to (some of) your plugin's functionality. You can expose this by including a `functions` file in your plugin for others to source. Consider all functions in that file to be publicly accessible by other plugins. Any functions not wished to be made "public" should reside within your plugin trigger or commands files.
 - As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](/dokku/development/plugin-triggers) doc for examples.
 - As of 0.5.0, we use container labels to help cleanup intermediate containers with `dokku cleanup`. If manually calling `docker run`, include `$DOKKU_GLOBAL_RUN_ARGS`. This will ensure you intermediate containers labeled correctly.
- As of 0.6.0, we advise you to *not* call the dokku binary directly from within plugins. Clients using the `--app` argument are potentially broken, amongst other issues, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call dokku internal functions
+- As of 0.6.0, we advise you to *not* call the `dokku` binary directly from within plugins. Clients using the `--app` argument are potentially broken, amongst other issues, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call Dokku internal functions
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -1,6 +1,6 @@
 # Plugin triggers

-[Plugin triggers](https://github.com/dokku/plugn) (formerly [pluginhooks](https://github.com/progrium/pluginhook)) are a good way to jack into existing dokku infrastructure. You can use them to modify the output of various dokku commands or override internal configuration.
+[Plugin triggers](https://github.com/dokku/plugn) (formerly [pluginhooks](https://github.com/progrium/pluginhook)) are a good way to jack into existing Dokku infrastructure. You can use them to modify the output of various Dokku commands or override internal configuration.

 Plugin triggers are simply scripts that are executed by the system. You can use any language you want, so long as the script:

@@ -9,7 +9,7 @@ Plugin triggers are simply scripts that are executed by the system. You can use

 For instance, if you wanted to write a plugin trigger in PHP, you would need to have `php` installed and available on the CLI prior to plugin trigger invocation.

-The following is an example for the `nginx-hostname` plugin trigger. It reverses the hostname that is provided to nginx during deploys. If you created an executable file named `nginx-hostname` with the following code in your plugin trigger, it would be invoked by dokku during the normal app deployment process:
+The following is an example for the `nginx-hostname` plugin trigger. It reverses the hostname that is provided to nginx during deploys. If you created an executable file named `nginx-hostname` with the following code in your plugin trigger, it would be invoked by Dokku during the normal app deployment process:

 ```shell
 #!/usr/bin/env bash
@@ -23,11 +23,11 @@ echo "$NEW_SUBDOMAIN.$VHOST"

 ## Available plugin triggers

-There are a number of plugin-related triggers. These can be optionally implemented by plugins and allow integration into the standard dokku setup/teardown process.
+There are a number of plugin-related triggers. These can be optionally implemented by plugins and allow integration into the standard Dokku setup/teardown process.

-The following plugin triggers describe those available to a dokku installation. As well, there is an example for each trigger that you can use as templates for your own plugin development.
+The following plugin triggers describe those available to a Dokku installation. As well, there is an example for each trigger that you can use as templates for your own plugin development.

-> The example plugin trigger code is not guaranteed to be implemented as in within dokkku, and are merely simplified examples. Please look at the dokku source for larger, more in-depth examples.
+> The example plugin trigger code is not guaranteed to be implemented as in within dokkku, and are merely simplified examples. Please look at the Dokku source for larger, more in-depth examples.

 ### `post-config-update`

@@ -63,9 +63,9 @@ echo false

 ### `check-deploy`

- Description: Allows you to run checks on a deploy before dokku allows the container to handle requests.
+- Description: Allows you to run checks on a deploy before Dokku allows the container to handle requests.
 - Invoked by: `dokku deploy`
- Arguments: `$CONTAINER_ID $APP $INTERNAL_PORT $INTERNAL_IP_ADDRESS`
+- Arguments: `$APP $CONTAINER_ID $PROC_TYPE $PORT $IP`
 - Example:

 ```shell
@@ -76,7 +76,7 @@ echo false
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/config/functions"

-CONTAINERID="$1"; APP="$2"; PORT="$3" ; HOSTNAME="${4:-localhost}"
+APP="$1"; CONTAINERID="$2"; PROC_TYPE="$3"; PORT="$4" ; IP="$5"

 eval "$(config_export app $APP)"
 DOKKU_DISABLE_DEPLOY="${DOKKU_DISABLE_DEPLOY:-false}"
@@ -312,7 +312,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x

 ```shell
 #!/usr/bin/env bash
-# Sets the hostname of the dokku server
+# Sets the hostname of the Dokku server
 # based on the output of `hostname -f`

 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
@@ -778,7 +778,7 @@ dokku hg-build $APP $REV

 ```shell
 #!/bin/bash
-# Gives dokku the ability to support multiple branches for a given service
+# Gives Dokku the ability to support multiple branches for a given service
 # Allowing you to have multiple staging environments on a per-branch basis

 reference_app=$1
@@ -865,7 +865,7 @@ sudo BUILD_STACK=true make install

 ### `user-auth`

-This is a special plugin trigger that is executed on *every* command run. As dokku sometimes internally invokes the `dokku` command, special care should be taken to properly handle internal command redirects.
+This is a special plugin trigger that is executed on *every* command run. As Dokku sometimes internally invokes the `dokku` command, special care should be taken to properly handle internal command redirects.

 Note that the trigger should exit as follows:

@@ -882,7 +882,7 @@ sshcommand acl-add dokku NAME < $PATH_TO_SSH_KEY

 Note that the `NAME` value is set at the first ssh key match. If an ssh key is set in the `/home/dokku/.ssh/authorized_keys` multiple times, the first match will decide the value.

- Description: Allows you to deny access to a dokku command by either ssh user or associated ssh-command NAME user.
+- Description: Allows you to deny access to a Dokku command by either ssh user or associated ssh-command NAME user.
 - Invoked by `dokku`
 - Arguments: `$SSH_USER $SSH_NAME $DOKKU_COMMAND`
 - Example:
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -39,9 +39,9 @@ At the moment, tags need not be signed, though that may change in the future.

 ## Debian Packages

-The `build` target in the dokku `Vagrantfile` creates debian packages for dokku at a point in time. The version will be based upon the latest local tag - you may create your own, internal tags/releases if that is so desired.
+The `build` target in the Dokku `Vagrantfile` creates debian packages for Dokku at a point in time. The version will be based upon the latest local tag - you may create your own, internal tags/releases if that is so desired.

-Debian package information is held in the `debian` directory of the dokku project.
+Debian package information is held in the `debian` directory of the Dokku project.

 For the public project, releases should be pushed to packagecloud.io *after* a tag is created but *before* said tag is pushed to github. The following may be the release workflow:

@@ -66,7 +66,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.7.1-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.7.2-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -17,7 +17,7 @@ While we do provide official packages for a variety of platforms, as our test su

 ## Local Test Execution

- Setup dokku in a [vagrant vm](/dokku/getting-started/install/vagrant)
+- Setup Dokku in a [vagrant vm](/dokku/getting-started/install/vagrant)
 - Run the following to setup tests and execute them:

  ```shell
@@ -29,7 +29,7 @@ While we do provide official packages for a variety of platforms, as our test su
  # execute the entire test suite (linter, bats tests, and app deployment tests)
  make test

-  # run linter & update vagrant dokku install from local git clone
+  # run linter & update vagrant Dokku install from local git clone
  make lint copyfiles

  # execute all bats tests
@@ -45,4 +45,4 @@ Additionally you may run a specific app deployment tests with a target similar t
 make deploy-test-nodejs-express
 ```

-For a full list of test make targets check out `tests.mk` in the root of the dokku repository.
+For a full list of test make targets check out `tests.mk` in the root of the Dokku repository.
--- a/docs/getting-started/advanced-installation.md
+++ b/docs/getting-started/advanced-installation.md
@@ -1,6 +1,6 @@
 # Advanced installation

-You can always install dokku straight from the latest - potentially unstable - master release via the following bash command:
+You can always install Dokku straight from the latest - potentially unstable - master release via the following bash command:

 ```shell
 # using a branch results in installing from source
@@ -26,7 +26,7 @@ sudo SSHCOMMAND_URL=https://raw.githubusercontent.com/yourusername/sshcommand/ma

 ## Bootstrap a server from your own repository

-The bootstrap script allows the dokku repository URL to be overridden to bootstrap a host from your own clone of dokku using the `DOKKU_REPO` environment variable. Example:
+The bootstrap script allows the Dokku repository URL to be overridden to bootstrap a host from your own clone of Dokku using the `DOKKU_REPO` environment variable. Example:

 ```shell
 wget https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh
@@ -46,11 +46,11 @@ sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make

 ## Configuring

-Once dokku is installed, if you are not using the web-installer, you'll want to configure a the virtualhost setup as well as the push user. If you do not, your installation will be considered incomplete and you will not be able to deploy applications.
+Once Dokku is installed, if you are not using the web-installer, you'll want to configure a the virtualhost setup as well as the push user. If you do not, your installation will be considered incomplete and you will not be able to deploy applications.

 *You should also stop and disable the `dokku-installer` service to remove public access to adding SSH keys.*

-Set up a domain and a wildcard domain pointing to that host. Make sure `/home/dokku/VHOST` is set to this domain. By default it's set to whatever hostname the host has. This file is only created if the hostname can be resolved by dig (`dig +short $(hostname -f)`). Otherwise you have to create the file manually and set it to your preferred domain. If this file still is not present when you push your app, dokku will publish the app with a port number (i.e. `http://example.com:49154` - note the missing subdomain).
+Set up a domain and a wildcard domain pointing to that host. Make sure `/home/dokku/VHOST` is set to this domain. By default it's set to whatever hostname the host has. This file is only created if the hostname can be resolved by dig (`dig +short $(hostname -f)`). Otherwise you have to create the file manually and set it to your preferred domain. If this file still is not present when you push your app, Dokku will publish the app with a port number (i.e. `http://example.com:49154` - note the missing subdomain).

 Follow the [user management documentation](/dokku/deployment/user-management/) in order to add users to dokku.

@@ -58,7 +58,7 @@ That's it!

 ## VMs with less than 1GB of memory

-Having less than 1GB of system memory available for dokku and its containers, for example Digital Ocean's small 512MB machines, might result in unexpected errors, such as **! [remote rejected] master -> master (pre-receive hook declined)** during installation of NPM dependencies (https://github.com/npm/npm/issues/3867).
+Having less than 1GB of system memory available for Dokku and its containers, for example Digital Ocean's small 512MB machines, might result in unexpected errors, such as **! [remote rejected] master -> master (pre-receive hook declined)** during installation of NPM dependencies (https://github.com/npm/npm/issues/3867).

 To work around this issue, it might suffice to augment the linux swap file size to a maximum of twice the physical memory size.

--- a/docs/getting-started/install/azure.md
+++ b/docs/getting-started/install/azure.md
@@ -2,10 +2,10 @@

 - If you don't already have one [generate an SSH key pair](https://help.github.com/articles/generating-ssh-keys/).

- Go to the [dokku on azure deployment page](https://github.com/azure/azure-quickstart-templates/tree/master/dokku-vm) and click **Deploy to Azure**.
+- Go to the [Dokku on azure deployment page](https://github.com/azure/azure-quickstart-templates/tree/master/dokku-vm) and click **Deploy to Azure**.

 - You'll be prompted to enter a few parameters, including a unique storage account name and a unique name for the sub-domain used for your public IP address. For the `sshKeyData` parameter, copy and paste the contents of the **public** key file you just created. After a few minutes the Dokku instance will be deployed.

 - In your browser of choice, navigate to `http://[[dnsNameForPublicIP]].[[location]].cloudapp.azure.com`. Where `[[dnsNameForPublicIP]]` and `[[location]]` are template parameters you used to deploy the template.

- Finish your dokku setup like you normally would by creating a **new** public/private key pair for your deployments using `ssh-keygen` (don't use the same one as you created in the first step). You should select 'Use Virtual Host Naming' and set the `Hostname` to a **public dns name** that you own such as one you would purchase from [namecheap](http://namecheap.com). Alternatively thanks to [xip.io]( http://xip.io/) you can just use yourAzurePublicIP.xip.io for free. For example, if your public IP is `44.44.44.44` then you would set it to `44.44.44.44.xip.io`.
+- Finish your Dokku setup like you normally would by creating a **new** public/private key pair for your deployments using `ssh-keygen` (don't use the same one as you created in the first step). You should select 'Use Virtual Host Naming' and set the `Hostname` to a **public dns name** that you own such as one you would purchase from [namecheap](http://namecheap.com). Alternatively thanks to [xip.io]( http://xip.io/) you can just use yourAzurePublicIP.xip.io for free. For example, if your public IP is `44.44.44.44` then you would set it to `44.44.44.44.xip.io`.
--- a/docs/getting-started/install/debian.md
+++ b/docs/getting-started/install/debian.md
@@ -1,6 +1,6 @@
 # Debian Package Installation Notes

-As of 0.3.18, dokku defaults to being installed via debian package. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of dokku without the use of our `bootstrap.sh` bash script. The following are the steps run by said script:
+As of 0.3.18, Dokku defaults to being installed via debian package. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of Dokku without the use of our `bootstrap.sh` bash script. The following are the steps run by said script:

 ```shell
 # install prerequisites
@@ -14,7 +14,7 @@ wget -nv -O - https://get.docker.com/ | sh
 wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
 echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list
 sudo apt-get update -qq > /dev/null
-sudo apt-get install -qq -y dokku 
+sudo apt-get install -qq -y dokku
 sudo dokku plugin:install-dependencies --core
 ```

@@ -38,4 +38,4 @@ After setting the desired options, proceed with the installation as described ab
 | dokku/vhost_enable | boolean | false                 | Use vhost-based deployments (e.g. <app>.dokku.me)                        |
 | dokku/hostname     | string  | dokku.me              | Hostname, used as vhost domain and for showing app URL after deploy      |
 | dokku/skip_key_file| boolean | false                 | Don't check for the existence of the dokku/key_file. Warning: This setting this to true, will require you to manually add an SSH key later on. |
-| dokku/key_file     | string  | /root/.ssh/id_rsa.pub | SSH key to add to the Dokku user (Will be ignored on `dpkg-reconfigure`) |
+| dokku/key_file     | string  | /root/.ssh/id_rsa.pub | Path on disk to an SSH key to add to the Dokku user (Will be ignored on `dpkg-reconfigure`) |
--- a/docs/getting-started/install/dreamhost.md
+++ b/docs/getting-started/install/dreamhost.md
@@ -37,7 +37,7 @@ openstack server create \
 ```

 The content of dokku-cloudinit.sh script contains instructions to add
-Docker and Dokku's apt repositories and install dokku with the proper
+Docker and Dokku's apt repositories and install Dokku with the proper
 debconf options set. Don't forget to add the FQDN for your application
 server:

--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -20,21 +20,21 @@ Dokku is designed for usage on a fresh installation of Ubuntu, and should instal
 To install the latest stable version of dokku, you can run the following shell commands:

 ```shell
-# for debian systems, installs dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.7.1/bootstrap.sh
-sudo DOKKU_TAG=v0.7.1 bash bootstrap.sh
+# for debian systems, installs Dokku via apt-get
+wget https://raw.githubusercontent.com/dokku/dokku/v0.7.2/bootstrap.sh
+sudo DOKKU_TAG=v0.7.2 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.

 #### 2. Setup SSH key and Virtualhost Settings

-Once the installation is complete, you can open a browser to setup your SSH key and virtualhost settings. Open your browser of choice and navigate to the host's IP address - or the domain you assigned to that IP previously - and configure dokku via the web admin.
+Once the installation is complete, you can open a browser to setup your SSH key and virtualhost settings. Open your browser of choice and navigate to the host's IP address - or the domain you assigned to that IP previously - and configure Dokku via the web admin.

-*If you don't complete setup via the web installer (even if you set up SSH keys and virtual hosts otherwise) your dokku installation will remain vulnerable to anyone finding the setup page and inserting their key.*
+*If you don't complete setup via the web installer (even if you set up SSH keys and virtual hosts otherwise) your Dokku installation will remain vulnerable to anyone finding the setup page and inserting their key.*

 #### 3. Deploy your first application
-Once you save your settings, the web admin will self-terminate and you should be able to run or deploy to the dokku installation.
+Once you save your settings, the web admin will self-terminate and you should be able to run or deploy to the Dokku installation.

 ### Installing via other methods

--- a/docs/getting-started/troubleshooting.md
+++ b/docs/getting-started/troubleshooting.md
@@ -43,7 +43,7 @@ __Solution:__

 The `remote rejected` error does not give enough information. Anything could have failed.

-To enable dokku tracing, simply run the following command:
+To enable Dokku tracing, simply run the following command:

 ```shell
 # since 0.3.9
@@ -60,7 +60,7 @@ This will trace all of dokku's activity. If this does not help you, create a [gi

 ***

-__Symptom:__ I get the aforementioned error in the build phase (after turning on dokku tracing)
+__Symptom:__ I get the aforementioned error in the build phase (after turning on Dokku tracing)

  Most errors that happen in this phase are due to transient network issues (either locally or remotely) buildpack bugs.

--- a/docs/getting-started/upgrading.md
+++ b/docs/getting-started/upgrading.md
@@ -1,6 +1,6 @@
 # Upgrading

-If your version of dokku is pre 0.3.0 (check with `dokku version`), we recommend [a fresh install](/dokku/getting-started/installation/) on a new server.
+If your version of Dokku is pre 0.3.0 (check with `dokku version`), we recommend [a fresh install](/dokku/getting-started/installation/) on a new server.

 ## Migration Guides

@@ -20,19 +20,29 @@ Before upgrading, check the migration guides to get comfortable with new feature

 ## Upgrade Instructions

-If dokku was installed via `apt-get install dokku` or `bootstrap.sh` (most common), upgrade with:
+If Dokku was installed via `apt-get install dokku` or `bootstrap.sh` (most common), upgrade with:

 ```shell
 sudo apt-get update
 dokku apps
 dokku ps:stop <app> # repeat to shut down each running app
 sudo apt-get install -qq -y dokku herokuish
-dokku ps:rebuildall # restart all applications
+dokku ps:rebuildall # rebuilds all applications
 ```

+> If you have any applications deployed via the `tags` or `tar` commands, do not run the `ps:rebuildall` command,
+> and instead trigger `ps:rebuild` manually for each `git`-deployed application:
+>
+> ```
+> dokku ps:rebuild APP
+> ```
+>
+> Please see the [images documentation](/dokku/deployment/methods/images/) and [tar documentation](/dokku/deployment/methods/tar/)
+> for instructions on rebuilding applications deployed by those plugins.
+
 ### Upgrade From Source

-If you installed dokku from source (less common), upgrade with:
+If you installed Dokku from source (less common), upgrade with:

 ```shell
 dokku apps
@@ -45,7 +55,7 @@ sudo DOKKU_BRANCH=master make install

 # upgrade to debian package-based installation
 sudo make install
-dokku ps:rebuildall # restart all applications
+dokku ps:rebuildall # rebuilds all applications
 ```

 To upgrade herokuish from source, upgrade with:
--- a/docs/home.html
+++ b/docs/home.html
@@ -7,33 +7,33 @@
    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
    <meta name="description" content="">
    <meta name="author" content="">
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400.7.1" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:400.7.2" rel="stylesheet" type="text/css">
    <title>Dokku - The smallest PaaS implementation you've ever seen</title>

-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/favicon.ico">
    <meta name="apple-mobile-web-app-title" content="Dokku">
    <meta name="application-name" content="Dokku">
    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
    <style>
    </style>
@@ -62,6 +62,9 @@
              <li class="nav-item">
                <a class="nav-link" href="https://glider-slackin.herokuapp.com/">Slack</a>
              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="https://gliderlabs.us10.list-manage.com/subscribe?u=49c4b06ffd30bcf49ec53c277&amp;id=f526006fd5">Newsletter</a>
+              </li>
            </ul>
          </div>
        </div>
@@ -95,12 +98,12 @@
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.7.1/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.7.2/bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.7.1 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.7.2 bash bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
--- a/docs/template.html
+++ b/docs/template.html
@@ -10,26 +10,26 @@
    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400:sans-serif|Open+Sans:400:sans-serif" rel="stylesheet" type="text/css">
    <title>Dokku - The smallest PaaS implementation you've ever seen</title>

-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/favicon.ico">
    <meta name="apple-mobile-web-app-title" content="Dokku">
    <meta name="application-name" content="Dokku">
    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <script>
@@ -43,7 +43,7 @@
    </script>

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.2/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
    <style>
@@ -164,6 +164,9 @@
              <li class="nav-item">
                <a class="nav-link" href="https://glider-slackin.herokuapp.com/">Slack</a>
              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="https://gliderlabs.us10.list-manage.com/subscribe?u=49c4b06ffd30bcf49ec53c277&amp;id=f526006fd5">Newsletter</a>
+              </li>
            </ul>
          </div>
        </div>
--- a/docs/viewdocs.json
+++ b/docs/viewdocs.json
@@ -1,10 +1,10 @@
 {
  "redirects": {
-    "advanced-installation": "getting-started/advanced-installation",
-    "troubleshooting": "getting-started/troubleshooting",
-    "upgrading": "getting-started/upgrading",
+    "advanced-installation": "getting-started/advanced-installation/",
+    "troubleshooting": "getting-started/troubleshooting/",
+    "upgrading": "getting-started/upgrading/",

-    "application-deployment": "deployment/application-deployment",
+    "application-deployment": "deployment/application-deployment/",
    "checks-examples": "deployment/zero-downtime-deploys/",
    "process-management": "deployment/process-management/",
    "remote-commands": "deployment/remote-commands/",
@@ -19,6 +19,7 @@

    "backup-recovery": "advanced-usage/backup-recovery/",
    "deployment-tasks": "advanced-usage/deployment-tasks/",
+    "deployment/deployment-tasks": "advanced-usage/deployment-tasks/",
    "docker-options": "advanced-usage/docker-options/",
    "dokku-events-logs": "advanced-usage/event-logs/",
    "dokku-storage": "advanced-usage/persistent-storage/",
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -222,6 +222,11 @@ is_image_herokuish_based() {
  docker run "$DOKKU_GLOBAL_RUN_ARGS" --entrypoint="/bin/sh" $DOCKER_ARGS "$@" -c "test -f /exec" &> /dev/null
 }

+get_docker_version() {
+  CLIENT_VERSION_STRING="$(docker version -f="{{ .Client.Version }}")"
+  echo "$CLIENT_VERSION_STRING"
+}
+
 is_number() {
  declare desc="returns 0 if input is a number"
  local NUMBER=$1; local NUM_RE='^[0-9]+$'
@@ -560,7 +565,7 @@ dokku_deploy_cmd() {

      # start the app
      local DOCKER_ARGS="$DOKKU_DEFAULT_DOCKER_ARGS"
-      local DOCKER_ARGS+=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' "
+      local DOCKER_ARGS+=" -e DYNO=$PROC_TYPE.$CONTAINER_INDEX "
      [[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "

      [[ -n "$DOKKU_HEROKUISH" ]] && local START_CMD="/start $PROC_TYPE"
@@ -1039,7 +1044,7 @@ get_json_value() {
  local JSON_NODE="$1"
  local JSON_NODE=${JSON_NODE//\./\"][\"}
  local JSON_NODE="[\"${JSON_NODE}\"]"
-  cat | python -c 'import json,sys;obj=json.load(sys.stdin);print json.dumps(obj'"${JSON_NODE}"').strip("\"")';
+  cat | python2 -c 'import json,sys;obj=json.load(sys.stdin);print json.dumps(obj'"${JSON_NODE}"').strip("\"")';
 }

 get_json_keys() {
@@ -1049,9 +1054,9 @@ get_json_keys() {
  local JSON_NODE=${JSON_NODE//\./\"][\"}
  local JSON_NODE="[\"${JSON_NODE}\"]"
  if [[ "$JSON_NODE" == "[\"\"]" ]]; then
-    cat | python -c 'import json,sys;obj=json.load(sys.stdin);print " ".join(obj.keys())';
+    cat | python2 -c 'import json,sys;obj=json.load(sys.stdin);print " ".join(obj.keys())';
  else
-    cat | python -c 'import json,sys;obj=json.load(sys.stdin);print " ".join(obj'"${JSON_NODE}"'.keys())';
+    cat | python2 -c 'import json,sys;obj=json.load(sys.stdin);print " ".join(obj'"${JSON_NODE}"'.keys())';
  fi
 }

--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -8,13 +8,13 @@ case "$1" in
      declare desc="return domains plugin help content"
      cat<<help_content
    domains [<app>], List domains
-    domains:add <app> DOMAIN, Add a domain to app
-    domains:add-global DOMAIN, Add global domain name
+    domains:add <app> <domain> [<domain> ...], Add domains to app
+    domains:add-global <domain> [<domain> ...], Add global domain names
    domains:clear <app>, Clear all domains for app
    domains:disable <app>, Disable VHOST support
    domains:enable <app>, Enable VHOST support
-    domains:remove <app> DOMAIN, Remove a domain from app
-    domains:remove-global DOMAIN, Remove global domain name
+    domains:remove <app> <domain> [<domain> ...], Remove domains from app
+    domains:remove-global <domain> [<domain> ...], Remove global domain names
 help_content
    }

--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/domains/subcommands/add
+++ b/plugins/domains/subcommands/add
@@ -4,15 +4,11 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/domains/functions"

 domains_add_cmd() {
-  declare desc="adds domain to app via command line"
+  declare desc="adds domains to app via command line"
  local cmd="domains:add"
  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+  [[ -z $3 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 $2 <domain> [<domain> ...]"

-  if [[ -z "${*:3}" ]]; then
-    echo "Usage: dokku $1 $2 DOMAIN [DOMAIN ...]"
-    echo "Must specify DOMAIN."
-    exit 1
-  fi
  shift 1
  domains_add "$@"
 }
--- a/plugins/domains/subcommands/add-global
+++ b/plugins/domains/subcommands/add-global
@@ -4,9 +4,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/domains/functions"

 domains_add_global_cmd() {
-  declare desc="add global domain name via command line"
+  declare desc="add global domain names via command line"
  local cmd="domains:add-global"
-  [[ -z $2 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 DOMAIN [DOMAIN ...]"
+  [[ -z $2 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 <domain> [<domain> ...]"

  shift 1
  domains_add_global "$@"
--- a/plugins/domains/subcommands/remove
+++ b/plugins/domains/subcommands/remove
@@ -7,12 +7,7 @@ domains_remove_cmd() {
  declare desc="removes domains from app via command line"
  local cmd="domains:remove"
  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-
-  if [[ -z "${*:3}" ]]; then
-    echo "Usage: dokku $1 $2 DOMAIN [DOMAIN ...]"
-    echo "Must specify DOMAIN."
-    exit 1
-  fi
+  [[ -z $3 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 $2 <domain> [<domain> ...]"

  shift 1
  domains_remove "$@"
--- a/plugins/domains/subcommands/remove-global
+++ b/plugins/domains/subcommands/remove-global
@@ -4,9 +4,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/domains/functions"

 domains_remove_global_cmd() {
-  declare desc="remove global domain name via command line"
+  declare desc="remove global domain names via command line"
  local cmd="domains:remove-global"
-  [[ -z $2 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 DOMAIN [DOMAIN ...]"
+  [[ -z $2 ]] && dokku_log_fail "Please specify a domain name. Usage: dokku $1 <domain> [<domain> ...]"

  shift 1
  domains_remove_global "$@"
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/named-containers/plugin.toml
+++ b/plugins/named-containers/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core named containers plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/ps/commands
+++ b/plugins/ps/commands
@@ -8,11 +8,11 @@ case "$1" in
      declare desc="return ps plugin help content"
      cat<<help_content
    ps <app>, List processes running in app container(s)
-    ps:scale [<app> <proc>=<count> [<proc>=<count>]], Get/Set how many instances of a given process to run
+    ps:scale <app> <proc>=<count> [<proc>=<count>...], Get/Set how many instances of a given process to run
    ps:start <app>, Start app container(s)
    ps:stop <app>, Stop app container(s)
-    ps:rebuild <app>, Rebuild an app
-    ps:rebuildall, Rebuild all apps
+    ps:rebuild <app>, Rebuild an app from source
+    ps:rebuildall, Rebuild all apps from source
    ps:restart <app>, Restart app container(s)
    ps:restartall, Restart all deployed app containers
    ps:restore, Start previously running apps e.g. after reboot
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/ps/subcommands/rebuild
+++ b/plugins/ps/subcommands/rebuild
@@ -4,7 +4,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"

 ps_rebuild_cmd() {
-  declare desc="rebuilds app via command line"
+  declare desc="rebuilds an app from source"
  local cmd="ps:rebuild"
  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
  ps_rebuild "$2"
--- a/plugins/ps/subcommands/rebuildall
+++ b/plugins/ps/subcommands/rebuildall
@@ -4,7 +4,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"

 ps_rebuildall_cmd() {
-  declare desc="rebuilds all deployed apps via command line"
+  declare desc="rebuilds all apps from source"
  local cmd="ps:rebuildall"
  for app in $(dokku_apps); do
    (is_deployed "$app") && ps_rebuild "$app"
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/tags/functions
+++ b/plugins/tags/functions
@@ -2,7 +2,23 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"

+is_tag_force_available() {
+  CLIENT_VERSION_STRING="$(get_docker_version)"
+  MAJOR_VERSION=$(echo "$CLIENT_VERSION_STRING" | awk '{split($0,a,"."); print a[1]}')
+  MINOR_VERSION=$(echo "$CLIENT_VERSION_STRING" | awk '{split($0,a,"."); print a[2]}')
+  PATCH_VERSION=$(echo "$CLIENT_VERSION_STRING" | awk '{split($0,a,"."); print a[3]}')
+
+  # docker tag -f was dropped in 1.12.0
+  if [[ "$MAJOR_VERSION" -ge 1 ]] && [[ "$MINOR_VERSION" -ge 12 ]]; then
+    return 1
+  else
+    return 0
+  fi
+}
+
 tag_image() {
  declare desc="convenience method for docker tag interface"
-  docker tag -f "$1" "$2"
+  [[ $(is_tag_force_available) ]] && TAG_OPTS="-f"
+  # shellcheck disable=SC2086
+  docker tag $TAG_OPTS "$1" "$2"
 }
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.7.1"
+version = "0.7.2"
 [plugin.config]
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -29,25 +29,46 @@ teardown() {
  echo "output: "$output
  echo "status: "$status
  assert_success
+
  run dokku domains:add $TEST_APP test.app.dokku.me
  echo "output: "$output
  echo "status: "$status
  assert_success
+
  run dokku domains:add $TEST_APP 2.app.dokku.me
  echo "output: "$output
  echo "status: "$status
  assert_success
+
  run dokku domains:add $TEST_APP a--domain.with--hyphens
  echo "output: "$output
  echo "status: "$status
  assert_success
-}

-@test "(domains) domains:add (multiple)" {
-  run dokku domains:add $TEST_APP 2.app.dokku.me www.test.app.dokku.me test.app.dokku.me
+  run dokku domains $TEST_APP
  echo "output: "$output
  echo "status: "$status
  assert_success
+  assert_line www.test.app.dokku.me
+  assert_line test.app.dokku.me
+  assert_line 2.app.dokku.me
+  assert_line a--domain.with--hyphens
+}
+
+@test "(domains) domains:add (multiple)" {
+  run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me a--domain.with--hyphens
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run dokku domains $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  assert_line www.test.app.dokku.me
+  assert_line test.app.dokku.me
+  assert_line 2.app.dokku.me
+  assert_line a--domain.with--hyphens
 }

@test "(domains) domains:add (duplicate)" {
@@ -74,10 +95,37 @@ teardown() {
  echo "output: "$output
  echo "status: "$status
  assert_success
+
  run dokku domains:remove $TEST_APP test.app.dokku.me
  echo "output: "$output
  echo "status: "$status
-  refute_line "test.app.dokku.me"
+  assert_success
+
+  run dokku domains $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  refute_line test.app.dokku.me
+}
+
+@test "(domains) domains:remove (multiple)" {
+  run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run dokku domains:remove $TEST_APP www.test.app.dokku.me test.app.dokku.me
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run dokku domains $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  refute_line www.test.app.dokku.me
+  refute_line test.app.dokku.me
+  assert_line 2.app.dokku.me
 }

@test "(domains) domains:remove (wildcard domain)" {
@@ -85,10 +133,17 @@ teardown() {
  echo "output: "$output
  echo "status: "$status
  assert_success
+
  run dokku domains:remove $TEST_APP *.dokku.me
  echo "output: "$output
  echo "status: "$status
-  refute_line "*.dokku.me"
+  assert_success
+
+  run dokku domains $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  refute_line *.dokku.me
 }

@test "(domains) domains:clear" {
@@ -96,10 +151,17 @@ teardown() {
  echo "output: "$output
  echo "status: "$status
  assert_success
+
  run dokku domains:clear $TEST_APP
  echo "output: "$output
  echo "status: "$status
  assert_success
+
+  run dokku domains $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  refute_line test.app.dokku.me
 }

@test "(domains) domains:add-global" {
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	c4622a8255	Release 0.7.2	2016-09-25 02:15:30 -06:00
Jose Diaz-Gonzalez	c31133687c	Fix plugin link [ci skip]	2016-09-25 01:59:39 -06:00
Jose Diaz-Gonzalez	9be1f21e5f	Update gitignore	2016-09-25 01:57:33 -06:00
Jose Diaz-Gonzalez	1b3b7175cc	Merge pull request #2426 from dokku/2425_mh-tag-force-option add force option on docker tag when available. closes #2425	2016-09-25 01:55:43 -06:00
Jose Diaz-Gonzalez	e739138ab5	Merge pull request #2431 from dokku/josegonzalez-patch-1 Add missing redirect for deployment/deployment-tasks	2016-09-25 01:39:54 -06:00
Jose Diaz-Gonzalez	f00930224e	Add missing redirect for deployment/deployment-tasks Closes #2430 [ci skip]	2016-09-25 01:39:36 -06:00
Jose Diaz-Gonzalez	16372845a8	Merge pull request #2429 from enisozgen/patch-1 Patch 1	2016-09-24 03:25:09 -06:00
Enis Özgen	02cde31efb	Deleted duplicate line line 101	2016-09-24 12:06:10 +03:00
Enis Özgen	d6205bff14	fix typo initialised to initialized	2016-09-24 11:56:46 +03:00
Jose Diaz-Gonzalez	aacfcbcb3e	Merge pull request #2410 from IlyaSemenov/domains-help-tests Clarify domains help, improve domains unit tests	2016-09-22 12:41:16 -06:00
Jose Diaz-Gonzalez	990431be3d	Merge pull request #2416 from njaxx/patch-1 Adds a mention of manually adding nginx entry	2016-09-22 12:40:44 -06:00
Michael Hobbs	ef2bbc60df	add force option on docker tag when available. closes #2425	2016-09-22 09:33:20 -07:00
Jose Diaz-Gonzalez	e5eb99276f	Merge pull request #2423 from dokku/mh-update-herokuish update to herokuish 0.3.19	2016-09-20 21:41:07 -06:00
Michael Hobbs	11f618d30c	[ci skip] update to herokuish 0.3.19	2016-09-20 10:23:29 -07:00
Jose Diaz-Gonzalez	5b4b608a5d	Merge pull request #2420 from c990802/patch-1 Documentation: Update command example for consistency	2016-09-19 09:36:48 -06:00
Isaac Mayolas	1106212f18	Update command for consistency Throughout the docs the app named `node-js-app` is used. An alternative app name, named `api` was used in this example. I propose an update for consistency.	2016-09-19 14:29:51 +02:00
Michael Hobbs	eb8afc4f34	Merge pull request #2418 from dokku/mh-plugn-0.2.2 use plugn 0.2.2	2016-09-16 11:00:08 -07:00
Michael Hobbs	9fdfb07c9b	use plugn 0.2.2	2016-09-16 10:51:45 -07:00
Jose Diaz-Gonzalez	5d4a9f9d6d	Merge pull request #2409 from dokku/2374-document-ps-rebuild-caveats Document caveats around ps:rebuild and tags/tar deployed applications…	2016-09-16 09:07:09 -06:00
Jose Diaz-Gonzalez	6f68943c94	Merge pull request #2417 from PWAckerman/DYNO_environment_variable Fixed double quotations in 'plugins/common/functions' dokku_deploy_cm…	2016-09-16 09:06:53 -06:00
PWAckerman	da2d00cf46	Fixed double quotations in 'plugins/common/functions' dokku_deploy_cmdwhere DYNO environment variable is set	2016-09-15 17:11:20 -04:00
njaxx	d26f8941bb	Adds a mention of manually adding nginx entry I was working on a Dockerfile deploy that was setup to listen on port 8844. I wanted to add ssl and couldn't figure out why adding the ssl cert didn't making things 'just work'. Since the `proxy:ports-add` step I discuss in this commit is run both `under the hood` and `sometimes`, I thought it might be worth issuing a PR for.	2016-09-14 15:18:54 -05:00
Ilya Semenov	9265bd8e37	Unified help texts and descriptions for domains add and remove commands	2016-09-08 13:21:30 +07:00
Jose Diaz-Gonzalez	d654c75a6b	Add missing space [ci skip]	2016-09-07 10:29:23 -04:00
Ilya Semenov	45f05615c4	Clarify domains help, improve domains unit tests	2016-09-07 20:28:32 +07:00
Jose Diaz-Gonzalez	7ccfdabc48	Document caveats around ps:rebuild and tags/tar deployed applications. Closes #2374 The tags and tar plugins do not necessarily build from source, and running `ps:rebuild` can have some unexpected output in certain cases. Rather than try to handle that complexity - it's a lot - documenting the edge cases is the most appropriate way forward.	2016-09-06 20:26:53 -04:00
Jose Diaz-Gonzalez	c3f39fe512	Merge pull request #2408 from jcscottiii/patch-1 Use $DOKKU_VHOST_ENABLE instead of $VHOST_ENABLE	2016-09-05 17:08:30 -04:00
James C Scott III	07786f5a15	Use $DOKKU_VHOST_ENABLE instead of $VHOST_ENABLE Given a user wants to manually override the `vhost_enable` debian config, a user has to specify both $DOKKU_VHOST_ENABLE and $VHOST_ENABLE. This patch makes it rely on $DOKKU_VHOST_ENABLE like the others which use the `$DOKKU_` prefix	2016-09-05 14:54:52 -04:00
Jose Diaz-Gonzalez	0841888b67	Merge pull request #2405 from dokku/doc-cleanup Doc cleanup	2016-09-03 15:53:14 -04:00
Jose Diaz-Gonzalez	344162da5e	Clarify that the key_file is a path [ci skip]	2016-09-03 15:51:47 -04:00
Jose Diaz-Gonzalez	e6b9283a6a	Update attribution for plugins [ci skip]	2016-09-03 15:51:35 -04:00
Jose Diaz-Gonzalez	5002f46bb8	Change ownership of plugins from heichblatt to josegonzalez [ci skip]	2016-09-03 15:51:35 -04:00
Jose Diaz-Gonzalez	f7c00d06ca	Add newsletter link to template. Closes #2373 [ci skip]	2016-09-03 15:51:35 -04:00
Jose Diaz-Gonzalez	7ac284bdb6	Document all commands under the ps plugin	2016-09-03 15:51:35 -04:00
Jose Diaz-Gonzalez	54708637cd	Expand ssh-keys documentation to further explain command usage	2016-09-03 15:51:35 -04:00
Jose Diaz-Gonzalez	e3df81f020	Fix section headers [ci skip]	2016-09-03 15:51:35 -04:00
Jose Diaz-Gonzalez	f26b3f1966	Use correct casing for Dokku name lowercase should only be used to refer to the binary, not the project	2016-09-03 15:51:14 -04:00
Jose Diaz-Gonzalez	7cfeb090ed	Merge pull request #2404 from bascht/patch-1 Fix docker build syntax	2016-09-03 13:04:20 -04:00
Bascht	6171cc881b	Fix docker build syntax Docker build expects both tag name and build directory as arguments.	2016-09-03 17:52:05 +02:00
Michael Hobbs	befb5a0dd9	[ci skip] docs: update arguments for check-deploy	2016-08-31 14:21:28 -07:00
Jose Diaz-Gonzalez	c731480360	Mark graphite plugin as beta [ci skip]	2016-08-27 18:38:43 -04:00
Jose Diaz-Gonzalez	be8853e01f	Merge pull request #2398 from dokku/josegonzalez-patch-1 Update compatibility of "other plugins"	2016-08-27 18:14:42 -04:00
Jose Diaz-Gonzalez	1243e50c6d	Update compatibility of "other plugins" Also deprecate/mark some as unmaintained [ci skip]	2016-08-27 18:14:33 -04:00
Jose Diaz-Gonzalez	3acf446f2b	Merge pull request #2397 from dokku/josegonzalez-patch-1 Update compatibility of dokku feature plugin	2016-08-27 18:02:17 -04:00
Jose Diaz-Gonzalez	d498177cdc	Update compatibility of dokku feature plugin Also move other plugins to deprecated/unmaintained sections [ci skip]	2016-08-27 18:01:17 -04:00
Jose Diaz-Gonzalez	e642a4eb85	Move note down [ci skip]	2016-08-27 17:53:25 -04:00
Jose Diaz-Gonzalez	d60a58ffdd	Merge pull request #2396 from dokku/josegonzalez-patch-1 Deprecate multi-buildpack plugin	2016-08-27 17:52:14 -04:00
Jose Diaz-Gonzalez	3bbb3f22a8	Deprecate multi-buildpack plugin This is handled by the core via herokuish. [ci skip]	2016-08-27 17:52:04 -04:00
Jose Diaz-Gonzalez	3a1335dd2d	Merge pull request #2395 from dokku/josegonzalez-patch-1 Deprecate sekjun9878/redis	2016-08-27 17:47:58 -04:00
Jose Diaz-Gonzalez	4bdbb54573	Deprecate sekjun9878/redis [ci skip]	2016-08-27 17:47:50 -04:00
Jose Diaz-Gonzalez	45d9d7f951	Merge pull request #2394 from dokku/josegonzalez-patch-1 Deprecate old graphite plugin and add official graphite plugin	2016-08-27 17:38:26 -04:00
Jose Diaz-Gonzalez	9d3f9f55f7	Deprecate old graphite plugin and add official graphite plugin [ci skip]	2016-08-27 17:38:16 -04:00
Jose Diaz-Gonzalez	e8fc4dc2e3	Update plugins.md	2016-08-27 17:34:41 -04:00
Jose Diaz-Gonzalez	5fe1b5b34b	Merge pull request #2393 from dokku/jg-deprecate-process-managers Deprecate all process manager plugins	2016-08-27 17:31:44 -04:00
Jose Diaz-Gonzalez	03c2218b88	Deprecate all process manager plugins All process manager functionality has been merged into the Dokku core: - v0.3.14: `ps` plugin to manage process scaling - v0.7.0: restart-policy handling by the ps plugin Users are encouraged to stop installing old process managers and use the core functionality. [ci skip]	2016-08-27 17:31:31 -04:00
Jose Diaz-Gonzalez	35dca5570f	Merge pull request #2392 from swg/patch-1 Use python2 in functions/get_json_*	2016-08-27 00:00:35 -04:00
swg	8f9c003a9f	Use python2 in functions/get_json_* On hosts where python3 is the system default python env, Dokku will silently fail to return the values of json keys.	2016-08-26 22:54:04 -04:00