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

conf/defaults.ini

@@ -3,6 +3,7 @@
 # Do not modify this file in grafana installs
 #
 
+# possible values : production, development
 app_mode = production
 
 #################################### Paths ####################################

conf/sample.ini

@@ -3,6 +3,7 @@
 # Everything has defaults so you only need to uncomment things you want to
 # change
 
+# possible values : production, development    
 ; app_mode = production
 
 #################################### Paths ####################################

docs/sources/reference/sharing.md

@@ -30,7 +30,8 @@ after a certain time period.
 ## Share Panel
 Click a panel title to open the panel menu, then click share in the panel menu to open the Share Panel dialog. Here you
 have access to a link that will take you to exactly this panel with the current time range and selected template variables.
-You also get a link to service side rendered PNG of the panel. Useful if you want to shara image of the panel.
+You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel.
+Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `vendor/phantomjs/phantomjs`. For Linux, a `phantomjs` binary is included - however, you should ensure that any requisite libraries (e.g. libfontconfig) are available.
 
 ### Embed Panel
 You can embed a panel using an iframe on another web site. This tab will show you the html that you need to use.

public/app/features/org/partials/datasourceHttpConfig.html

@@ -9,7 +9,7 @@
 			<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.server.com:8080" ng-pattern="/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/" required></input>
 		</li>
 		<li class="tight-form-item">
-			Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</label>
+			Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</tip>
 	  </li>
 		<li>
 			<select class="input-medium tight-form-input" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>