Revert "Note changes 3"

This reverts commit 6efaa70aba76d59fa361a06e1334a2bb96594f76.
Revert "Index note change 2"

This reverts commit 10f2321ad3ff5f6bcebfab793f789e2a70c7fe24.
Revert "Index note change"

This reverts commit f3750028973b73e808e1441ce3cb3dca0e053bad.
Doc and note changes (integrated)

Repetitive changes confusing... This is a tidy-up commit.
Merge remote-tracking branch 'upstream/master'