Update API docs, upgrade guide for 2.1