mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-19 18:13:55 +00:00
Code Issues Releases Activity

Texinfo markup fixes for Emacs manual.

Browse Source 
* doc/emacs/maintaining.texi (Basic VC Editing, VC Pull, Merging):
* doc/emacs/basic.texi (Erasing, Basic Undo): Fix markup.
This commit is contained in:
Chong Yidong 2012-06-29 22:54:02 +08:00
parent 3d8b9024ad
commit 3812efdc6c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/emacs/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-29 Chong Yidong <cyd@gnu.org>
* maintaining.texi (Basic VC Editing, VC Pull, Merging):
* basic.texi (Erasing, Basic Undo): Fix markup.
2012-06-26 Glenn Morris <rgm@gnu.org>
* fixit.texi (Undo): Grammar fixes. (Bug#11779)

5
doc/emacs/basic.texi
View File

@ -345,7 +345,7 @@ moves down into it.
Delete the character before point, or the region if it is active
(@code{delete-backward-char}).
@itemx @key{Delete}
@item @key{Delete}
Delete the character after point, or the region if it is active
(@code{delete-forward-char}).
@ -403,7 +403,8 @@ commands.
@item C-/
Undo one entry of the undo records---usually, one command worth
(@code{undo}).
@itemx C-x u
@item C-x u
@itemx C-_
The same.
@end table

6
doc/emacs/maintaining.texi
View File

@ -426,7 +426,7 @@ VC fileset is handled individually; for example, a commit generates
one revision for each changed file.
@table @kbd
@itemx C-x v v
@item C-x v v
Perform the next appropriate version control operation on the current
VC fileset.
@end table
@ -1326,7 +1326,7 @@ commit will be committed to that specific branch.
@subsubsection Pulling Changes into a Branch
@table @kbd
@itemx C-x v +
@item C-x v +
On a decentralized version control system, update the current branch
by ``pulling in'' changes from another location.
@ -1366,7 +1366,7 @@ updates the current VC fileset from the repository.
@cindex merging changes
@table @kbd
@itemx C-x v m
@item C-x v m
On a decentralized version control system, merge changes from another
branch into the current one.