Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Fix various spelling mistakes
  Prolog-Cookbook: tidy up rule status descriptions

Change-Id: I9e2d8b55869f2da7a7e6ff74a6429424dfdc795d

gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java

@@ -32,7 +32,7 @@ public interface ProjectCache {
    * Get the cached data for a project by its unique name.
    *
    * @param projectName name of the project.
-   * @return the cached data; null if no such project exists or a error occured.
+   * @return the cached data; null if no such project exists or a error occurred.
    * @see #checkedGet(com.google.gerrit.reviewdb.client.Project.NameKey)
    */
   public ProjectState get(Project.NameKey projectName);