am 5394ef06: am 630ac8df: Merge "NFC documentation overhaul." into gingerbread

* commit '5394ef0618460dde365942406a6e64229abec7d2':
  NFC documentation overhaul.