Ahodges/documentation/doc264

@zhkramer , @sarina , @mhoeber , @srpearce please review.