Merge branch 'stable-2.8'

* stable-2.8:
  Update the 2.8 release notes with recently merged changes
  Update documentation of the `review` command
  Fixed several spelling mistakes
  Remove deprecated approve SSH alias

Conflicts:
	Documentation/cmd-index.txt

Change-Id: Ieb4708793b0e323dcb2a68a31e59035519ec4af9

Documentation/cmd-index.txt

@@ -54,9 +54,6 @@ see link:user-upload.html#test_ssh[Testing Your SSH Connection].
 link:cmd-apropos.html[gerrit apropos]::
 	Search Gerrit documentation index.
 
-'gerrit approve'::
-	'Deprecated alias for `gerrit review`.'
-
 link:cmd-ban-commit.html[gerrit ban-commit]::
 	Bans a commit from a project's repository.
 

Documentation/cmd-review.txt

@@ -27,16 +27,14 @@ Updates the current user's approval status of the specified patch
 sets and/or submits them for merging, sending out email
 notifications and updating the database.
 
-Patch sets should be specified as complete or abbreviated commit
-SHA-1s.  If the same commit is available in multiple projects the
---project option may be used to limit where Gerrit searches for
-the change to only the contents of the specified project.
+Patch sets may be specified in 'CHANGEID,PATCHSET' format, such as
+'8242,2', or 'COMMIT' format.
+
+If a patch set is specified with the 'COMMIT' format, the complete
+or abbreviated commit SHA-1 may be used.  If the same commit is available
+in multiple projects the `--project` option may be used to limit where
+Gerrit searches for the change to only the contents of the specified project.
 
-For current backward compatibility with user tools patch sets may
-also be specified in the legacy 'CHANGEID,PATCHSET' format, such as
-'8242,2'.  Support for this legacy format is planned to be removed
-in a future edition of Gerrit Code Review.  Use of commit SHA-1s
-is strongly encouraged.
 
 OPTIONS
 -------

Documentation/config-login-register.txt

@@ -1,6 +1,6 @@
 [[usersetup]]
-Inital Login
-------------
+Initial Login
+-------------
 It's time to exit the gerrit2 account as you now have Gerrit running on your
 host and setup your first workspace.
 

Documentation/dev-design.txt

@@ -455,7 +455,7 @@ Scalability
 -----------
 
 Gerrit is designed for a very large scale open source project, or
-large commerical development project.  Roughly this amounts to
+large commercial development project.  Roughly this amounts to
 parameters such as the following:
 
 .Design Parameters
@@ -614,7 +614,7 @@ Disk Usage
 
 The average size of a revision in the Linux kernel once compressed by
 Git is 2,327 bytes, or roughly 2 KiB.  Over the course of a year a
-Gerrit server running with the estimated maxium parameters above might
+Gerrit server running with the estimated maximum parameters above might
 see an introduction of 1.4 GiB over the total set of 10,000 projects
 hosted in that server.  This figure assumes the majority of the content
 is human written source code, and not large binary blobs such as disk

Documentation/intro-change-screen.txt

@@ -95,7 +95,7 @@ Reply button
 ------------
 
 This button corresponds to the 'Review' button the on patch set panel on the old
-change screen.  The only new feature: the user can optionaly send an email
+change screen.  The only new feature: the user can optionally send an email
 during the vote.
 
 Key bindings: "a" to open the drop down. "ESC" to close it.
@@ -112,7 +112,7 @@ Key bindings: "e" to open the drop down. "ESC" to close it.
 [[star-change]]
 
 Star change icon allows to star the change, so that "starredby:self" query can
-retrieve the ctarred changes later. If the change is aleady starred, then
+retrieve the starred changes later. If the change is already starred, then
 clicking the icon again unstars the change.
 
 Key bindings: "s" to star/unstar the change.

Documentation/user-signedoffby.txt

@@ -78,7 +78,7 @@ you are responsible for last-minute changes. Example :
 	Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
 ----
 
-This practise is particularly helpful if you maintain a stable branch and
+This practice is particularly helpful if you maintain a stable branch and
 want at the same time to credit the author, track changes, merge the fix,
 and protect the submitter from complaints. Note that under no circumstances
 can you change the author's identity (the From header), as it is the one

ReleaseNotes/ReleaseNotes-2.8.txt

@@ -526,6 +526,10 @@ link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.8/cmd-s
 * The link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.8/cmd-show-queue.html[
 `show-queue` command] now shows the time that a task was added to the queue.
 
+* The deprecated `approve` alias of the `review` command is removed.
+
+* The 'CHANGEID,PATCHSET' format for specifying a patch set in the `review` command
+is no longer considered to be a 'legacy' feature that will be removed in future.
 
 Daemon
 ~~~~~~

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java

@@ -36,8 +36,6 @@ public class MasterCommandModule extends CommandModule {
     command(gerrit, Receive.class);
     command(gerrit, AdminSetParent.class);
     command(gerrit, ReviewCommand.class);
-    // deprecated alias to review command
-    alias(gerrit, "approve", ReviewCommand.class);
     command(gerrit, SetAccountCommand.class);
     command(gerrit, SetMembersCommand.class);
     command(gerrit, SetProjectCommand.class);