Merge "NFC documentation overhaul." into gingerbread