logical approach to function parameters for markup
escape the permalink
Update style.css

_s does not support IE6/7 so this is not necessary.
fix for a page title error

The same error as https://core.trac.wordpress.org/ticket/16468
Merge pull request #479 from psoluch/patch-1

Prevent 'Page %s' from being added to page title on 404 error pages.
Merge pull request #473 from sdavis2702/master

_s: Logical approach to function parameters for markup
Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  fix for a page title error
  Update style.css
  escape the permalink
  logical approach to function parameters for markup
Merge remote-tracking branch 'upstream/ja'

* upstream/ja:
  fix for a page title error
  Update style.css
  escape the permalink
  logical approach to function parameters for markup