fix indentation, encode entities

also swap </pre></code> to </code></pre>
so nesting works properly
Merge branch 'waldir-patch-2' into gh-pages

* waldir-patch-2:
  fix indentation, encode entities