Replace most user-guide with |filename| links
Rename policy stubs to be consistent
Merge branch 'master' into staging
Don't use html links