; Improve recently-added documentation

* etc/NEWS:
* lisp/vc/vc.el (vc-apply-root-to-other-working-tree):
* doc/emacs/vc1-xtra.texi (Other Working Trees): Fix spelling and
wording of documentation of recent changes to VC.

3 files changed, 10 insertions, 5 deletions

diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 15b7a73e5d7..1a7d65937c0 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -400,7 +400,7 @@ branch there.
 You apply the patch to that working tree using @w{@kbd{C-x v w a}} (see
 below), build and test it.  Satisfied, you use @w{@kbd{C-x v P}}
 (@pxref{Pulling / Pushing}) in the other working tree.  In the course of
-testing the patch, you've realised that the bug exists in version 3 of
+testing the patch, you've realized that the bug exists in version 3 of
 the software, too.  So you switch back to your first working tree, and
 use @kbd{C-x v m} (@pxref{Merging}) to merge the branch you have checked
 out in the other working tree.  Now your version of the trunk has all of
@@ -509,13 +509,14 @@ working tree as a whole, independent project.
 @kindex C-x v w a
 @findex vc-apply-to-other-working-tree
 The command @kbd{C-x v w a} (@code{vc-apply-to-other-working-tree})
-prompts you to select a working tree, then copies changes from the
+prompts you to select another working tree, then copies changes from the
 current working tree to that other working tree.  With a prefix
 argument, it moves changes instead of just copying them.  Usually the
 command operates on local (uncommitted) changes to the current VC
-fileset.  When invoked in a Diff mode (@pxref{Diff Mode}) buffer, it
+fileset.  When invoked in a buffer under Diff mode (@pxref{Diff Mode}), it
 operates on the changes specified by the contents of that buffer.  The
-command stops and does nothing if any of the changes don't apply.
+command stops and does nothing if any of the changes don't apply to the
+target working tree.
 
 @kbd{C-x v w a} is useful to copy changes to a temporary working tree in
 order to test them.  It is also useful to copy fixes back to your main
diff --git a/etc/NEWS b/etc/NEWS
index 736874c1a0a..62755a433cc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2077,6 +2077,10 @@ other working trees:
 - 'C-x v w x': Delete a working tree you no longer need.
 - 'C-x v w R': Relocate a working tree to another file name.
 
+The new user option 'vc-no-confirm-moving-changes' controls whether
+'C-x v w a' and 'C-x v w A' ask for confirmation when moving changes
+between working trees.  The default is to ask for confirmation.
+
 In addition, Lisp programs that extend VC can invoke the new backend
 functions to obtain a list of other working trees, and to add, remove
 and relocate them.
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 07b9ea8b951..ce950b18caf 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -4701,7 +4701,7 @@ tree, it is an error, and no changes are moved."
 
 ;;;###autoload
 (defun vc-apply-root-to-other-working-tree (directory &optional move preview)
-  "Apply all local changes to this working tree to the one under DIRECTORY.
+  "Apply all local changes in this working tree to the tree under DIRECTORY.
 Must be called from within an existing VC working tree.
 When called interactively, prompts for DIRECTORY.
 With a prefix argument (when called from Lisp, with optional argument