diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-01 18:30:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-01 18:31:10 -0700 |
| commit | 8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e (patch) | |
| tree | ab69af4b27f6e323bb5a6daaed764c47393a6b80 /doc/misc/gpl.texi | |
| parent | 60b7668b89ff00213dd8f66b54698b6ddecb427b (diff) | |
| download | emacs-8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e.tar.gz emacs-8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e.tar.bz2 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 'doc/misc/gpl.texi')
| -rw-r--r-- | doc/misc/gpl.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/misc/gpl.texi b/doc/misc/gpl.texi index 0e2e212acb1..c007dc06966 100644 --- a/doc/misc/gpl.texi +++ b/doc/misc/gpl.texi @@ -5,7 +5,7 @@ @c hence no sectioning command or @node. @display -Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/} +Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{https://fsf.org/} Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -684,7 +684,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see @url{http://www.gnu.org/licenses/}. +along with this program. If not, see @url{https://www.gnu.org/licenses/}. @end smallexample Also add information on how to contact you by electronic and paper mail. @@ -707,11 +707,11 @@ use an ``about box''. You should also get your employer (if you work as a programmer) or school, if any, to sign a ``copyright disclaimer'' for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -@url{http://www.gnu.org/licenses/}. +@url{https://www.gnu.org/licenses/}. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But -first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}. +first, please read @url{https://www.gnu.org/licenses/why-not-lgpl.html}. |