diff options
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/glossary.texi | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index ae65a9641a6..3e52a58a0e2 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-07-21 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * glossary.texi (GNU, Daemon): Update information. | ||
| 4 | |||
| 1 | 2009-07-19 Juri Linkov <juri@jurta.org> | 5 | 2009-07-19 Juri Linkov <juri@jurta.org> |
| 2 | 6 | ||
| 3 | * custom.texi (Specifying File Variables, Safe File Variables): | 7 | * custom.texi (Specifying File Variables, Safe File Variables): |
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}). | |||
| 302 | See `killing' and `yanking.' | 302 | See `killing' and `yanking.' |
| 303 | 303 | ||
| 304 | @item Daemon | 304 | @item Daemon |
| 305 | A daemon is a standard term for a Unix process that runs in the | 305 | A daemon is a standard term for a system-level process that runs in the |
| 306 | background. Daemons are often started when the system first starts up. | 306 | background. Daemons are often started when the system first starts up. |
| 307 | When Emacs runs in daemon-mode, it runs in the background and does not | 307 | When Emacs runs in daemon-mode, it runs in the background and does not |
| 308 | open a display. You can then connect to it with the | 308 | 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. | |||
| 585 | @xref{Variables}. | 585 | @xref{Variables}. |
| 586 | 586 | ||
| 587 | @item GNU | 587 | @item GNU |
| 588 | GNU is a recursive acronym for GNU's Not Unix. The GNU project aims | 588 | GNU is a recursive acronym for GNU's Not Unix, and it refers to a |
| 589 | to develop a complete operating system that is free software (q.v.@:). | 589 | Unix-compatible operating system which is free software (q.v.@:). |
| 590 | @xref{Manifesto}. For more information, see | 590 | @xref{Manifesto}. GNU is normally used with Linux as the kernel since |
| 591 | Linux works better than the GNU kernel. For more information, see | ||
| 591 | @uref{http://www.gnu.org/, the GNU website}. | 592 | @uref{http://www.gnu.org/, the GNU website}. |
| 592 | 593 | ||
| 593 | @item Graphic Character | 594 | @item Graphic Character |