Update to r43254:

Rewrite the shell completion section, add ID to shell environment
variables table and use xref instead of hardcoded table number.