Minor fixes to wording in FAQ and Portability guidelines
rename guidelines docs to match content