Update the headings to fix nesting issues.
Ignore other contents files in HTML contents.
[fr] update headings
Merge pull request #2063 from cakephp/pdf-improvements

PDF improvements