Mercurial > emacs
diff doc/emacs/ChangeLog @ 111779:141d3f14d8c3
Merge changes from emacs-23 branch
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 27 Nov 2010 15:04:57 -0500 |
| parents | 5c986eef8f0d 6e3b84ac704d |
| children | c00190a8c8ef |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Sat Nov 27 10:40:19 2010 +0200 +++ b/doc/emacs/ChangeLog Sat Nov 27 15:04:57 2010 -0500 @@ -1,3 +1,28 @@ +2010-11-27 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> + + * maintaining.texi (VC With A Locking VCS, VC Directory Commands): + * vc1-xtra.texi (Customizing VC, General VC Options): Small fixes. + +2010-11-27 Chong Yidong <cyd@stupidchicken.com> + + * maintaining.texi (Version Control Systems): Fix repeated sentence. + Suggested by Štěpán Němec. + +2010-11-27 Chong Yidong <cyd@stupidchicken.com> + + * maintaining.texi (Version Control): Say "commit", not "check in". + (Version Control Systems): Simplify descriptions. + (VCS Merging, VCS Changesets, VCS Repositories): New nodes, split from + VCS Concepts. + (VC Mode Line): Update example. + (Old Revisions): Document revert-buffer for vc-diff. + (Log Buffer): Promote to a subsection. Document header lines. + + * macos.texi (Mac / GNUstep Basics): Document + ns-right-alternate-modifier. + + * emacs.texi (Top): Update node listing. + 2010-11-13 Eli Zaretskii <eliz@gnu.org> * rmail.texi (Rmail Coding): Characters with no fonts are not