diff options
| author | Glenn Morris | 2008-05-16 05:22:47 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-05-16 05:22:47 +0000 |
| commit | 97c0352c515bc9501132e52b506aa58f2211c2c2 (patch) | |
| tree | 19d950c24a8b9bf567157f8c0fca1ae872058e1d /doc/man | |
| parent | a58041570c73483f0281893e15b8f52394d6484a (diff) | |
| download | emacs-97c0352c515bc9501132e52b506aa58f2211c2c2.tar.gz emacs-97c0352c515bc9501132e52b506aa58f2211c2c2.zip | |
Switch to recommended form of GPLv3 permissions notice.
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/ChangeLog | 10 | ||||
| -rw-r--r-- | doc/man/emacs.1 | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 8a3a196d71d..c82a77d9973 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog | |||
| @@ -30,10 +30,10 @@ | |||
| 30 | 30 | ||
| 31 | This file is part of GNU Emacs. | 31 | This file is part of GNU Emacs. |
| 32 | 32 | ||
| 33 | GNU Emacs is free software; you can redistribute it and/or modify | 33 | GNU Emacs is free software: you can redistribute it and/or modify |
| 34 | it under the terms of the GNU General Public License as published by | 34 | it under the terms of the GNU General Public License as published by |
| 35 | the Free Software Foundation; either version 3, or (at your option) | 35 | the Free Software Foundation, either version 3 of the License, or |
| 36 | any later version. | 36 | (at your option) any later version. |
| 37 | 37 | ||
| 38 | GNU Emacs is distributed in the hope that it will be useful, | 38 | GNU Emacs is distributed in the hope that it will be useful, |
| 39 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 39 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -41,8 +41,6 @@ | |||
| 41 | GNU General Public License for more details. | 41 | GNU General Public License for more details. |
| 42 | 42 | ||
| 43 | You should have received a copy of the GNU General Public License | 43 | You should have received a copy of the GNU General Public License |
| 44 | along with GNU Emacs; see the file COPYING. If not, write to the | 44 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 45 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 46 | Boston, MA 02110-1301, USA. | ||
| 47 | 45 | ||
| 48 | ;; arch-tag: 2bd1112e-157f-4884-b0ca-0fb1057972d7 | 46 | ;; arch-tag: 2bd1112e-157f-4884-b0ca-0fb1057972d7 |
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index eac290c07a5..73ecae18f28 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 | |||
| @@ -4,10 +4,10 @@ | |||
| 4 | .\" | 4 | .\" |
| 5 | .\" This file is part of GNU Emacs. | 5 | .\" This file is part of GNU Emacs. |
| 6 | .\" | 6 | .\" |
| 7 | .\" GNU Emacs is free software; you can redistribute it and/or modify | 7 | .\" GNU Emacs is free software: you can redistribute it and/or modify |
| 8 | .\" it under the terms of the GNU General Public License as published by | 8 | .\" it under the terms of the GNU General Public License as published by |
| 9 | .\" the Free Software Foundation; either version 3, or (at your option) | 9 | .\" the Free Software Foundation, either version 3 of the License, or |
| 10 | .\" any later version. | 10 | .\" (at your option) any later version. |
| 11 | .\" | 11 | .\" |
| 12 | .\" GNU Emacs is distributed in the hope that it will be useful, | 12 | .\" GNU Emacs is distributed in the hope that it will be useful, |
| 13 | .\" but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | .\" but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -15,9 +15,7 @@ | |||
| 15 | .\" GNU General Public License for more details. | 15 | .\" GNU General Public License for more details. |
| 16 | .\" | 16 | .\" |
| 17 | .\" You should have received a copy of the GNU General Public License | 17 | .\" You should have received a copy of the GNU General Public License |
| 18 | .\" along with GNU Emacs; see the file COPYING. If not, write to the | 18 | .\" along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 19 | .\" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 20 | .\" Boston, MA 02110-1301, USA. | ||
| 21 | .\" | 19 | .\" |
| 22 | '\" t | 20 | '\" t |
| 23 | .TH EMACS 1 "2007 April 13" "GNU Emacs 23.0.60" | 21 | .TH EMACS 1 "2007 April 13" "GNU Emacs 23.0.60" |