aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2006-05-27 21:54:27 +0000
committerThien-Thi Nguyen2006-05-27 21:54:27 +0000
commit8bc8d8544a54f941717022be1011ad564671be81 (patch)
tree6ddf284450958d1a2cd3e8af2edb0b63a6f07ade
parentb9e17eb3bd9b67f69f3dc815eead591a9de356a6 (diff)
downloademacs-8bc8d8544a54f941717022be1011ad564671be81.tar.gz
emacs-8bc8d8544a54f941717022be1011ad564671be81.zip
Fix typos.
(Customization): Say "us".
-rw-r--r--man/ChangeLog5
-rw-r--r--man/pcl-cvs.texi14
2 files changed, 12 insertions, 7 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 1a7085ef69f..1c5f19b8321 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
12006-05-27 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * pcl-cvs.texi: Fix typos.
4 (Customization): Say "us".
5
12006-05-26 Eli Zaretskii <eliz@gnu.org> 62006-05-26 Eli Zaretskii <eliz@gnu.org>
2 7
3 * org.texi: Remove bogus @setfilename. 8 * org.texi: Remove bogus @setfilename.
diff --git a/man/pcl-cvs.texi b/man/pcl-cvs.texi
index b66585b4883..f8fec565deb 100644
--- a/man/pcl-cvs.texi
+++ b/man/pcl-cvs.texi
@@ -924,7 +924,7 @@ The command that is run is @code{cvs-mode-remove-file}.
924If you have modified a file, and for some reason decide that you don't 924If you have modified a file, and for some reason decide that you don't
925want to keep the changes, you can undo them with this command. It works 925want to keep the changes, you can undo them with this command. It works
926by removing your working copy of the file and then getting the latest 926by removing your working copy of the file and then getting the latest
927version from the repository (@code{cvs-mode-undo-local-changes}. 927version from the repository (@code{cvs-mode-undo-local-changes}).
928@end table 928@end table
929 929
930 930
@@ -1024,17 +1024,17 @@ branch) (@code{cvs-mode-diff-head}).@refill
1024Display a @samp{cvs diff} between the base revision of the selected 1024Display a @samp{cvs diff} between the base revision of the selected
1025files and the head revision in the repository. This displays the 1025files and the head revision in the repository. This displays the
1026changes anyone has committed to the repository since you last executed 1026changes anyone has committed to the repository since you last executed
1027"checkout", "update" or "commit". 1027"checkout", "update" or "commit"
1028(@code{cvs-mode-diff-repository}).@refill 1028(@code{cvs-mode-diff-repository}).@refill
1029 1029
1030@item d v 1030@item d v
1031Display a @samp{cvs diff} between the selected files and the head 1031Display a @samp{cvs diff} between the selected files and the head
1032revision of the vendor branch in the repository. 1032revision of the vendor branch in the repository
1033(@code{cvs-mode-diff-vendor}).@refill 1033(@code{cvs-mode-diff-vendor}).@refill
1034 1034
1035@item d y 1035@item d y
1036Display a @samp{cvs diff} between the selected files and yesterday's 1036Display a @samp{cvs diff} between the selected files and yesterday's
1037head revision in the repository. 1037head revision in the repository
1038(@code{cvs-mode-diff-yesterday}).@refill 1038(@code{cvs-mode-diff-yesterday}).@refill
1039@end table 1039@end table
1040 1040
@@ -1082,7 +1082,7 @@ created will be overwritten.@refill
1082@table @kbd 1082@table @kbd
1083@item O 1083@item O
1084Update all selected files with status @samp{Need-update} by running 1084Update all selected files with status @samp{Need-update} by running
1085@samp{cvs update} on them. (@code{cvs-mode-update}). 1085@samp{cvs update} on them (@code{cvs-mode-update}).
1086@end table 1086@end table
1087 1087
1088 1088
@@ -1237,8 +1237,8 @@ argument, these commands move that many messages of files.
1237@cindex @samp{CVSROOT}, overriding 1237@cindex @samp{CVSROOT}, overriding
1238 1238
1239If you have an idea about any customization that would be handy but 1239If you have an idea about any customization that would be handy but
1240isn't present in this list, please tell me! 1240isn't present in this list, please tell us!
1241For info on how to reach me, see @ref{Bugs}.@refill 1241For info on how to reach us, see @ref{Bugs}.@refill
1242 1242
1243@table @samp 1243@table @samp
1244@item cvs-auto-remove-handled 1244@item cvs-auto-remove-handled