aboutsummaryrefslogtreecommitdiffstats
path: root/lib/COPYING
diff options
context:
space:
mode:
authorPaul Eggert2017-10-01 18:30:44 -0700
committerPaul Eggert2017-10-01 18:31:10 -0700
commit8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e (patch)
treeab69af4b27f6e323bb5a6daaed764c47393a6b80 /lib/COPYING
parent60b7668b89ff00213dd8f66b54698b6ddecb427b (diff)
downloademacs-8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e.tar.gz
emacs-8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e.zip
Merge from Gnulib
This is mostly to change http: to https: in licenses. * COPYING, build-aux/config.guess, build-aux/config.sub: * doc/emacs/doclicense.texi, doc/emacs/gpl.texi: * doc/lispintro/doclicense.texi, doc/lispref/doclicense.texi: * doc/lispref/gpl.texi, doc/misc/doclicense.texi: * doc/misc/gpl.texi, etc/COPYING, leim/COPYING: * lib-src/COPYING, lib/COPYING, lisp/COPYING, lwlib/COPYING: * msdos/COPYING, nt/COPYING, src/COPYING: Copy from Gnulib.
Diffstat (limited to 'lib/COPYING')
-rw-r--r--lib/COPYING8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/COPYING b/lib/COPYING
index 94a9ed024d3..f288702d2fa 100644
--- a/lib/COPYING
+++ b/lib/COPYING
@@ -1,7 +1,7 @@
1 GNU GENERAL PUBLIC LICENSE 1 GNU GENERAL PUBLIC LICENSE
2 Version 3, 29 June 2007 2 Version 3, 29 June 2007
3 3
4 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> 4 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5 Everyone is permitted to copy and distribute verbatim copies 5 Everyone is permitted to copy and distribute verbatim copies
6 of this license document, but changing it is not allowed. 6 of this license document, but changing it is not allowed.
7 7
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
645 GNU General Public License for more details. 645 GNU General Public License for more details.
646 646
647 You should have received a copy of the GNU General Public License 647 You should have received a copy of the GNU General Public License
648 along with this program. If not, see <http://www.gnu.org/licenses/>. 648 along with this program. If not, see <https://www.gnu.org/licenses/>.
649 649
650Also add information on how to contact you by electronic and paper mail. 650Also add information on how to contact you by electronic and paper mail.
651 651
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
664 You should also get your employer (if you work as a programmer) or school, 664 You should also get your employer (if you work as a programmer) or school,
665if any, to sign a "copyright disclaimer" for the program, if necessary. 665if any, to sign a "copyright disclaimer" for the program, if necessary.
666For more information on this, and how to apply and follow the GNU GPL, see 666For more information on this, and how to apply and follow the GNU GPL, see
667<http://www.gnu.org/licenses/>. 667<https://www.gnu.org/licenses/>.
668 668
669 The GNU General Public License does not permit incorporating your program 669 The GNU General Public License does not permit incorporating your program
670into proprietary programs. If your program is a subroutine library, you 670into proprietary programs. If your program is a subroutine library, you
671may consider it more useful to permit linking proprietary applications with 671may consider it more useful to permit linking proprietary applications with
672the library. If this is what you want to do, use the GNU Lesser General 672the library. If this is what you want to do, use the GNU Lesser General
673Public License instead of this License. But first, please read 673Public License instead of this License. But first, please read
674<http://www.gnu.org/philosophy/why-not-lgpl.html>. 674<https://www.gnu.org/licenses/why-not-lgpl.html>.