Restore the descriptions to conform with the rest of the

documentation.  We'll work on better documents after the release of
0.9.6.