See the attached patch, which is mostly spam.el-related changes to
gnus.texi, plus a small bug fix in gnus-registry.el and the 'imaps'
synonym to 'imap' in nnimap.el.

For the docs, I kept changelog entries as they were originally - same
date, same order (interleaved with others).  For the code, I made a
new changelog entry.

Sorry for the delay, I was on vacation.

Thanks
Ted