Rollup of 7 pull requests

src/librustdoc/html/render.rs

@@ -930,13 +930,13 @@ themePicker.onblur = handleThemeButtonsBlur;
           static_files::source_serif_pro::BOLD)?;
     write(cx.dst.join("SourceSerifPro-It.ttf.woff"),
           static_files::source_serif_pro::ITALIC)?;
-    write(cx.dst.join("SourceSerifPro-LICENSE.txt"),
+    write(cx.dst.join("SourceSerifPro-LICENSE.md"),
           static_files::source_serif_pro::LICENSE)?;
     write(cx.dst.join("SourceCodePro-Regular.woff"),
           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.txt"),
+    write(cx.dst.join("SourceCodePro-LICENSE.md"),
           static_files::source_code_pro::LICENSE)?;
     write(cx.dst.join("LICENSE-MIT.txt"),
           static_files::LICENSE_MIT)?;

src/librustdoc/html/static/FiraSans-LICENSE.txt

@@ -1,10 +1,5 @@
-Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
-with Reserved Font Name Fira Sans.
-
-Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
-with Reserved Font Name Fira Mono.
-
-Copyright (c) 2014, Telefonica S.A.
+Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
+with Reserved Font Name < Fira >, 
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
@@ -24,7 +19,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

src/librustdoc/html/static/SourceCodePro-LICENSE.txt → src/librustdoc/html/static/SourceCodePro-LICENSE.md

@@ -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

src/librustdoc/html/static/SourceSerifPro-LICENSE.txt → src/librustdoc/html/static/SourceSerifPro-LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+Copyright 2014-2018 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 

src/librustdoc/html/static_files.rs

@@ -91,7 +91,7 @@ pub mod source_serif_pro {
     pub static ITALIC: &'static [u8] = include_bytes!("static/SourceSerifPro-It.ttf.woff");
 
     /// The file `SourceSerifPro-LICENSE.txt`, the license text for the Source Serif Pro font.
-    pub static LICENSE: &'static [u8] = include_bytes!("static/SourceSerifPro-LICENSE.txt");
+    pub static LICENSE: &'static [u8] = include_bytes!("static/SourceSerifPro-LICENSE.md");
 }
 
 /// Files related to the Source Code Pro font.
@@ -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.txt");
+    pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.md");
 }
 
 /// Files related to the sidebar in rustdoc sources.