Merge "Update documentation so it meets api requirements"