merge of user guide changes from master to 3.x