Document timeout here, too
Note recent changes