From 9102c47ad2fc39371b0931ed70940fa8511cc09d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 10 Jun 2013 23:42:15 -0700 Subject: [PATCH] * doc/emacs/maintaining.texi (VC Directory Commands): Copyedit. (Branches): Put back milder version of pre 2013-06-07 text. --- doc/emacs/ChangeLog | 8 ++++++-- doc/emacs/maintaining.texi | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 079f6f01d9d..6f2d9517df7 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,7 +1,11 @@ +2013-06-11 Glenn Morris + + * maintaining.texi (VC Directory Commands): Copyedit. + (Branches): Put back milder version of pre 2013-06-07 text. + 2013-06-07 Xue Fuqiao - * maintaining.texi (Branches): Remove text copied from other - sources. + * maintaining.texi (Branches): Remove text copied from other sources. 2013-06-05 Alan Mackenzie diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index dbcd08ee017..1b6374a4133 100644 --- 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 -- 2.39.5