Merge "Improve the Calendar documentation."