Fix counters, detailed messages and comments#312

alfsb wants to merge 2 commits into

php:masterphp/doc-base:masterfrom

alfsb:masteralfsb/doc-base:masterCopy head branch name to clipboard