Fix a link.
Fix a typo.
Update link to FHS.
Merge branch 'refs/heads/master' into remove-from-import