summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/os.texi5
-rw-r--r--etc/NEWS6
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 5413437c39d..5b89e1ad581 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -902,6 +902,9 @@ Hewlett-Packard HPUX operating system.
@item irix
Silicon Graphics Irix system.
+@item nacl
+Google Native Client (@acronym{NaCl}) sandboxing system.
+
@item ms-dos
Microsoft's DOS@. Emacs compiled with DJGPP for MS-DOS binds
@code{system-type} to @code{ms-dos} even when you run it on MS-Windows.
@@ -911,7 +914,7 @@ AT&T Unix System V.
@item windows-nt
Microsoft Windows NT, 9X and later. The value of @code{system-type}
-is always @code{windows-nt}, e.g., even on Windows 7.
+is always @code{windows-nt}, e.g., even on Windows 10.
@end table
diff --git a/etc/NEWS b/etc/NEWS
index ad7d81703e0..1b44812f36a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -181,8 +181,6 @@ for use in Emacs bug reports.
hiding character but the default `.' can be used by let-binding the
variable `read-hide-char'.
-** New possible value for `system-type': nacl.
-
** Emacs can now load shared/dynamic libraries (modules).
A dynamic Emacs module is a shared library that provides additional
functionality for use in Emacs Lisp programs, just like a package
@@ -1320,6 +1318,10 @@ standard-display-table, and encode output using locale-coding-system.
+++
** New var `truncate-string-ellipsis' to choose how to indicate truncation.
++++
+** New possible value for `system-type': `nacl'.
+This is used by Google's Native Client (NaCl).
+
** Miscellaneous name change
For consistency with the usual Emacs spelling, the Lisp variable