diff options
| author | Karl Berry | 2009-02-17 19:06:56 +0000 |
|---|---|---|
| committer | Karl Berry | 2009-02-17 19:06:56 +0000 |
| commit | f43a822c7d71202dd2bf7288de75c77af046cb3c (patch) | |
| tree | aeddb3c08d03561825ae67a374db66a6853b45a5 | |
| parent | 80d634b8d99fac25f70c40220f0c509f9224a8f3 (diff) | |
| download | emacs-f43a822c7d71202dd2bf7288de75c77af046cb3c.tar.gz emacs-f43a822c7d71202dd2bf7288de75c77af046cb3c.zip | |
add @insertcopying, bug#1988
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index f18210240b6..96a135e2e18 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-02-17 Karl Berry <karl@gnu.org> | ||
| 2 | |||
| 3 | * emacs.texi (Top): Add @insertcopying before the master menu. | ||
| 4 | (Bug#1988) | ||
| 5 | |||
| 1 | 2009-02-17 Richard M Stallman <rms@gnu.org> | 6 | 2009-02-17 Richard M Stallman <rms@gnu.org> |
| 2 | 7 | ||
| 3 | * anti.texi (Antinews): Mention Babyl format. | 8 | * anti.texi (Antinews): Mention Babyl format. |
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 5ecef62d944..925153fac85 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi | |||
| @@ -132,6 +132,8 @@ Also Running Shell Commands from Emacs | |||
| 132 | and Sending Mail and Registers and Minibuffer. | 132 | and Sending Mail and Registers and Minibuffer. |
| 133 | @end ignore | 133 | @end ignore |
| 134 | 134 | ||
| 135 | @insertcopying | ||
| 136 | |||
| 135 | @menu | 137 | @menu |
| 136 | * Distrib:: How to get the latest Emacs distribution. | 138 | * Distrib:: How to get the latest Emacs distribution. |
| 137 | * Copying:: The GNU General Public License gives you permission | 139 | * Copying:: The GNU General Public License gives you permission |
| @@ -1082,10 +1084,11 @@ What is not allowed is to try to prevent others from further sharing | |||
| 1082 | any version of GNU Emacs that they might get from you. The precise | 1084 | any version of GNU Emacs that they might get from you. The precise |
| 1083 | conditions are found in the GNU General Public License that comes with | 1085 | conditions are found in the GNU General Public License that comes with |
| 1084 | Emacs and also appears in this manual@footnote{This manual is itself | 1086 | Emacs and also appears in this manual@footnote{This manual is itself |
| 1085 | covered by the GNU Free Documentation License. This license is | 1087 | covered by the GNU Free Documentation License (see the reverse title |
| 1086 | similar in spirit to the General Public License, but is more suitable | 1088 | page in the printed manual or view the full source for online formats |
| 1087 | for documentation. @xref{GNU Free Documentation License}.}. | 1089 | to see the precise conditions). This license is similar in spirit to |
| 1088 | @xref{Copying}. | 1090 | the General Public License, but is more suitable for documentation. |
| 1091 | @xref{GNU Free Documentation License}.}. @xref{Copying}. | ||
| 1089 | 1092 | ||
| 1090 | One way to get a copy of GNU Emacs is from someone else who has it. | 1093 | One way to get a copy of GNU Emacs is from someone else who has it. |
| 1091 | You need not ask for our permission to do so, or tell any one else; | 1094 | You need not ask for our permission to do so, or tell any one else; |