Merge remote-tracking branch 'upstream/master'

css/style.css

@@ -97,7 +97,7 @@ button {  width: auto; overflow: visible; }
 /* JSHint */
 
 body {
-  background-image: url("../img/bg.png");
+  background: #5078a4 url("data:image/png;base64,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");
   color: #f6f6f6;
   font-family: "Droid Sans", Arial, Serif;
 }

index.html

@@ -12,8 +12,7 @@
     <meta name="designer" content="Jamie Gillar">
     <meta name="designer" content="Divya Manian">
 
-    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold">
-    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Inconsolata">
+    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold|Inconsolata">
     <link rel="stylesheet" href="css/style.css">
 
     <script src="js/jquery.js"></script>
@@ -36,10 +35,9 @@ <h1>JSHint</h1>
     </header>
 
     <article>
-      <p>JSHint is a tool that analyzes JavaScript programs and detects various errors.
-      It works by parsing the source code, not running it, so it can emulate different
-      execution environments. JSHint is very flexible so you can easily adjust it to
-      your project's coding conventions.</p>
+      <p>JSHint is a community-driven tool that detects errors in JavaScript code and
+      enforces your team's coding conventions. It is very flexible so you can easily adjust
+      it to your particular coding guidelines and the environment you expect your code to execute in.</p>
 
       <p>JSHint is an open-source project that is supported and maintained by the
       JavaScript developer community. The source code is available on <a href="http://github.com/jshint/jshint/">GitHub</a>.</p>
@@ -148,7 +146,7 @@ <h4>Environment:</h4>
             <input type="checkbox" name="widget" id="option_widget">
             <label for="option_widget">Yahoo! Widget</label>
           </div>
-          <p>Want an option for something else? <a href="https://github.com/jshint/site/issues">Create a ticket</a></p>
+          <p>Want an option for something else? <a href="https://github.com/jshint/jshint/issues">Create a ticket</a></p>
         </div>
 
         <div class="output wrapper hidden">
@@ -375,7 +373,7 @@ <h2>nonew</h2>
 
           <p><code>new UIWindow();</code></p>
 
-          <p>Since people use the abive in their projects without error we made the
+          <p>Since people use the above in their projects without error we made the
           prohibition an opt-in option.</p>
         </article>
 
@@ -451,7 +449,7 @@ <h2>white</h2>
     </section>
 
     <footer class="clearfix">
-      <p>JSHint, by JSHint Community.</p>
+      <p>JSHint, by the JSHint Community. <small style="padding-left:20px;">JSLint, which this is a <abbr title="JSHint was forked from 2010-12-16 edition of JSLint.">fork</abbr> of, is by Douglas Crockford.</small></p>
     </footer>
 
     <!-- Templates -->
@@ -491,14 +489,14 @@ <h4>Implied globals:</h4>
       <cite>Friedrich Nietzsche</cite>
     </script>
 
-    <script type="text/javascript">
+    <script>
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', 'UA-126146-15']);
       _gaq.push(['_trackPageview']);
 
       (function() {
         var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        ga.src = '//www.google-analytics.com/ga.js';
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
       })();
     </script>