Merge pull request #809 from alxrem/master

fix typos

CHANGELOG.md

@@ -244,7 +244,7 @@ Read this for more info:
 - More graphite function definitions
 - More graphite function definitions
 - Make "ms" axis format include hour, day, weeks, month and year ([Issue #149](https://github.com/grafana/grafana/issues/149))
 - Make "ms" axis format include hour, day, weeks, month and year ([Issue #149](https://github.com/grafana/grafana/issues/149))
 - Microsecond axis format ([Issue #146](https://github.com/grafana/grafana/issues/146))
 - Microsecond axis format ([Issue #146](https://github.com/grafana/grafana/issues/146))
-- Specify template paramaters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123))
+- Specify template parameters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123))
 
 
 ### Fixes
 ### Fixes
 - Basic Auth fix ([Issue #152](https://github.com/grafana/grafana/issues/152))
 - Basic Auth fix ([Issue #152](https://github.com/grafana/grafana/issues/152))

src/app/partials/graphite/editor.html

@@ -108,7 +108,7 @@
 				</li>
 				</li>
 				<li class="grafana-target-segment">
 				<li class="grafana-target-segment">
 					<a ng-click="toggleEditorHelp(2);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
 					<a ng-click="toggleEditorHelp(2);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
-						series as paramaters
+						series as parameters
 					</a>
 					</a>
 				</li>
 				</li>
 				<li class="grafana-target-segment">
 				<li class="grafana-target-segment">