Also reorders a handful entries to make each list sorted
alphabetically.
Signed-off-by: NJunio C Hamano <junkio@cox.net>