Merge "docs: editorial revisions to Search guide" into froyo