Fix references to old swift use of headers

As noted in the bug, this section was incomplete in the information
it gave about the use of headers and metadata.

patchset2 fixes a spelling error

fixes bug 1071085

Change-Id: If94d7c00dc6483cd2cc88b0292b81ea0c5dd3e0b
Merge "Fix references to old swift use of headers"