Mercurial > emacs
changeset 95033:dcdb16dd1b69
Switch to recommended form of GPLv3 permissions notice.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 16 May 2008 05:22:47 +0000 |
| parents | fbe58782bc21 |
| children | 38ec81da0a8b |
| files | doc/man/ChangeLog doc/man/emacs.1 |
| diffstat | 2 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/man/ChangeLog Fri May 16 05:21:48 2008 +0000 +++ b/doc/man/ChangeLog Fri May 16 05:22:47 2008 +0000 @@ -30,10 +30,10 @@ This file is part of GNU Emacs. - GNU Emacs is free software; you can redistribute it and/or modify + GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -41,8 +41,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with GNU Emacs; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;; arch-tag: 2bd1112e-157f-4884-b0ca-0fb1057972d7
--- a/doc/man/emacs.1 Fri May 16 05:21:48 2008 +0000 +++ b/doc/man/emacs.1 Fri May 16 05:22:47 2008 +0000 @@ -4,10 +4,10 @@ .\" .\" This file is part of GNU Emacs. .\" -.\" GNU Emacs is free software; you can redistribute it and/or modify +.\" GNU Emacs is free software: you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation; either version 3, or (at your option) -.\" any later version. +.\" the Free Software Foundation, either version 3 of the License, or +.\" (at your option) any later version. .\" .\" GNU Emacs is distributed in the hope that it will be useful, .\" but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,9 +15,7 @@ .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License -.\" along with GNU Emacs; see the file COPYING. If not, write to the -.\" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -.\" Boston, MA 02110-1301, USA. +.\" along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. .\" '\" t .TH EMACS 1 "2007 April 13" "GNU Emacs 23.0.60"