summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2009-07-22 02:37:28 +0000
committerGlenn Morris <rgm@gnu.org>2009-07-22 02:37:28 +0000
commit58933d85604646669147b921c81374fde43e9bea (patch)
treeeed36cb83ebf1443c8e4add68cb617fd00f66145
parentd9e57496e50fcc571e68c0e487f6436fc1f47aef (diff)
downloademacs-58933d85604646669147b921c81374fde43e9bea.tar.gz
Richard M. Stallman <rms at gnu.org>
(GNU, Daemon): Update information.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/glossary.texi9
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index be2253271d5..c4140d9ded3 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-22 Richard Stallman <rms@gnu.org>
+
+ * glossary.texi (GNU, Daemon): Update information.
+
2009-07-21 Chong Yidong <cyd@stupidchicken.com>
* frames.texi (Cut/Paste Other App): Remove discussion of
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index 1f3ee4d1f23..397482e6f1e 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -302,7 +302,7 @@ or by rebinding key sequences (@pxref{Keymaps}).
See `killing' and `yanking.'
@item Daemon
-A daemon is a standard term for a Unix process that runs in the
+A daemon is a standard term for a system-level process that runs in the
background. Daemons are often started when the system first starts up.
When Emacs runs in daemon-mode, it runs in the background and does not
open a display. You can then connect to it with the
@@ -585,9 +585,10 @@ that do not have their own local (q.v.@:) values for the variable.
@xref{Variables}.
@item GNU
-GNU is a recursive acronym for GNU's Not Unix. The GNU project aims
-to develop a complete operating system that is free software (q.v.@:).
-@xref{Manifesto}. For more information, see
+GNU is a recursive acronym for GNU's Not Unix, and it refers to a
+Unix-compatible operating system which is free software (q.v.@:).
+@xref{Manifesto}. GNU is normally used with Linux as the kernel since
+Linux works better than the GNU kernel. For more information, see
@uref{http://www.gnu.org/, the GNU website}.
@item Graphic Character