Skip to content

Commit 9d96a26

Browse files
committed
Re-use existing Fira(Sans) license for Mono fonts
1 parent 29d70d4 commit 9d96a26

4 files changed

Lines changed: 5 additions & 112 deletions

File tree

license-metadata.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,10 @@
114114
{
115115
"directories": [],
116116
"files": [
117-
"FiraMono-LICENSE.txt",
117+
"Fira-LICENSE.txt",
118118
"FiraMono-Medium.woff2",
119119
"FiraMono-Regular.woff2",
120120
"FiraSans-Italic.woff2",
121-
"FiraSans-LICENSE.txt",
122121
"FiraSans-Medium.woff2",
123122
"FiraSans-MediumItalic.woff2",
124123
"FiraSans-Regular.woff2"

src/librustdoc/html/static/COPYRIGHT.txt

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,16 @@ These documentation pages include resources by third parties. This copyright
44
file applies only to those resources. The following third party resources are
55
included, and carry their own copyright notices and license terms:
66

7-
* Fira Sans (FiraSans-Regular.woff2, FiraSans-Medium.woff2):
7+
* Fira (FiraSans-Regular.woff2, FiraSans-Medium.woff2,
8+
FiraMono-Regular.woff2, FiraMono-Medium.woff2):
89

910
Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
10-
with Reserved Font Name Fira Sans.
11+
with Reserved Font Name < Fira >.
1112

1213
Copyright (c) 2014, Telefonica S.A.
1314

1415
Licensed under the SIL Open Font License, Version 1.1.
15-
See FiraSans-LICENSE.txt.
16-
17-
* Fira Mono (FiraMono-Regular.woff2, FiraMono-Medium.woff2):
18-
19-
Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
20-
with Reserved Font Name Fira Mono.
21-
22-
Copyright (c) 2014, Telefonica S.A.
23-
24-
Licensed under the SIL Open Font License, Version 1.1.
25-
See FiraMono-LICENSE.txt.
16+
See Fira-LICENSE.txt.
2617

2718
* rustdoc.css, main.js, and playpen.js:
2819

File renamed without changes.

src/librustdoc/html/static/fonts/FiraMono-LICENSE.txt

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)