Merge branch 'stable-2.13'

* stable-2.13:
  Update 2.13 release notes
  Fix various typos, spelling mistakes, and inconsistencies
  Update 2.13 release notes
  Default to disabled when gitweb.type is not specified

Adjust RevisionIT due to changed default of gitweb type now resulting
in no weblinks.

Change-Id: Iccbd38413be1b16bfb2537cba4560dd88422be2c

Documentation/cmd-plugin-install.txt

@@ -50,7 +50,7 @@ Install a plugin from an absolute file path on the server's host:
 	  $(pwd)/my-plugin.jar
 ----
 
-Install a WebUi plugin from an absolute file path on the server's host:
+Install a WebUI plugin from an absolute file path on the server's host:
 
 ----
   ssh -p 29418 localhost gerrit plugin install -n name.js \

Documentation/config-gerrit.txt

@@ -530,7 +530,7 @@ future lookup.  This local disk cache is used to retain potentially
 expensive to compute information across restarts.  If the location
 does not exist, Gerrit will try to create it.
 +
-Tehnically, cached entities are persisted as a set of H2 databases
+Technically, cached entities are persisted as a set of H2 databases
 inside this directory.
 +
 If not absolute, the path is resolved relative to `$site_path`.
@@ -1030,7 +1030,7 @@ Defaults to "Submit whole topic"
 
 [[change.submitTopicTooltip]]change.submitTopicTooltip::
 +
-If `change.submitWholeTopic` is configuerd to true and a change has a
+If `change.submitWholeTopic` is configured to true and a change has a
 topic, this configuration determines the tooltip for the submit button
 instead of `change.submitTooltip`. The variable `${topicSize}` is available
 for the number of changes in the same topic to be submitted. The number of
@@ -1975,10 +1975,12 @@ For example, "?p=$project.git;h=$commit".
 [[gitweb.type]]gitweb.type::
 +
 Optional type of affiliated gitweb service. This allows using
-alternatives to gitweb, such as cgit. If set to disabled there
+alternatives to gitweb, such as cgit.
-is no gitweb hyperlinking support.
 +
 Valid values are `gitweb`, `cgit`, `disabled` or `custom`.
++
+If not set, or set to `disabled`, there is no gitweb hyperlinking
+support.
 
 [[gitweb.revision]]gitweb.revision::
 +

Documentation/config-mail.txt

@@ -64,7 +64,7 @@ and `ChangeFooter.vm`.
 
 === DeleteReviewer.vm
 
-The `DeleteReiewer.vm` template will determine the contents of the email related
+The `DeleteReviewer.vm` template will determine the contents of the email related
 to a user removing a reviewer (with a vote) from a change.  It is a
 `ChangeEmail`: see `ChangeSubject.vm` and `ChangeFooter.vm`.
 

Documentation/config-plugins.txt

@@ -207,7 +207,7 @@ This plugin allows to display a static info message on the change screen.
 link:https://gerrit-review.googlesource.com/#/admin/projects/plugins/changemessage[
 Project] |
 link:https://gerrit.googlesource.com/plugins/changemessage/+doc/master/src/main/resources/Documentation/about.md[
-Plugin Documenatation] |
+Plugin Documentation] |
 link:https://gerrit.googlesource.com/plugins/changemessage/+doc/master/src/main/resources/Documentation/config.md[
 Configuration]
 
@@ -657,7 +657,7 @@ Configuration]
 === websession-flatfile
 
 This plugin replaces the built-in Gerrit H2 based websession cache with
-a flatfile based implementation. This implemantation is shareable
+a flatfile based implementation. This implementation is shareable
 amongst multiple Gerrit servers, making it useful for multi-master
 Gerrit installations.
 

Documentation/database-setup.txt

@@ -39,7 +39,7 @@ This option is more complicated than the H2 option but is recommended
 for larger installations. It's the database backend with the largest userbase
 in the Gerrit community.
 
-Create a user for the web application within Postgres, assign it a
+Create a user for the web application within PostgreSQL, assign it a
 password, create a database to store the metadata, and grant the user
 full rights on the newly created database:
 

Documentation/dev-buck.txt

@@ -635,7 +635,7 @@ The following tests should be executed, when Buck version is upgraded:
 [known bug](https://github.com/facebook/buck/issues/341) related to
 symbolic links. The symbolic links are used very often with external
 plugins, that are linked per symbolic link to the plugins directory.
-With this use case Buck is failing to rebuild the plugin artefact
+With this use case Buck is failing to rebuild the plugin artifact
 after it was built. All attempts to convince Buck to rebuild will fail.
 The only known way to recover is to weep out `buck-out` directory. The
 better workaround is to avoid using Watchman in this specific use case.

Documentation/dev-contributing.txt

@@ -183,7 +183,7 @@ When to use `final` modifier and when not (in new code):
 Always:
 
   * final fields: marking fields as final forces them to be
-  initialised in the constructor or at declaration
+  initialized in the constructor or at declaration
   * final static fields: clearly communicates the intent
   * to use final variables in inner anonymous classes
 

Documentation/dev-plugins.txt

@@ -457,7 +457,7 @@ class MyPlugin {
 Plugins which define new Events should register them via the
 `com.google.gerrit.server.events.EventTypes.registerClass()`
 method. This will make the EventType known to the system.
-Deserialzing events with the
+Deserializing events with the
 `com.google.gerrit.server.events.EventDeserializer` class requires
 that the event be registered in EventTypes.
 
@@ -657,7 +657,7 @@ The search operator itself is implemented by ensuring that the
 `create()` method of the class implementing the
 `ChangeQueryBuilder.ChangeOperatorFactory` interface returns a
 `Predicate<ChangeData>`.  Here is a sample operator factory
-defintion which creates a `MyPredicate`:
+definition which creates a `MyPredicate`:
 
 [source,java]
 ----
@@ -1394,7 +1394,7 @@ capability check is done during the `UiAction` gathering, so the plugin author
 doesn't have to set `UiAction.Description.setVisible()` explicitly in this
 case.
 
-The following prerequisities must be met, to satisfy the capability check:
+The following prerequisites must be met, to satisfy the capability check:
 
 * user is authenticated
 * user is a member of a group which has the `Administrate Server` capability, or

Documentation/dev-stars.txt

@@ -29,8 +29,8 @@ returned by the link:rest-api-changes.html[changes REST API].
 There are link:rest-api-accounts.html#default-star-endpoints[
 additional REST endpoints] for the link:#default-star[default star].
 
-Only the link:#default-star[default star] is shown in the WebUi and
+Only the link:#default-star[default star] is shown in the WebUI and
-can be updated from there. Other stars do not show up in the WebUi.
+can be updated from there. Other stars do not show up in the WebUI.
 
 [[default-star]]
 == Default Star

Documentation/intro-project-owner.txt

@@ -652,7 +652,7 @@ extension points, e.g. plugins can
 How to develop a Gerrit plugin is described in the link:dev-plugins.html[
 Plugin Development] section.
 
-[[prject-lifecycle]]
+[[project-lifecycle]]
 == Project Lifecycle
 
 [[project-creation]]

Documentation/intro-user.txt

@@ -596,7 +596,7 @@ lists and dashboards are visualized.
 ** `None`:
 +
 For each review label only the voting value is shown. Approvals are
-rendered as a green check mark icon, vetos as a red X icon.
+rendered as a green check mark icon, vetoes as a red X icon.
 +
 ** `Show Name`:
 +

Documentation/rest-api-changes.txt

@@ -5319,8 +5319,8 @@ whose behalf the action should be done. To use this option the caller must
 have been granted both `Submit` and `Submit (On Behalf Of)` permissions.
 The user named by `on_behalf_of` does not need to be granted the `Submit`
 permission. This feature is aimed for CI solutions: the CI account can be
-granted both permssions, so individual users don't need `Submit` permission
+granted both permissions, so individual users don't need `Submit` permission
-themselves. Still the changes can be submited on behalf of real users and
+themselves. Still the changes can be submitted on behalf of real users and
 not with the identity of the CI account.
 |==========================
 

Documentation/rest-api-config.txt

@@ -1583,7 +1583,7 @@ Information about the configuration from the
 link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[
 GerritInfo] entity.
 |`note_db_enabled`         |not set if `false`|
-Whether the NoteDB storage backend is fully enabled.
+Whether the NoteDb storage backend is fully enabled.
 |`plugin `                 ||
 Information about Gerrit extensions by plugins as
 link:#plugin-config-info[PluginConfigInfo] entity.

Documentation/user-inline-edit.txt

@@ -173,7 +173,7 @@ in context of change edit, this is not the best workflow to open one file in edi
 change it, save it, close edit screen and select next file from the file table to edit.
 "<-" | "->" icons in header of edit screen could be used to navigate to the next file to
 change from the file table. This would behave like the navigation icons in side by side
-with thefollowing logic on click:
+with the following logic on click:
 
 ** "save-when-file-was-changed" or
 ** "close-when-no-changes"

ReleaseNotes/ReleaseNotes-2.13.txt

@@ -384,9 +384,22 @@ Remove "no changes made" error case
 Prevent creating groups with the same name as a system group.
 
 * link:https://bugs.chromium.org/p/gerrit/issues/detail?id=3754[Issue 3754]:
-Fix `View All Accounts` permission to allow accounts rest endpoint to access
+Fix `View All Accounts` permission to allow accounts REST endpoint to access
 email info.
 
+* Make `gitweb.type` default to `disabled` when not explicitly set.
++
+Previously the behavior was not documented and it would default to type
+`gitweb`. In cases where there was no gitweb config at all, this would
+result in broken links due to `null` being used as the URL.
+
+* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4488[Issue 4488]:
+Improve error message when Change-Id line is missing in commit message.
++
+The error message now includes the sha1 of the commit, so that it is
+easier to track down which commit failed validation when multiple commits
+are pushed at the same time.
+
 == Dependency updates
 
 * Add dependency on blame-cache 0.1-9

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java

@@ -900,7 +900,7 @@ public class RevisionIT extends AbstractDaemonTest {
             : "text/plain");
     assertThat(diff.metaB.lines).isEqualTo(expectedLines.size());
     assertThat(diff.metaB.name).isEqualTo(path);
-    assertThat(diff.metaB.webLinks).isNotNull();
+    assertThat(diff.metaB.webLinks).isNull();
 
     assertThat(diff.content).hasSize(1);
     DiffInfo.ContentEntry contentEntry = diff.content.get(0);

gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebConfig.java

@@ -143,7 +143,6 @@ public class GitwebConfig {
   private static GitwebType defaultType(String typeName) {
     GitwebType type = new GitwebType();
     switch (nullToEmpty(typeName)) {
-      case "":
       case "gitweb":
         type.setLinkName("gitweb");
         type.setProject("?p=${project}.git;a=summary");
@@ -173,6 +172,7 @@ public class GitwebConfig {
         type.setFile("");
         type.setFileHistory("");
         break;
+      case "":
       case "disabled":
       default:
         return null;