aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2013-06-10 23:42:15 -0700
committerGlenn Morris2013-06-10 23:42:15 -0700
commit9102c47ad2fc39371b0931ed70940fa8511cc09d (patch)
treec188ae657ffe3a056baa3c536b7084b6f61450b6 /doc
parent56602a4bfcc63d2fc2460d10e9c32ea75162ee61 (diff)
downloademacs-9102c47ad2fc39371b0931ed70940fa8511cc09d.tar.gz
emacs-9102c47ad2fc39371b0931ed70940fa8511cc09d.zip
* doc/emacs/maintaining.texi (VC Directory Commands): Copyedit.
(Branches): Put back milder version of pre 2013-06-07 text.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog8
-rw-r--r--doc/emacs/maintaining.texi7
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 @@
12013-06-11 Glenn Morris <rgm@gnu.org>
2
3 * maintaining.texi (VC Directory Commands): Copyedit.
4 (Branches): Put back milder version of pre 2013-06-07 text.
5
12013-06-07 Xue Fuqiao <xfq.free@gmail.com> 62013-06-07 Xue Fuqiao <xfq.free@gmail.com>
2 7
3 * maintaining.texi (Branches): Remove text copied from other 8 * maintaining.texi (Branches): Remove text copied from other sources.
4 sources.
5 9
62013-06-05 Alan Mackenzie <acm@muc.de> 102013-06-05 Alan Mackenzie <acm@muc.de>
7 11
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.
1204@item x 1204@item x
1205Hide files with @samp{up-to-date} status 1205Hide files with @samp{up-to-date} status
1206(@code{vc-dir-hide-up-to-date}). With a prefix argument, hide items 1206(@code{vc-dir-hide-up-to-date}). With a prefix argument, hide items
1207that are in state of item at point from display. 1207whose state is that of the item at point.
1208@end table 1208@end table
1209 1209
1210@findex vc-dir-mark 1210@findex vc-dir-mark
@@ -1267,7 +1267,10 @@ bring them back at a later time).
1267@cindex branch (version control) 1267@cindex branch (version control)
1268 1268
1269 One use of version control is to support multiple independent lines 1269 One use of version control is to support multiple independent lines
1270of development, which are called @dfn{branches}. 1270of development, which are called @dfn{branches}. Amongst other
1271things, branches can be used for maintaining separate ``stable'' and
1272``development'' versions of a program, and for developing unrelated
1273features in isolation from one another.
1271 1274
1272 VC's support for branch operations is currently fairly limited. For 1275 VC's support for branch operations is currently fairly limited. For
1273decentralized version control systems, it provides commands for 1276decentralized version control systems, it provides commands for