Unbreak doc; the apropos index entry *must* be one line.
merge trunk