diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9361ae19a57..079f6f01d9d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2013-06-07 Xue Fuqiao + + * maintaining.texi (Branches): Remove text copied from other + sources. + 2013-06-05 Alan Mackenzie * search.texi (Isearch Scroll): Rename to "Not Exiting Isearch". diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 17c04fe74e3..dbcd08ee017 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1267,16 +1267,7 @@ 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}. Branches allow for -parts of software to be developed in parallel. Large projects require -many roles to be filled, including developers, build managers, and -quality assurance personnel. Further, multiple releases on different -operating system platforms may have to be maintained. Branches allow -contributors to isolate changes without destabilizing the codebase, -for example, fixes for bugs, new features, and versions -integration. These changes may be later merged (resynchronized) after -testing. - +of development, which are called @dfn{branches}. VC's support for branch operations is currently fairly limited. For decentralized version control systems, it provides commands for