README.md in capistrano3-puma-1.2.1 vs README.md in capistrano3-puma-2.0.0

@@ -24,125 +24,99 @@
     require 'capistrano/puma/jungle'  # if you need the jungle tasks
     require 'capistrano/puma/monit'   # if you need the monit tasks
     require 'capistrano/puma/nginx'   # if you want to upload a nginx site template
 ```
 
-then you can use ```cap -vT``` to list tasks
+### Config
+
+To list available tasks use `cap -T`
+
+To upload puma config use:
+```ruby
+cap puma:config 
 ```
-cap puma:nginx_config # upload a nginx site config(eg. /etc/nginx/sites-enabled/)
-cap puma:config  # upload puma config(eg. shared/puma.config)
+By default the file located in  `shared/puma.config`
+
+
+Ensure that `tmp/pids` and ` tmp/sockets log` are shared (via `linked_dirs`):
+
+`This step is mandatory before deploying, otherwise puma server won't start`
+
+### Nginx
+
+To upload a nginx site config (eg. /etc/nginx/sites-enabled/) use:
+```ruby
+cap puma:nginx_config
 ```
-you may want to customize these two templates locally before uploading
+
+To customize these two templates locally before uploading use:
 ```
 rails g capistrano:nginx_puma:config
 ```
 
-if your nginx server configuration is not located in /etc/nginx, you may need to customize nginx_sites_available_path and nginx_sites_enabled_path
-```
+if your nginx server configuration is not located in `/etc/nginx`, you may need to customize:
+```ruby
 set :nginx_sites_available_path, "/etc/nginx/sites-available"
 set :nginx_sites_enabled_path, "/etc/nginx/sites-enabled"
 ```
 
-By default, ```nginx_config``` will be executed with ```:web``` role. But you can assign it to a different role:
-```
+By default, `nginx_config` will be executed with `:web` role. But you can assign it to a different role:
+```ruby
 set :puma_nginx, :foo
 ```
 or define a standalone one:
-```
+```ruby
 role :puma_nginx, %w{[e-mail]}
 ```
 
-Configurable options, shown here with defaults: Please note the configuration options below are not required unless you are trying to override a default setting, for instance if you are deploying on a host on which you do not have sudo or root privileges and you need to restrict the path. These settings go in the deploy.rb file.
+### Jungle
 
-```ruby
-    set :puma_user, fetch(:user)
-    set :puma_rackup, -> { File.join(current_path, 'config.ru') }
-    set :puma_state, "#{shared_path}/tmp/pids/puma.state"
-    set :puma_pid, "#{shared_path}/tmp/pids/puma.pid"
-    set :puma_bind, "unix://#{shared_path}/tmp/sockets/puma.sock"    #accept array for multi-bind
-    set :puma_default_control_app, "unix://#{shared_path}/tmp/sockets/pumactl.sock"
-    set :puma_conf, "#{shared_path}/puma.rb"
-    set :puma_access_log, "#{shared_path}/log/puma_access.log"
-    set :puma_error_log, "#{shared_path}/log/puma_error.log"
-    set :puma_role, :app
-    set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
-    set :puma_threads, [0, 16]
-    set :puma_workers, 0
-    set :puma_worker_timeout, nil
-    set :puma_init_active_record, false
-    set :puma_preload_app, true
-    set :nginx_use_ssl, false
-```
 For Jungle tasks (beta), these options exist:
 ```ruby
     set :puma_jungle_conf, '/etc/puma.conf'
     set :puma_run_path, '/usr/local/bin/run-puma'
 ```
 
+### Multi bind
+
 Multi-bind can be set with an array in the puma_bind variable
 ```ruby
   set :puma_bind, %w(tcp://0.0.0.0:9292 unix:///tmp/puma.sock)
 ```
     * Listening on tcp://0.0.0.0:9220
     * Listening on unix:///tmp/puma.sock
 
+### Active Record
 
 For ActiveRecord the following line to your deploy.rb
 ```ruby
     set :puma_init_active_record, true
 ```
 
-Ensure that the following directories are shared (via ``linked_dirs``):
+### Other configs
 
-    tmp/pids tmp/sockets log
+Configurable options, shown here with defaults: Please note the configuration options below are not required unless you are trying to override a default setting, for instance if you are deploying on a host on which you do not have sudo or root privileges and you need to restrict the path. These settings go in the deploy.rb file.
 
-## Changelog
-- 1.2.0: add support for puma user for puma user @mcb & @seuros
-- 1.1.0: Set :puma_preload_app to false; Reload Monit after uploading any monit configuration; Always refresh Gemfile @rafaelgoulart @suhailpatel @sime
-- 1.0.0: Add activate control app @askagirl
-- 0.8.5: Fix smart_restart task to check if puma preloads app
-- 0.8.4: Allow patch method (Nginx template) @lonre
-- 0.8.2: Start task creates a conf file if none exists @stevemadere
-- 0.8.1: Fixed nginx task @hnatt, support for prune_bundler @behe
-- 0.8.0: Some changes
-- 0.7.0: added Nginx template generator  @dfang
-- 0.6.1: added :puma_default_hooks, you can turn off the automatic hooks by setting it false
-- 0.6.0: Remove `daemonize true` from default puma.rb file. Explicitly pass `--daemon` flag when needed.
-- 0.5.1: Added worker_timeout option
-- 0.5.0: Bugs fixes
-- 0.4.2: Fix monit template to support chruby
-- 0.4.1: Fix puma jungle (debian)
-- 0.4.0: Multi-bind support
-- 0.3.7: Dependency bug fix
-- 0.3.5: Fixed a prehistoric bug
-- 0.3.4: I don't remember what i did here
-- 0.3.3: Puma jungle start fix
-- 0.3.2: Tag option support (require puma  2.8.2+)
-- 0.3.1: Typo fix
-- 0.3.0: Initial support for puma signals
-- 0.2.2: Application pre-loading is optional now (set puma_preload_app to false to turn it off)
-- 0.2.1: Tasks are run within rack context
-- 0.2.0: Support for puma `ActiveRecord::Base.establish_connection` on
-  boot
-- 0.1.3: Capistrano 3.1 support
-- 0.1.2: Gemfile are refreshed between deploys now
-- 0.1.1: Initial support for Monit and configuration override added.
-- 0.1.0: Phased restart will be used if puma is in cluster mode
-- 0.0.9: puma.rb location changed to shared_path root. puma:check moved to after deploy:check
-- 0.0.8: puma.rb is automatically generated if not present. Fixed RVM issue.
-- 0.0.7: Gem pushed to rubygems as capistrano3-puma. Support of Redhat based OS for Jungle init script.
-
-
-## Contributors
-
-- [Ruohan Chen](https://github.com/crhan)
-- [molfar](https://github.com/molfar)
-- [ayaya](https://github.com/ayamomiji)
-- [Shane O'Grady](https://github.com/shaneog)
-- [Jun Lin](https://github.com/linjunpop)
-- [fang duan](https://github.com/dfang)
-- [Steve Madere](https://github.com/stevemadere)
-- [Matias De Santi](https://github.com/mdesanti)
+```ruby
+    set :puma_user, fetch(:user)
+    set :puma_rackup, -> { File.join(current_path, 'config.ru') }
+    set :puma_state, "#{shared_path}/tmp/pids/puma.state"
+    set :puma_pid, "#{shared_path}/tmp/pids/puma.pid"
+    set :puma_bind, "unix://#{shared_path}/tmp/sockets/puma.sock"    #accept array for multi-bind
+    set :puma_default_control_app, "unix://#{shared_path}/tmp/sockets/pumactl.sock"
+    set :puma_conf, "#{shared_path}/puma.rb"
+    set :puma_access_log, "#{shared_path}/log/puma_access.log"
+    set :puma_error_log, "#{shared_path}/log/puma_error.log"
+    set :puma_role, :app
+    set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
+    set :puma_threads, [0, 16]
+    set :puma_workers, 0
+    set :puma_worker_timeout, nil
+    set :puma_init_active_record, false
+    set :puma_preload_app, false
+    set :puma_plugins, []  #accept array of plugins
+    set :nginx_use_ssl, false
+```
 
 ## Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)