Cross-link FAQs and update links

Author: foolip

CONTRIBUTING.md

@@ -6,7 +6,7 @@ The HTML Standard is quite complex and people notice minor and larger issues wit
 
 We label [good first bugs](https://github.com/whatwg/html/labels/good%20first%20bug) that you could help us fix, to get a taste for how to submit pull requests, how the build process works, and so on.
 
-We'd be happy to mentor you through this process. If you're interested and need help getting started, leave a comment on the issue or bug, or ask around [on IRC](https://wiki.whatwg.org/wiki/IRC). The [WHATWG FAQ](https://wiki.whatwg.org/wiki/FAQ) may also be helpful.
+We'd be happy to mentor you through this process. If you're interested and need help getting started, leave a comment on the issue or bug, or ask around [on IRC](https://wiki.whatwg.org/wiki/IRC). The [FAQ](FAQ.md) may also be helpful.
 
 ## Pull requests
 

FAQ.md

@@ -1,5 +1,7 @@
 # HTML Standard FAQ
 
+_See also the [WHATWG FAQ](https://whatwg.org/faq)._
+
 ## HTML
 
 ### What is HTML?

source

@@ -234,7 +234,7 @@
      <a href="https://github.com/whatwg/html/wiki/Translations"><span data-x=""><strong>Translations</strong> <code data-x="">日本語 • 简体中文</code></span></a>
     </div>
     <div>
-     <a class="misc" href="https://whatwg.org/faq"><span data-x=""><strong>FAQ</strong> <code data-x="">whatwg.org/faq</code></span></a>
+     <a class="misc" href="https://github.com/whatwg/html/blob/master/FAQ.md"><span data-x=""><strong>FAQ</strong> <code data-x="">on GitHub</code></span></a>
      <a class="comms" href="https://wiki.whatwg.org/wiki/IRC"><span data-x=""><strong>Join us on IRC</strong> <code data-x="">#whatwg on Freenode</code></span></a>
     </div>
     <div>