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

* commit '630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
  NFC documentation overhaul.