They were in synch up until Ben's last big comm it. I'm
really tempted to revert to that version, move the thing to
general-docs, and if Ben wants his changes in, he can check
it for 21.4 compatibility, and reapply.
BTW I try hard to make sure that every FAQ change I produce is correct for
both 21.4 and 21.5.