diff --git a/docs/assets/style.css b/docs/assets/style.css index 001b5c387..a847990d5 100644 --- a/docs/assets/style.css +++ b/docs/assets/style.css @@ -238,6 +238,10 @@ blockquote { margin-bottom: 30px; } blockquote.new-as-of { + border-left: 4px solid #d1f2a5; + background-color: #effab4; +} +blockquote.not-yet-released { border-left: 4px solid #ef5b58; background-color: #f9ad76; } diff --git a/docs/checks-examples.md b/docs/checks-examples.md index 9177243a4..196b9fab6 100644 --- a/docs/checks-examples.md +++ b/docs/checks-examples.md @@ -1,6 +1,6 @@ # Zero Downtime Deploys -> Plugin management is New as of 0.5.0 +> Plugin management is not yet released and only available in master ``` checks Show zero-downtime status diff --git a/docs/deployment/deployment-tasks.md b/docs/deployment/deployment-tasks.md index c5685100b..a33f39f6e 100644 --- a/docs/deployment/deployment-tasks.md +++ b/docs/deployment/deployment-tasks.md @@ -1,6 +1,6 @@ # Deployment Tasks -> New as of 0.5.0 +> Not yet released and only available in master Sometimes you need to run a command on at deployment time, but before an app is completely deployed. Common use cases include: diff --git a/docs/deployment/dockerfiles.md b/docs/deployment/dockerfiles.md index ab990c1bc..2fa1331f9 100644 --- a/docs/deployment/dockerfiles.md +++ b/docs/deployment/dockerfiles.md @@ -42,7 +42,7 @@ Setting `$DOKKU_DOCKERFILE_CACHE_BUILD` to `true` or `false` will enable or disa ### Procfiles and Multiple Processes -> New as of 0.5.0 +> not yet released and only available in master You can also customize the run command using a `Procfile`, much like you would on Heroku or with a buildpack deployed app. The `Procfile` should contain one or more lines defining [process diff --git a/docs/development/release-process.md b/docs/development/release-process.md index 5a7fd3d78..78f8d6c17 100644 --- a/docs/development/release-process.md +++ b/docs/development/release-process.md @@ -4,6 +4,7 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas To propose a release, the following tasks need to be performed: +- Update all blockquote references of `not yet released and only available in master` to point to release version. - The installable version must be changed in the `contrib/dokku-installer.py` file. - The installable version must be changed in the `debian/control` file. - The installable version must be changed in the `docs/home.html` file diff --git a/docs/dokku-storage.md b/docs/dokku-storage.md index ee7412efc..498cd1df2 100644 --- a/docs/dokku-storage.md +++ b/docs/dokku-storage.md @@ -1,6 +1,6 @@ # Dokku Core Storage Plugin -> New as of 0.5.0 +> not yet released and only available in master The preferred method to mount external containers to a dokku managed container, is to use the dokku storage plugin. diff --git a/docs/nginx.md b/docs/nginx.md index 7aaad3b7e..8f7296d06 100644 --- a/docs/nginx.md +++ b/docs/nginx.md @@ -10,7 +10,7 @@ nginx:error-logs [-t] ## Customizing the nginx configuration -> New as of 0.5.0 +> not yet released and only available in master Dokku uses a templating library by the name of [sigil](https://github.com/gliderlabs/sigil) to generate nginx configuration for each app. If you'd like to provide a custom template for your application, there are a couple options: diff --git a/docs/proxy.md b/docs/proxy.md index ae3763734..549a34525 100644 --- a/docs/proxy.md +++ b/docs/proxy.md @@ -1,6 +1,6 @@ # Proxy plugin -> New as of 0.5.0 +> not yet released and only available in master As of dokku 0.5.0, the proxy functionality has been decoupled from the nginx-vhosts plugin into the proxy plugin. In the future this will allow other proxy software (HAproxy for example) to be used instead of nginx. diff --git a/docs/template.html b/docs/template.html index 173f30497..1f530d1f7 100644 --- a/docs/template.html +++ b/docs/template.html @@ -36,6 +36,9 @@ +
@@ -192,6 +202,10 @@
+ +