Merge branch 'master' into 1091_mh-switch-to-herokuish

2015-07-28 10:55:44 -07:00
parent fd187ec837 fd3f84669b
commit d21caa4811
42 changed files with 1024 additions and 390 deletions
--- a/docs/development/pluginhooks.md
+++ b/docs/development/pluginhooks.md
@@ -107,8 +107,8 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 case "$1" in
  help | derp:help)
    cat && cat<<EOF
-    derp:herp                                       Herps the derp
-    derp:serp [file]                                Shows the file's serp
+    derp:herp, Herps the derp
+    derp:serp [file], Shows the file's serp
 EOF
    ;;