[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108063: Texinfo markup fixes for Emacs manual.

[Chong Yidong]

------------------------------------------------------------
revno: 108063
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-06-29 22:54:02 +0800
message:
  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.
modified:
  doc/emacs/ChangeLog
  doc/emacs/basic.texi
  doc/emacs/maintaining.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-06-26 02:00:32 +0000
+++ b/doc/emacs/ChangeLog       2012-06-29 14:54:02 +0000
@@ -1,3 +1,8 @@
+2012-06-29  Chong Yidong  <address@hidden>
+
+       * maintaining.texi (Basic VC Editing, VC Pull, Merging):
+       * basic.texi (Erasing, Basic Undo): Fix markup.
+
 2012-06-26  Glenn Morris  <address@hidden>
 
        * fixit.texi (Undo): Grammar fixes.  (Bug#11779)

=== modified file 'doc/emacs/basic.texi'
--- a/doc/emacs/basic.texi      2012-04-26 00:31:47 +0000
+++ b/doc/emacs/basic.texi      2012-06-29 14:54:02 +0000
@@ -345,7 +345,7 @@
 Delete the character before point, or the region if it is active
 (@code{delete-backward-char}).
 
address@hidden @key{Delete}
address@hidden @key{Delete}
 Delete the character after point, or the region if it is active
 (@code{delete-forward-char}).
 
@@ -403,7 +403,8 @@
 @item C-/
 Undo one entry of the undo records---usually, one command worth
 (@code{undo}).
address@hidden C-x u
+
address@hidden C-x u
 @itemx C-_
 The same.
 @end table

=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi        2012-06-11 06:48:47 +0000
+++ b/doc/emacs/maintaining.texi        2012-06-29 14:54:02 +0000
@@ -426,7 +426,7 @@
 one revision for each changed file.
 
 @table @kbd
address@hidden C-x v v
address@hidden C-x v v
 Perform the next appropriate version control operation on the current
 VC fileset.
 @end table
@@ -1326,7 +1326,7 @@
 @subsubsection Pulling Changes into a Branch
 
 @table @kbd
address@hidden C-x v +
address@hidden C-x v +
 On a decentralized version control system, update the current branch
 by ``pulling in'' changes from another location.
 
@@ -1366,7 +1366,7 @@
 @cindex merging changes
 
 @table @kbd
address@hidden C-x v m
address@hidden C-x v m
 On a decentralized version control system, merge changes from another
 branch into the current one.