Adapted docs to scheme that's implemented.

The new doc reflects what's currently in trunk.