Adopted 2 changeset n

Item 2 from google doc: Change Set N
Was agreed to adopt.

This adds the new options, and also adds them to the syntax and example.