diff options
| author | Glenn Morris | 2008-06-15 02:08:36 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-06-15 02:08:36 +0000 |
| commit | 47a3002387cb3ae865b4f8c8d075e641e125972b (patch) | |
| tree | ee0c1c2af145adf491d04300a8e06f1495bc01b8 /doc | |
| parent | 091f8bc1fc6b80b37f917f64717c36b12c455fa7 (diff) | |
| download | emacs-47a3002387cb3ae865b4f8c8d075e641e125972b.tar.gz emacs-47a3002387cb3ae865b4f8c8d075e641e125972b.zip | |
Use a verbatim license for this invariant section, as per etc/GNU.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/gnu.texi | 30 |
2 files changed, 14 insertions, 21 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 941d6b98e53..f109a2b8f30 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-06-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * gnu.texi: Use a verbatim license for this invariant section, | ||
| 4 | as per etc/GNU. | ||
| 5 | |||
| 1 | 2008-06-13 Daniel Engeler <engeler@gmail.com> | 6 | 2008-06-13 Daniel Engeler <engeler@gmail.com> |
| 2 | 7 | ||
| 3 | * emacs.texi, misc.texi: Add documentation about serial port access. | 8 | * emacs.texi, misc.texi: Add documentation about serial port access. |
diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi index 8640612dbb4..84e6e435db7 100644 --- a/doc/emacs/gnu.texi +++ b/doc/emacs/gnu.texi | |||
| @@ -1,31 +1,19 @@ | |||
| 1 | @c This is part of the Emacs manual. | ||
| 2 | @c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2001, 2002, 2003, 2004, | 1 | @c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2001, 2002, 2003, 2004, |
| 3 | @c 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 2 | @c 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 3 | @c | ||
| 4 | @c Permission is granted to anyone to make or distribute verbatim copies | ||
| 5 | @c of this document, in any medium, provided that the copyright notice and | ||
| 6 | @c permission notice are preserved, and that the distributor grants the | ||
| 7 | @c recipient permission for further redistribution as permitted by this | ||
| 8 | @c notice. | ||
| 9 | @c | ||
| 10 | @c Modified versions may not be made. | ||
| 11 | |||
| 4 | @ifclear justgnu | 12 | @ifclear justgnu |
| 5 | @node Manifesto,, Microsoft Windows, Top | 13 | @node Manifesto,, Microsoft Windows, Top |
| 6 | @unnumbered The GNU Manifesto | 14 | @unnumbered The GNU Manifesto |
| 7 | @end ifclear | 15 | @end ifclear |
| 8 | @ifset justgnu | 16 | @ifset justgnu |
| 9 | Copyright @copyright{} 1985, 1993, 2001, 2002, 2003, 2004, | ||
| 10 | 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
| 11 | |||
| 12 | Permission is granted to copy, distribute and/or modify this document | ||
| 13 | under the terms of the GNU Free Documentation License, Version 1.2 or | ||
| 14 | any later version published by the Free Software Foundation; with no | ||
| 15 | Invariant Sections, with the Front-Cover texts being ``A GNU | ||
| 16 | Manual'', and with the Back-Cover Texts as in (a) below. A copy of the | ||
| 17 | license is included in the section entitled ``GNU Free Documentation | ||
| 18 | License'' in the Emacs manual. | ||
| 19 | |||
| 20 | (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify | ||
| 21 | this GNU Manual, like GNU software. Copies published by the Free | ||
| 22 | Software Foundation raise funds for GNU development.'' | ||
| 23 | |||
| 24 | This document is part of a collection distributed under the GNU Free | ||
| 25 | Documentation License. If you want to distribute this document | ||
| 26 | separately from the collection, you can do so by adding a copy of the | ||
| 27 | license to the document, as described in section 6 of the license. | ||
| 28 | |||
| 29 | @node Top | 17 | @node Top |
| 30 | @top The GNU Manifesto | 18 | @top The GNU Manifesto |
| 31 | @end ifset | 19 | @end ifset |