Update cfx doc to include '-o' option; also changes to improve navigability
Merge pull request #994 from wbamberg/852605

Fix for Bug 852605: "document cfx -o"; r=@erikvold