Documentation update.
Merge branch 'fx-Docs'