licenses: Sync GNU licenses from upstream.

Not all whitespace changes have been applied, because the new upstream
versions add spurious end-of-line spaces in some cases.

Bug: https://bugs.gentoo.org/673604
Signed-off-by: Ulrich Müller <ulm@gentoo.org>

1 files changed, 13 insertions, 9 deletions

diff --git a/licenses/GPL-3-with-font-exception b/licenses/GPL-3-with-font-exception
index 2ad4c62d9418..2b14281c7864 100644
--- a/licenses/GPL-3-with-font-exception
+++ b/licenses/GPL-3-with-font-exception
@@ -1,13 +1,17 @@
-As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, 
-this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however 
-invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this 
-exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your 
-version.
+As a special exception, if you create a document which uses this font,
+and embed this font or unaltered portions of this font into the
+document, this font does not by itself cause the resulting document to
+be covered by the GNU General Public License. This exception does not
+however invalidate any other reasons why the document might be covered
+by the GNU General Public License. If you modify this font, you may
+extend this exception to your version of the font, but you are not
+obligated to do so. If you do not wish to do so, delete this exception
+statement from your version.
 
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -651,7 +655,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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 <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -670,11 +674,11 @@ might be different; for a GUI interface, you would 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
-<http://www.gnu.org/licenses/>.
+<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
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.