Rollup merge of #59197 - kornelski:redir, r=steveklabnik

GuillaumeGomez · web-flow · commit 3747868889f0 · 2019-03-26T22:26:40.000+01:00
Exclude old book redirect stubs from search engines Adds `<meta name="robots" content="noindex,follow">` to the `<head>` of old stub pages pointing to the second edition of the book. This is continuation of rust-lang/book#1788
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -331,7 +331,7 @@ fn invoke_rustdoc(
 
     let path = builder.src.join("src/doc").join(markdown);
 
-    let favicon = builder.src.join("src/doc/favicon.inc");
+    let header = builder.src.join("src/doc/redirect.inc");
     let footer = builder.src.join("src/doc/footer.inc");
     let version_info = out.join("version_info.html");
 
@@ -341,7 +341,7 @@ fn invoke_rustdoc(
 
     cmd.arg("--html-after-content").arg(&footer)
         .arg("--html-before-content").arg(&version_info)
-        .arg("--html-in-header").arg(&favicon)
+        .arg("--html-in-header").arg(&header)
         .arg("--markdown-no-toc")
         .arg("--markdown-playground-url")
         .arg("https://play.rust-lang.org/")
diff --git a/src/doc/redirect.inc b/src/doc/redirect.inc
@@ -0,0 +1,2 @@
+<meta name="robots" content="noindex,follow">
+<link rel="shortcut icon" href="https://www.rust-lang.org/favicon.ico">

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<meta name="robots" content="noindex,follow">`
	`2`	`+<link rel="shortcut icon" href="https://www.rust-lang.org/favicon.ico">`