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

docs/sources/plugins/index.md

@@ -9,7 +9,7 @@ page_keywords: grafana, plugins, documentation
 From Grafana 3.0 not only datasource plugins are supported but also panel plugins and apps.
 Having panels as plugins make it easy to create and add any kind of panel, to show your data
 or improve your favorite dashboards. Apps is something new in Grafana that enables
-bundling of datasources, panels, dashboards and Grafana pages into a cohesive experiance.
+bundling of datasources, panels, dashboards and Grafana pages into a cohesive experience.
 
 Grafana already have a strong community of contributors and plugin developers.
 By making it easier to develop and install plugins we hope that the community

docs/sources/plugins/panels.md

@@ -7,7 +7,7 @@ page_keywords: grafana, plugins, documentation
 
 # Panels
 
-Panels are the main bulding block of dashboards.
+Panels are the main building blocks of dashboards.
 
 ## Panel development
 

public/app/features/dashboard/dashnav/dashnav.html

@@ -48,7 +48,6 @@
 			<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="editJson();">View JSON</a></li>
 			<li ng-if="contextSrv.isEditor && !dashboard.editable"><a class="pointer" ng-click="makeEditable();">Make Editable</a></li>
 			<li ng-if="contextSrv.isEditor"><a class="pointer" ng-click="saveDashboardAs();">Save As...</a></li>
-      <li ng-if="dashboard.id"><a class="pointer" ng-click="saveDashboardAsHome();">Set As Home</a></li>
 			<li ng-if="dashboardMeta.canSave"><a class="pointer" ng-click="deleteDashboard();">Delete dashboard</a></li>
 		</ul>
 	</li>

public/app/features/plugins/partials/ds_http_settings.html

@@ -8,7 +8,7 @@
 		<input class="gf-form-input max-width-21" type="text" ng-model='current.url' placeholder="for example: http://localhost:8081" ng-pattern="/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/" required></input>
 
 		<info-popover>
-			<p>Specify a complete HTTP url (http://your_server:8080)</p>
+			<p>Specify a complete HTTP url (for example http://your_server:8080)</p>
 			<span ng-show="current.access === 'direct'">
 				Your access method is <em>Direct</em>, this means the url
 				needs to be accessable from the browser.