Merge "Update shell documentation for the current state of master."