aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2010-11-02 20:49:04 -0700
committerGlenn Morris2010-11-02 20:49:04 -0700
commit537b04b96a8516693acabd5474791f5c77a770d4 (patch)
tree74411a3837610730fad60042b727c5126844a38b /doc
parentcf503f7c08c73b89485ac3d00af917875ed13b39 (diff)
downloademacs-537b04b96a8516693acabd5474791f5c77a770d4.tar.gz
emacs-537b04b96a8516693acabd5474791f5c77a770d4.zip
Don't be so lax with spelling.
* lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix. * doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog1
-rw-r--r--doc/misc/ediff.texi7
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e5b2fa62836..a58775595fc 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,6 @@
12010-11-03 Glenn Morris <rgm@gnu.org> 12010-11-03 Glenn Morris <rgm@gnu.org>
2 2
3 * ediff.texi (Quick Help Commands, Miscellaneous):
3 * gnus.texi (Agent Variables): Spelling fix. 4 * gnus.texi (Agent Variables): Spelling fix.
4 5
52010-10-31 Lars Magne Ingebrigtsen <larsi@gnus.org> 62010-10-31 Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 4259fccb390..c2897e185bf 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -759,7 +759,7 @@ Displays a list of currently active Ediff sessions---the Ediff Registry.
759You can then restart any of these sessions by either clicking on a session 759You can then restart any of these sessions by either clicking on a session
760record or by putting the cursor over it and then typing the return key. 760record or by putting the cursor over it and then typing the return key.
761 761
762(Some poor souls leave so many active Ediff sessions around that they loose 762(Some poor souls leave so many active Ediff sessions around that they lose
763track of them completely... The `R' command is designed to save these 763track of them completely... The `R' command is designed to save these
764people from the recently discovered Ediff Proficiency Syndrome.) 764people from the recently discovered Ediff Proficiency Syndrome.)
765 765
@@ -2315,7 +2315,7 @@ other behavior.
2315 2315
2316However, Ediff temporarily resets this variable to @code{t} if it is 2316However, Ediff temporarily resets this variable to @code{t} if it is
2317invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. 2317invoked via one of the "buffer" jobs, such as @code{ediff-buffers}.
2318This is because it is all too easy to loose day's work otherwise. 2318This is because it is all too easy to lose a day's work otherwise.
2319Besides, in a "buffer" job, the variant buffers have already been loaded 2319Besides, in a "buffer" job, the variant buffers have already been loaded
2320prior to starting Ediff, so Ediff just preserves status quo here. 2320prior to starting Ediff, so Ediff just preserves status quo here.
2321 2321
@@ -2542,6 +2542,3 @@ Eli Zaretskii (eliz at is.elta.co.il)
2542 2542
2543@bye 2543@bye
2544 2544
2545@ignore
2546 arch-tag: 165ecb88-d03c-44b1-a921-b93f50b05b46
2547@end ignore