aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2007-11-23 14:17:38 +0000
committerThien-Thi Nguyen2007-11-23 14:17:38 +0000
commit4d77fc8ece1e07b65407d7a2b323149f971a6370 (patch)
tree5d1b6fe740d0a58dce06dc048d8eb8835392ed29
parent6af24d93bec697cccba1a42275e1fdad6a407294 (diff)
downloademacs-4d77fc8ece1e07b65407d7a2b323149f971a6370.tar.gz
emacs-4d77fc8ece1e07b65407d7a2b323149f971a6370.zip
(Log Buffer): Fix typos; small rewording.
(Old Revisions): Likewise.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/files.texi14
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 32228e42604..18e4686c431 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -2,7 +2,9 @@
2 2
3 * files.texi (Why Version Control?): Fix typo. 3 * files.texi (Why Version Control?): Fix typo.
4 (VCS Concepts): Fix typos; small tense fix. 4 (VCS Concepts): Fix typos; small tense fix.
5 (Selecting a Fileset): Fix typo; small rewording. 5 (Selecting a Fileset): Fix typos; small rewording.
6 (Log Buffer): Likewise.
7 (Old Revisions): Likewise.
6 8
72007-11-23 Mark A. Hershberger <mah@everybody.org> 92007-11-23 Mark A. Hershberger <mah@everybody.org>
8 10
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 04eaeac4aeb..8e2cb879754 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1803,8 +1803,8 @@ are set around the entire contents of the buffer so that it is easy to
1803kill the contents of the buffer with @kbd{C-w}. 1803kill the contents of the buffer with @kbd{C-w}.
1804 1804
1805@findex log-edit-insert-changelog 1805@findex log-edit-insert-changelog
1806 If you work by writing entries in the @file{ChangeLog} 1806 If you work by first writing entries in the @file{ChangeLog}
1807(@pxref{Change Log}) and then commit the change under revision 1807(@pxref{Change Log}) and afterwards committing the change under revision
1808control, you can generate the Log Edit text from the ChangeLog using 1808control, you can generate the Log Edit text from the ChangeLog using
1809@kbd{C-c C-a} (@kbd{log-edit-insert-changelog}). This looks for 1809@kbd{C-c C-a} (@kbd{log-edit-insert-changelog}). This looks for
1810entries for the file(s) concerned in the top entry in the ChangeLog 1810entries for the file(s) concerned in the top entry in the ChangeLog
@@ -1845,7 +1845,7 @@ time to complete the check-in.
1845convenient to specify the same log entry for many of the files. (This 1845convenient to specify the same log entry for many of the files. (This
1846is the normal way to do things on a changeset-oriented system, where 1846is the normal way to do things on a changeset-oriented system, where
1847comments are attached to changesets rather than the history of 1847comments are attached to changesets rather than the history of
1848individual files.) The most convenient way to do this is to mark all the 1848individual files.) The most convenient way to do this is to mark all the
1849files in VC-Dired mode and check in from there; the log buffer will 1849files in VC-Dired mode and check in from there; the log buffer will
1850carry the fileset information with it and do a group commit when you 1850carry the fileset information with it and do a group commit when you
1851confirm it with @kbd{C-c C-c}. 1851confirm it with @kbd{C-c C-c}.
@@ -1952,15 +1952,15 @@ revisions are not, in general, present as files on your disk.)
1952@kindex C-x v g 1952@kindex C-x v g
1953 For some back ends, you can display the file @dfn{annotated} with 1953 For some back ends, you can display the file @dfn{annotated} with
1954per-line revision information and using colors to enhance the visual 1954per-line revision information and using colors to enhance the visual
1955appearance, with the command @kbd{M-x vc-annotate}. It creates a new 1955appearance, with the command @kbd{M-x vc-annotate}. This creates a new
1956buffer (the ``annotate buffer'') displaying the file's text, with each 1956buffer (the ``annotate buffer'') displaying the file's text, with each
1957part colored to show how old it is. Text colored red is new, blue means 1957part colored to show how old it is. Text colored red is new, blue means
1958old, and intermediate colors indicate intermediate ages. By default, 1958old, and intermediate colors indicate intermediate ages. By default,
1959the color is scaled over the full range of ages, such that the oldest 1959the color is scaled over the full range of ages, such that the oldest
1960changes are blue, and the newest changes are red. 1960changes are blue, and the newest changes are red.
1961 1961
1962 When you give a prefix argument to this command, it uses the 1962 When you give a prefix argument to this command, Emacs reads two
1963minibuffer to read two arguments: the ID of which revision to display and 1963arguments using the minibuffer: the ID of which revision to display and
1964annotate (instead of the current file contents), and the time span in 1964annotate (instead of the current file contents), and the time span in
1965days the color range should cover. 1965days the color range should cover.
1966 1966
@@ -2006,7 +2006,7 @@ return to your working revision.
2006@node Secondary VC Commands 2006@node Secondary VC Commands
2007@subsection The Secondary Commands of VC 2007@subsection The Secondary Commands of VC
2008 2008
2009 This section explains the secondary commands of VC; those that you might 2009 This section explains the secondary commands of VC, those that you might
2010use once a day. 2010use once a day.
2011 2011
2012@menu 2012@menu