Auto merge of #154812 - kaepr:fira-mono-license, r=<try>

Update Fira Mono License Information


try-job: i686-msvc-2

Author: bors

license-metadata.json

@@ -114,10 +114,10 @@
               {
                 "directories": [],
                 "files": [
+                  "Fira-LICENSE.txt",
                   "FiraMono-Medium.woff2",
                   "FiraMono-Regular.woff2",
                   "FiraSans-Italic.woff2",
-                  "FiraSans-LICENSE.txt",
                   "FiraSans-Medium.woff2",
                   "FiraSans-MediumItalic.woff2",
                   "FiraSans-Regular.woff2"

src/librustdoc/build.rs

@@ -27,7 +27,7 @@ fn main() {
         "static/fonts/FiraSans-MediumItalic.woff2",
         "static/fonts/FiraMono-Regular.woff2",
         "static/fonts/FiraMono-Medium.woff2",
-        "static/fonts/FiraSans-LICENSE.txt",
+        "static/fonts/Fira-LICENSE.txt",
         "static/fonts/SourceSerif4-Regular.ttf.woff2",
         "static/fonts/SourceSerif4-Semibold.ttf.woff2",
         "static/fonts/SourceSerif4-Bold.ttf.woff2",

src/librustdoc/html/static/COPYRIGHT.txt

@@ -4,15 +4,16 @@ These documentation pages include resources by third parties. This copyright
 file applies only to those resources. The following third party resources are
 included, and carry their own copyright notices and license terms:
 
-* Fira Sans (FiraSans-Regular.woff2, FiraSans-Medium.woff2):
+* Fira (FiraSans-Regular.woff2, FiraSans-Medium.woff2,
+        FiraMono-Regular.woff2, FiraMono-Medium.woff2):
 
     Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
-    with Reserved Font Name Fira Sans.
+    with Reserved Font Name < Fira >.
 
     Copyright (c) 2014, Telefonica S.A.
 
     Licensed under the SIL Open Font License, Version 1.1.
-    See FiraSans-LICENSE.txt.
+    See Fira-LICENSE.txt.
 
 * rustdoc.css, main.js, and playpen.js:
 

…c/html/static/fonts/FiraSans-LICENSE.txt …stdoc/html/static/fonts/Fira-LICENSE.txtsrc/librustdoc/html/static/fonts/FiraSans-LICENSE.txt renamed to src/librustdoc/html/static/fonts/Fira-LICENSE.txt src/librustdoc/html/static/fonts/FiraSans-LICENSE.txt renamed to src/librustdoc/html/static/fonts/Fira-LICENSE.txt

@@ -97,7 +97,7 @@ static_files! {
     fira_sans_medium_italic => "static/fonts/FiraSans-MediumItalic.woff2",
     fira_mono_regular => "static/fonts/FiraMono-Regular.woff2",
     fira_mono_medium => "static/fonts/FiraMono-Medium.woff2",
-    fira_sans_license => "static/fonts/FiraSans-LICENSE.txt",
+    fira_license => "static/fonts/Fira-LICENSE.txt",
     source_serif_4_regular => "static/fonts/SourceSerif4-Regular.ttf.woff2",
     source_serif_4_semibold => "static/fonts/SourceSerif4-Semibold.ttf.woff2",
     source_serif_4_bold => "static/fonts/SourceSerif4-Bold.ttf.woff2",