diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-06-29 22:54:02 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-06-29 22:54:02 +0800 |
| commit | 3812efdc6c3e112e623afe67482ac0af0da3bcee (patch) | |
| tree | 75eea237abc56bce8c2cb29080153b0da1bde872 | |
| parent | 3d8b9024adf6136edd3f7b7edf70a88b6ab8a61b (diff) | |
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/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/basic.texi | 5 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9f255986c0..0d31e64b30 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -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) diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 2650b55811..71e59e4738 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -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 diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 32f49d92ce..3517500cd5 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 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. |