1 files changed, 8 insertions, 6 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 65a3b41f5bf..95d47de5bba 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -833,19 +833,21 @@ controlling the degree of parallelism.
 ** VC and related modes
+++
 *** Support for pulling on distributed version control systems.
-The vc-pull command runs a "pull" operation, if it is supported.
+`C-x v +' (`vc-pull') runs a "pull" operation, if it is supported, to
-This updates the current branch from upstream.  A prefix argument
+update the current branch and working tree.  A prefix argument means
-means to prompt the user for specifics, e.g. a pull location.
+to prompt the user for specifics, e.g. a pull location.
 **** `vc-update' is now an alias for `vc-pull'.
 **** Currently supported by Bzr, Git, and Mercurial.
+++
 *** Support for merging on distributed version control systems.
-The vc-merge command now runs a "merge" operation, if it is supported.
+The vc-merge command now runs a "merge" operation, if it is supported,
-This merges another branch into the current one.  This command prompts
+to merge changes from another branch into the current one.  It prompts
-the user for specifics, e.g. a merge source.
+for specifics, e.g. a merge source.
 **** Currently supported for Bzr, Git, and Mercurial.

diff --git a/etc/NEWS b/etc/NEWS index 65a3b41f5bf..95d47de5bba 100644 --- a/etc/NEWS +++ b/etc/NEWS
@@ -833,19 +833,21 @@ controlling the degree of parallelism.
833		833
834	** VC and related modes	834	** VC and related modes
835		835
		836	+++
836	*** Support for pulling on distributed version control systems.	837	*** Support for pulling on distributed version control systems.
837	The vc-pull command runs a "pull" operation, if it is supported.	838	`C-x v +' (`vc-pull') runs a "pull" operation, if it is supported, to
838	This updates the current branch from upstream. A prefix argument	839	update the current branch and working tree. A prefix argument means
839	means to prompt the user for specifics, e.g. a pull location.	840	to prompt the user for specifics, e.g. a pull location.
840		841
841	**** `vc-update' is now an alias for `vc-pull'.	842	**** `vc-update' is now an alias for `vc-pull'.
842		843
843	**** Currently supported by Bzr, Git, and Mercurial.	844	**** Currently supported by Bzr, Git, and Mercurial.
844		845
		846	+++
845	*** Support for merging on distributed version control systems.	847	*** Support for merging on distributed version control systems.
846	The vc-merge command now runs a "merge" operation, if it is supported.	848	The vc-merge command now runs a "merge" operation, if it is supported,
847	This merges another branch into the current one. This command prompts	849	to merge changes from another branch into the current one. It prompts
848	the user for specifics, e.g. a merge source.	850	for specifics, e.g. a merge source.
849		851
850	**** Currently supported for Bzr, Git, and Mercurial.	852	**** Currently supported for Bzr, Git, and Mercurial.
851		853