aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-06-29 22:54:02 +0800
committerChong Yidong2012-06-29 22:54:02 +0800
commit3812efdc6c3e112e623afe67482ac0af0da3bcee (patch)
tree75eea237abc56bce8c2cb29080153b0da1bde872
parent3d8b9024adf6136edd3f7b7edf70a88b6ab8a61b (diff)
downloademacs-3812efdc6c3e112e623afe67482ac0af0da3bcee.tar.gz
emacs-3812efdc6c3e112e623afe67482ac0af0da3bcee.zip
Texinfo markup fixes for Emacs manual.
* doc/emacs/maintaining.texi (Basic VC Editing, VC Pull, Merging): * doc/emacs/basic.texi (Erasing, Basic Undo): Fix markup.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/basic.texi5
-rw-r--r--doc/emacs/maintaining.texi6
3 files changed, 11 insertions, 5 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9f255986c0b..0d31e64b307 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12012-06-29 Chong Yidong <cyd@gnu.org>
2
3 * maintaining.texi (Basic VC Editing, VC Pull, Merging):
4 * basic.texi (Erasing, Basic Undo): Fix markup.
5
12012-06-26 Glenn Morris <rgm@gnu.org> 62012-06-26 Glenn Morris <rgm@gnu.org>
2 7
3 * fixit.texi (Undo): Grammar fixes. (Bug#11779) 8 * fixit.texi (Undo): Grammar fixes. (Bug#11779)
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 2650b55811f..71e59e4738d 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -345,7 +345,7 @@ moves down into it.
345Delete the character before point, or the region if it is active 345Delete the character before point, or the region if it is active
346(@code{delete-backward-char}). 346(@code{delete-backward-char}).
347 347
348@itemx @key{Delete} 348@item @key{Delete}
349Delete the character after point, or the region if it is active 349Delete the character after point, or the region if it is active
350(@code{delete-forward-char}). 350(@code{delete-forward-char}).
351 351
@@ -403,7 +403,8 @@ commands.
403@item C-/ 403@item C-/
404Undo one entry of the undo records---usually, one command worth 404Undo one entry of the undo records---usually, one command worth
405(@code{undo}). 405(@code{undo}).
406@itemx C-x u 406
407@item C-x u
407@itemx C-_ 408@itemx C-_
408The same. 409The same.
409@end table 410@end table
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 32f49d92ce8..3517500cd51 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -426,7 +426,7 @@ VC fileset is handled individually; for example, a commit generates
426one revision for each changed file. 426one revision for each changed file.
427 427
428@table @kbd 428@table @kbd
429@itemx C-x v v 429@item C-x v v
430Perform the next appropriate version control operation on the current 430Perform the next appropriate version control operation on the current
431VC fileset. 431VC fileset.
432@end table 432@end table
@@ -1326,7 +1326,7 @@ commit will be committed to that specific branch.
1326@subsubsection Pulling Changes into a Branch 1326@subsubsection Pulling Changes into a Branch
1327 1327
1328@table @kbd 1328@table @kbd
1329@itemx C-x v + 1329@item C-x v +
1330On a decentralized version control system, update the current branch 1330On a decentralized version control system, update the current branch
1331by ``pulling in'' changes from another location. 1331by ``pulling in'' changes from another location.
1332 1332
@@ -1366,7 +1366,7 @@ updates the current VC fileset from the repository.
1366@cindex merging changes 1366@cindex merging changes
1367 1367
1368@table @kbd 1368@table @kbd
1369@itemx C-x v m 1369@item C-x v m
1370On a decentralized version control system, merge changes from another 1370On a decentralized version control system, merge changes from another
1371branch into the current one. 1371branch into the current one.
1372 1372