Add file_markup documentation.
Merge branch 'stable-2.0'