* doc/emacs/maintaining.texi (VC Directory Commands): Copyedit.

(Branches): Put back milder version of pre 2013-06-07 text.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 079f6f01d9d37ed79dedf5beb0b595bcf5098f5b..6f2d9517df778d92fbb75408a614a33284070c76 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,7 +1,11 @@
+2013-06-11  Glenn Morris  <rgm@gnu.org>
+
+       * maintaining.texi (VC Directory Commands): Copyedit.
+       (Branches): Put back milder version of pre 2013-06-07 text.
+
 2013-06-07  Xue Fuqiao  <xfq.free@gmail.com>
 
-       * maintaining.texi (Branches): Remove text copied from other
-       sources.
+       * maintaining.texi (Branches): Remove text copied from other sources.
 
 2013-06-05  Alan Mackenzie  <acm@muc.de>
 

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index dbcd08ee017a6154e93318bb33cc76fcea6ed65f..1b6374a4133b4a91396e1b5db563aeda02d28ab0 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1204,7 +1204,7 @@ files and directories.
 @item x
 Hide files with @samp{up-to-date} status
 (@code{vc-dir-hide-up-to-date}).  With a prefix argument, hide items
-that are in state of item at point from display.
+whose state is that of the item at point.
 @end table
 
 @findex vc-dir-mark
@@ -1267,7 +1267,10 @@ bring them back at a later time).
 @cindex branch (version control)
 
   One use of version control is to support multiple independent lines
-of development, which are called @dfn{branches}.
+of development, which are called @dfn{branches}.  Amongst other
+things, branches can be used for maintaining separate ``stable'' and
+``development'' versions of a program, and for developing unrelated
+features in isolation from one another.
 
   VC's support for branch operations is currently fairly limited.  For
 decentralized version control systems, it provides commands for