Merge branch 'master' of github.com:kitematic/kitematic

docs/faq.md

@@ -21,8 +21,7 @@ software released under the Apache 2.0 license.
 ### How can I contribute to Kitematic?
 
 We always welcome (and deeply appreciate!) new contributions to the project. The
-best way to start contributing to Kitematic is to review our doc on
-[contributing](https://github.com/kitematic/kitematic/blob/master/CONTRIBUTING.md).
+best way to start contributing to Kitematic is to review our doc on <a href="https://github.com/kitematic/kitematic/blob/master/CONTRIBUTING.md">contributing</a>.
 
 ### How does Kitematic work with Docker?
 
@@ -31,8 +30,9 @@ the Docker Remote API.
 
 ### Which platforms does Kitematic support?
 
-Right now Kitematic works on Mac OS X and Windows. Linux is planned in the future.  Review our product 
-[roadmap](https://github.com/kitematic/kitematic/blob/master/ROADMAP.md) for more information.
+Right now Kitematic works on Mac OS X and Windows. Linux is planned in the
+future.  Review our product <a
+href="https://github.com/kitematic/kitematic/blob/master/ROADMAP.md">roadmap</a>.
 
 ### Why does Kitematic collect usage analytics and bug reports?
 

docs/known-issues.md

@@ -29,8 +29,8 @@ commands on the command line:
 - `docker-machine create -d virtualbox dev`
 
 Then re-open Kitematic. This usually fixes the issue, but if it persists, feel
-free to view our [existing GitHub
-issues](https://github.com/kitematic/kitematic/issues?q=is%3Aopen+is%3Aissue+label%3Abug).
+free to view our <a href="https://github.com/kitematic/kitematic/issues?q=is%3Aopen+is%3Aissue+label%3Abug">existing GitHub
+issues</a>.
 
 ## Contributing Fixes
 
@@ -46,6 +46,5 @@ if you're looking to help fix specific issues around VM provisioning.
 
 ## View All Issues
 
-For a full list of Kitematic bugs or issues see our [GitHub
-issues](https://github.com/kitematic/kitematic/issues?q=is%3Aopen+is%3Aissue+label%3Abug)
-labelled as `bug`.
+For a full list of Kitematic bugs or issues see our <a href="https://github.com/kitematic/kitematic/issues?q=is%3Aopen+is%3Aissue+label%3Abug">existing GitHub
+issues</a> labelled as `bug`.

src/components/About.react.js

@@ -27,13 +27,15 @@ var Preferences = React.createClass({
       <div className="preferences">
         <div className="about-content">
           <a onClick={this.handleGoBackClick}>Go Back</a>
-          <h3>Installed Software</h3>
           <div className="items">
             <div className="item">
               <RetinaImage src="cartoon-kitematic.png"/>
               <h4>Docker {packages.name}</h4>
               <p>{packages.version}</p>
             </div>
+          </div>
+          <h3>Kitematic is built with:</h3>
+          <div className="items">
             <div className="item">
               <RetinaImage src="cartoon-docker.png"/>
               <h4>Docker Engine</h4>
@@ -44,11 +46,6 @@ var Preferences = React.createClass({
               <h4>Docker Machine</h4>
               <p>{packages["docker-machine-version"]}</p>
             </div>
-            <div className="item">
-              <RetinaImage src="cartoon-docker-compose.png"/>
-              <h4>Docker Compose</h4>
-              <p>{packages["docker-compose-version"]}</p>
-            </div>
           </div>
           <h3>Third-Party Software</h3>
           <div className="items">
@@ -57,6 +54,12 @@ var Preferences = React.createClass({
               <p>{packages["virtualbox-version"]}</p>
             </div>
           </div>
+          <div className="items">
+            <div className="item">
+              <h4>Electron</h4>
+              <p>{packages["electron-version"]}</p>
+            </div>
+          </div>
         </div>
       </div>
     );