; Move text about C-x v v from Diff mode buffers into main list

* doc/emacs/maintaining.texi (VC With A Merging VCS): Move text
about C-x v v from a Diff mode buffer into the bulleted list.

(cherry picked from commit 67ddf2157659e9cd6fb9b109049da66c7abe4ffb)

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index b372e86f53d6291bfea685c0186e413c2fff90f9..49effd05ce9e97d1fc21324d23669f3abd398594 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -553,7 +553,7 @@ cannot find a system to register under, it prompts for a repository
 type, creates a new repository, and registers the VC fileset with it.
 You can also specify the system explicitly, see @ref{Advanced C-x v
 v}.  Note that registering the files doesn't commit them; you must
-invoke @w{@kbd{C-x v v}} again to commit, see below.
+invoke @w{@kbd{C-x v v}} again to commit; see the next point.
 
 @item
 If every file in the VC fileset has been either newly-added or
@@ -561,6 +561,12 @@ modified, commit the changed files.  To do this, Emacs pops up a
 @file{*vc-log*} buffer; type the desired log entry for the changes,
 followed by @kbd{C-c C-c} to commit.  @xref{Log Buffer}.
 
+If @kbd{C-x v v} is invoked from a buffer under Diff mode, the command
+treats the buffer as holding a set of patches for one or more files.  It
+then applies the changes to the respective files and commits the changes
+after popping up the @file{*vc-log*} buffer to allow you to type a
+suitable commit log message.
+
 With modern decentralized version control systems (Git, Mercurial,
 etc.), the changes are committed locally and not automatically
 propagated to the upstream repository (which is usually on a remote
@@ -590,12 +596,6 @@ changes.  In addition, locking is possible with RCS even in this mode:
 @kbd{C-x v v} with an unmodified file locks the file, just as it does
 with RCS in its normal locking mode (@pxref{VC With A Locking VCS}).
 
-  If @kbd{C-x v v} is invoked from a buffer under Diff Mode, the
-command assumes the buffer holds a set of patches for one or more
-files.  It then applies the changes to the respective files and
-commits the changes after popping up the @file{*vc-log*} buffer to
-allow you to type a suitable commit log message.
-
 @node VC With A Locking VCS
 @subsubsection Basic Version Control with Locking