aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorXue Fuqiao2013-06-02 19:56:39 +0800
committerXue Fuqiao2013-06-02 19:56:39 +0800
commit9c3b7be7649c495a26ebd594323a88f9904f94d9 (patch)
tree060b17eaafb8642a0ec30e20f3adca10587e7021 /doc
parent67a3c09b083e4b4850740e3d822528809c49e4ae (diff)
downloademacs-9c3b7be7649c495a26ebd594323a88f9904f94d9.tar.gz
emacs-9c3b7be7649c495a26ebd594323a88f9904f94d9.zip
Refine docs of VC.
* maintaining.texi (VC Mode Line): Fix typo. (VC Directory Commands): Mention `vc-dir-hide-up-to-date' with prefix argument.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog3
-rw-r--r--doc/emacs/maintaining.texi5
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 133ab83e2fb..6cf28dc095c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,6 +1,9 @@
12013-06-02 Xue Fuqiao <xfq.free@gmail.com> 12013-06-02 Xue Fuqiao <xfq.free@gmail.com>
2 2
3 * maintaining.texi (Branches): Add motivations for branching. 3 * maintaining.texi (Branches): Add motivations for branching.
4 (VC Mode Line): Fix typo.
5 (VC Directory Commands): Mention `vc-dir-hide-up-to-date' with
6 prefix argument.
4 7
52013-06-01 Glenn Morris <rgm@gnu.org> 82013-06-01 Glenn Morris <rgm@gnu.org>
6 9
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 6a1f049325f..17c04fe74e3 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -379,7 +379,7 @@ merge-based version control system, a @samp{-} character indicates
379that the work file is unmodified, and @samp{:} indicates that it has 379that the work file is unmodified, and @samp{:} indicates that it has
380been modified. @samp{!} indicates that the file contains conflicts as 380been modified. @samp{!} indicates that the file contains conflicts as
381result of a recent merge operation (@pxref{Merging}), or that the file 381result of a recent merge operation (@pxref{Merging}), or that the file
382was removed from the version control. Finally, @samp{?} means that 382was removed from the version control. Finally, @samp{?} means that
383the file is under version control, but is missing from the working 383the file is under version control, but is missing from the working
384tree. 384tree.
385 385
@@ -1203,7 +1203,8 @@ files and directories.
1203 1203
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}). 1206(@code{vc-dir-hide-up-to-date}). With a prefix argument, hide items
1207that are in state of item at point from display.
1207@end table 1208@end table
1208 1209
1209@findex vc-dir-mark 1210@findex vc-dir-mark