Merge remote-tracking branch 'upstream/master'

src/app/partials/dashLoader.html

@@ -40,7 +40,7 @@
         <li ng-show='dashboard.current.loader.load_gist'>
           <h5>Gist <tip>Enter a gist number or url</tip></h5>
           <form>
-            <input type="text" ng-model="gist.url"/ placeholder="Gist number or URL"><br>
+            <input type="text" ng-model="gist.url" placeholder="Gist number or URL"><br>
             <button class="btn" ng-click="gist_dblist(dashboard.gist_id(gist.url))" ng-show="dashboard.is_gist(gist.url)"><i class="icon-github-alt"></i> Get gist:{{gist.url | gistid}}</button>
             <h6 ng-show="gist.files.length">Dashboards in gist:{{gist.url | gistid}} <small>click to load</small></h6>
             <h6 ng-hide="gist.files.length || !gist.url.length">No gist dashboards found</h6>

src/config.js

@@ -18,7 +18,7 @@ function (Settings) {
      * The URL to your elasticsearch server. You almost certainly don't
      * want +http://localhost:9200+ here. Even if Kibana and Elasticsearch are on
      * the same host. By default this will attempt to reach ES at the same host you have
-     * elasticsearch installed on. You probably want to set it to the FQDN of your
+     * kibana installed on. You probably want to set it to the FQDN of your
      * elasticsearch host
      */
     elasticsearch: "http://"+window.location.hostname+":9200",

tasks/docs_task.js

@@ -1,4 +1,3 @@
-// Lint and build CSS
 module.exports = function(grunt) {
   grunt.registerTask('docs', ['clean:docs', 'scratchy:docs']);
 };