cleanup, fixes, addresses some comments in #27

FAQ: Fix indentation ES6: Add arrow functions to behind-a-flag ES6: More concise v8 version check ES6: Remove v8-update-plans section
nodejs · Jan 13, 2015 · cddc13c · cddc13c
1 parent 3247ac0
commit cddc13c
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 52 deletions.
diff --git a/es6.html b/es6.html
@@ -79,9 +79,9 @@ <h2 class="faq-title">
       <div class="faq-body">
         <ul class="task-list">
           <li><a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/class">Classes</a> (strict mode only)</li>
-          <li><a href="http://wiki.ecmascript.org/doku.php?id=harmony:object_literals">Object literal extensions</a></li>
-          <li>
-          <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol"><code>Symbol.toStringTag</code></a> (user-definable results for <code>Object.prototype.toString</code>)</li>
+          <li><a href="https://github.com/lukehoban/es6features#enhanced-object-literals">Object literal extensions</a></li>
+          <li><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol"><code>Symbol.toStringTag</code></a> (user-definable results for <code>Object.prototype.toString</code>)</li>
+          <li><a href="https://github.com/lukehoban/es6features#arrows"><code>Arrow Functions</code></a></li>
         </ul>
       </div>
     </div>
@@ -103,23 +103,13 @@ <h2 class="faq-title">
       </h2>
       <div class="faq-body">
         <p>io.js provides a simple way to list all dependencies and respective versions that ship with a specific binary through the <code>process</code> global object. In case of the V8 engine, type the following in your terminal to retrieve its version:</p>
-        <div class="highlight highlight-sh"><pre>iojs -e <span class="pl-s1"><span class="pl-pds">'</span>console.log(process.versions.v8)<span class="pl-pds">'</span></span></pre></div>
+        <div class="highlight highlight-sh"><pre>iojs -p process.versions.v8</span></pre></div>
 
         <p>E.g. output: <code>3.31.71.4</code>.</p>
 
       </div>
     </div>
 
-    <div class="faq-item">
-
-      <h2 class="faq-title">
-         How frequently do you plan on updating V8?
-      </h2>
-      <div class="faq-body">
-        <p>A formal plan has not been discussed yet but the TC is looking into regular updates, especially if there are no breaking changes from V8's API.</p>
-      </div>
-    </div>
-
     <nav>
       <a href="faq.html">FAQ</a>
       <a href="https://github.com/iojs/io.js/issues">Github Issues</a>

diff --git a/faq.html b/faq.html
@@ -22,44 +22,44 @@
 
     <h1 class="heading">FAQ</h1>
 
-      <h2>
-        What is io.js?
-      </h2>
-      <p>
-        <a href="https://github.com/iojs/io.js">io.js</a> is a JavaScript platform that is compatible with <a href="https://nodejs.org">Node.js</a> &amp; <a href="https://www.npmjs.org/">npm</a>.
-      </p>
-
-
-      <h2>
-        How can I contribute?
-      </h2>
-      <p>
-        Everyone can help.
-        io.js adheres to a <a href="https://github.com/iojs/io.js/blob/master/CONTRIBUTING.md#code-of-conduct">code of conduct</a>, and contributions, releases, and contributorship are under an <a href="https://github.com/iojs/io.js/blob/v0.12/CONTRIBUTING.md#governance">open governance</a> model.
-      </p>
-      <p>
-        To get started, there are open <a href="https://github.com/iojs/io.js/issues"> discussions on github</a>, and we'd love to hear your feedback.
-        Becoming invloved in discussions is a good way to get a feel of where you can help out further. If there is
-        something there you feel you can tackle, please <a href="https://github.com/iojs/io.js/blob/v0.12/CONTRIBUTING.md#code-contributions">make a pull request</a>.
-
-
-        In addition, using <a href="http://nodebug.me">Nodebug.me</a> is a good way to help Triage the issues in the backlog.
-      </p>
-
-      <h2>
-        Where do discussons take place?
-      </h2>
-      <p>
-        There is an #io.js channel on Freenode IRC. We keep logs of the channel <a target="_blank" href="http://logs.libuv.org/io.js/latest">here</a>.
-      </p>
-
-
-      <h2>
-        What is open source governance?
-      </h2>
-      <p>
-        Open source governance advocates the application of the philosophies of the open source and open content movements in order to enable any interested party to add to the creation of the end product, as with a wiki document. Legislation is democratically opened to the general citizenry, employing their collective wisdom to benefit the decision-making process and improve democracy. <a href="http://en.wikipedia.org/wiki/Open-source_governance" target="_blank">[source]</a>
-      </p>
+    <h2>
+      What is io.js?
+    </h2>
+    <p>
+      <a href="https://github.com/iojs/io.js">io.js</a> is a JavaScript platform that is compatible with <a href="https://nodejs.org">Node.js</a> &amp; <a href="https://www.npmjs.org/">npm</a>.
+    </p>
+
+
+    <h2>
+      How can I contribute?
+    </h2>
+    <p>
+      Everyone can help.
+      io.js adheres to a <a href="https://github.com/iojs/io.js/blob/master/CONTRIBUTING.md#code-of-conduct">code of conduct</a>, and contributions, releases, and contributorship are under an <a href="https://github.com/iojs/io.js/blob/v0.12/CONTRIBUTING.md#governance">open governance</a> model.
+    </p>
+    <p>
+      To get started, there are open <a href="https://github.com/iojs/io.js/issues"> discussions on github</a>, and we'd love to hear your feedback.
+      Becoming invloved in discussions is a good way to get a feel of where you can help out further. If there is
+      something there you feel you can tackle, please <a href="https://github.com/iojs/io.js/blob/v0.12/CONTRIBUTING.md#code-contributions">make a pull request</a>.
+
+
+      In addition, using <a href="http://nodebug.me">Nodebug.me</a> is a good way to help Triage the issues in the backlog.
+    </p>
+
+    <h2>
+      Where do discussons take place?
+    </h2>
+    <p>
+      There is an #io.js channel on Freenode IRC. We keep logs of the channel <a target="_blank" href="http://logs.libuv.org/io.js/latest">here</a>.
+    </p>
+
+
+    <h2>
+      What is open source governance?
+    </h2>
+    <p>
+      Open source governance advocates the application of the philosophies of the open source and open content movements in order to enable any interested party to add to the creation of the end product, as with a wiki document. Legislation is democratically opened to the general citizenry, employing their collective wisdom to benefit the decision-making process and improve democracy. <a href="http://en.wikipedia.org/wiki/Open-source_governance" target="_blank">[source]</a>
+    </p>
 
     <nav>
       <a href="faq.html">FAQ</a>