Merge "Update docs for clockwait/clocklock functions"