Merge "Fix registry/unregistry doc"