Improved shortcode docs
Merge pull request #1948 from chillu/pulls/shortcode-docs

Improved shortcode docs