summaryrefslogtreecommitdiff
path: root/ChangeLog.2
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-08-05 13:31:10 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-08-05 13:35:13 -0700
commit92e5b41c7c5898820356fc66456804a45bbe7852 (patch)
treeb4f3858e4f3e55078a57f5f40c024d7a773952f1 /ChangeLog.2
parent6a9d967048f489bea8c716eb7b5be2c582b480bb (diff)
downloademacs-92e5b41c7c5898820356fc66456804a45bbe7852.tar.gz
Spelling and minor grammar fixes
* test/file-organization.org: Rename from test/file-organisation.org.
Diffstat (limited to 'ChangeLog.2')
-rw-r--r--ChangeLog.28
1 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index cd29f92e998..72ba385f6a2 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1444,7 +1444,7 @@
Link from (emacs)Exiting to (lisp)Killing Emacs
* doc/emacs/entering.texi (Exiting): Link to the lispref
- manual for further customisations (bug#15445).
+ manual for further customizations (bug#15445).
(cherry picked from commit bc5f27aa099cdde02ca66e71501b89300685ab28)
@@ -8592,7 +8592,7 @@
* lisp/files-x.el (modify-dir-local-variable): Small rewrite
Change a variable name to be more meaningful, and reorder some of
- the code with no change in behaviour.
+ the code with no change in behavior.
2016-01-25 Artur Malabarba <bruce.connor.am@gmail.com>
@@ -16655,7 +16655,7 @@
make check unconditional, check-maybe top-level.
* Makefile.in: Add check-maybe target.
- * test/Makefile.in: Restore unconditional behaviour to make check.
+ * test/Makefile.in: Restore unconditional behavior to make check.
2015-12-01 Phillip Lord <phillip.lord@russet.org.uk>
@@ -18368,7 +18368,7 @@
* lisp/files.el: Don't allow customization of dir-locals sorting.
In retrospect, this is not a good idea for the same reason that
`dir-locals-file' is a defconst, because it is important that this
- behaviour be "uniform across different environments and users".
+ behavior be "uniform across different environments and users".
Sure, the user can still change the sorting with a hack, but we
shouldn't encourage them to change it.
(dir-locals--all-files): Return list in the order returned by