Make html-differences.whatwg.org redirect

annevk · sideshowbarker · commit 185c63688187 · 2019-09-27T12:53:50.000+09:00
Fixes #100.
diff --git a/debian/marquee/README.md b/debian/marquee/README.md
@@ -3,6 +3,5 @@ marquee hosts simple static sites.
 Repos that deploy to this server:
 - https://github.com/whatwg/books/blob/master/.travis.yml
 - https://github.com/whatwg/figures/blob/master/.travis.yml
-- https://github.com/whatwg/html-differences/blob/master/.travis.yml
 - https://github.com/whatwg/resources.whatwg.org/blob/master/build/deploy.sh (used by many specs)
 - https://github.com/whatwg/whatwg.org/blob/master/.travis.yml
diff --git a/debian/marquee/nginx/sites/html-differences.whatwg.org.conf b/debian/marquee/nginx/sites/html-differences.whatwg.org.conf
@@ -1,6 +1,7 @@
 server {
     server_name html-differences.whatwg.org;
-    root /var/www/html-differences.whatwg.org;
 
     include /etc/nginx/whatwg.conf;
+
+    return 301 https://html.spec.whatwg.org/dev/;
 }
diff --git a/html5.org/index.htm b/html5.org/index.htm
@@ -15,19 +15,17 @@
  <body>
   <h1>html5.org</h1>
   <p>HTML5 is the latest version of HTML and XHTML. The
-  <a href="//html.spec.whatwg.org/multipage/">HTML Standard</a> defines a 
-  single language that can be written in HTML and XML. It attempts to 
-  solve issues found in previous iterations of HTML and addresses the 
-  needs of Web Applications, an area previously not adequately covered by 
+  <a href="https://html.spec.whatwg.org/multipage/">HTML Standard</a> defines a
+  single language that can be written in HTML and XML. It attempts to
+  solve issues found in previous iterations of HTML and addresses the
+  needs of Web Applications, an area previously not adequately covered by
   HTML.</p>
   <p>Here are several resources worth exploring:</p>
   <ul>
-   <li><a href="//html-differences.whatwg.org/">Differences from 
-    HTML4</a></li>
-   <li><a href="//wiki.whatwg.org/wiki/FAQ">WHATWG FAQ</a></li>
-   <li><a href="//platform.html5.org/">The Web Platform</a></li>
-   <li><a href="//html5.validator.nu/">HTML5 validator</a></li>
-   <li><a href="//github.com/whatwg/html">HTML Standard on GitHub</a></li>
+   <li><a href="https://whatwg.org/faq">WHATWG FAQ</a></li>
+   <li><a href="https://platform.html5.org/">The Web Platform</a></li>
+   <li><a href="https://checker.html5.org/">Nu Html Checker</a></li>
+   <li><a href="https://github.com/whatwg/html">HTML Standard on GitHub</a></li>
   </ul>
  </body>
 </html>
diff --git a/test/redirects.js b/test/redirects.js
@@ -68,6 +68,7 @@ const HTTPS_TESTS = [
   ['https://forums.whatwg.org/', 301, 'https://forums.whatwg.org/bb3/'],
   ['https://forums.whatwg.org/bb3/viewtopic.php?f=3&p=8538&sid=1cb9e434c59258d940d476648b0301df', 301, 'https://forums.whatwg.org/bb3/viewtopic.php?f=3&p=8538'],
   ['https://help.whatwg.org/', 301, 'https://html.spec.whatwg.org/dev/', 'drop'],
+  ['https://html-differences.whatwg.org/', 301, 'https://html.spec.whatwg.org/dev/', 'drop'],
   ['https://html.spec.whatwg.org/C', 301, 'https://html.spec.whatwg.org/multipage/', 'keep'],
   ['https://html.spec.whatwg.org/complete', 301, 'https://html.spec.whatwg.org/', 'keep'],
   ['https://html.spec.whatwg.org/complete.html', 301, 'https://html.spec.whatwg.org/'],

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`server {`
`2`	`2`	`server_name html-differences.whatwg.org;`
`3`		`- root /var/www/html-differences.whatwg.org;`
`4`	`3`
`5`	`4`	`include /etc/nginx/whatwg.conf;`
	`5`	`+`
	`6`	`+ return 301 https://html.spec.whatwg.org/dev/;`
`6`	`7`	`}`