Summary: Documentation has drifted out of date with updated plan. This brings the core parts into line.

Reviewed By: yfeldblum

Differential Revision: D9833211

fbshipit-source-id: b372f9cfc0c787feab86490beeb1dcaa290e8566