diff options
| -rw-r--r-- | src/librustdoc/html/render.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-LICENSE.txt (renamed from src/librustdoc/html/static/SourceCodePro-LICENSE.md) | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-Regular.woff | bin | 95872 -> 55472 bytes | |||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-Semibold.woff | bin | 95576 -> 55360 bytes | |||
| -rw-r--r-- | src/librustdoc/html/static_files.rs | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index be349de05ca..f4af362a557 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -938,7 +938,7 @@ themePicker.onblur = handleThemeButtonsBlur; static_files::source_code_pro::REGULAR)?; write(cx.dst.join("SourceCodePro-Semibold.woff"), static_files::source_code_pro::SEMIBOLD)?; - write(cx.dst.join("SourceCodePro-LICENSE.md"), + write(cx.dst.join("SourceCodePro-LICENSE.txt"), static_files::source_code_pro::LICENSE)?; write(cx.dst.join("LICENSE-MIT.txt"), static_files::LICENSE_MIT)?; diff --git a/src/librustdoc/html/static/SourceCodePro-LICENSE.md b/src/librustdoc/html/static/SourceCodePro-LICENSE.txt index 1177330426d..07542572e33 100644 --- a/src/librustdoc/html/static/SourceCodePro-LICENSE.md +++ b/src/librustdoc/html/static/SourceCodePro-LICENSE.txt @@ -18,7 +18,7 @@ with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The diff --git a/src/librustdoc/html/static/SourceCodePro-Regular.woff b/src/librustdoc/html/static/SourceCodePro-Regular.woff index 117c7e5142c..5576670903a 100644 --- a/src/librustdoc/html/static/SourceCodePro-Regular.woff +++ b/src/librustdoc/html/static/SourceCodePro-Regular.woff Binary files differdiff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.woff index 270873a86a0..ca972a11dc4 100644 --- a/src/librustdoc/html/static/SourceCodePro-Semibold.woff +++ b/src/librustdoc/html/static/SourceCodePro-Semibold.woff Binary files differdiff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs index 24fe61e977a..3a2c24b1a96 100644 --- a/src/librustdoc/html/static_files.rs +++ b/src/librustdoc/html/static_files.rs @@ -103,7 +103,7 @@ pub mod source_code_pro { pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.woff"); /// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font. - pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.md"); + pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt"); } /// Files related to the sidebar in rustdoc sources. |