diff --git a/pkg/api/index.go b/pkg/api/index.go index a87de4c3a89..e85a928414d 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -33,7 +33,7 @@ func (hs *HTTPServer) getProfileNode(c *models.ReqContext) *dtos.NavLink { if setting.AddChangePasswordLink() { children = append(children, &dtos.NavLink{ - Text: "Change Password", Id: "change-password", Url: hs.Cfg.AppSubURL + "/profile/password", + Text: "Change password", Id: "change-password", Url: hs.Cfg.AppSubURL + "/profile/password", Icon: "lock", HideFromMenu: true, }) } @@ -170,7 +170,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto navTree = append(navTree, &dtos.NavLink{ Text: "Dashboards", Id: "dashboards", - SubTitle: "Manage dashboards & folders", + SubTitle: "Manage dashboards and folders", Icon: "apps", Url: hs.Cfg.AppSubURL + "/", SortWeight: dtos.WeightDashboard, @@ -194,7 +194,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto if setting.AlertingEnabled && (c.OrgRole == models.ROLE_ADMIN || c.OrgRole == models.ROLE_EDITOR) { alertChildNavs := []*dtos.NavLink{ - {Text: "Alert Rules", Id: "alert-list", Url: hs.Cfg.AppSubURL + "/alerting/list", Icon: "list-ul"}, + {Text: "Alert rules", Id: "alert-list", Url: hs.Cfg.AppSubURL + "/alerting/list", Icon: "list-ul"}, { Text: "Notification channels", Id: "channels", Url: hs.Cfg.AppSubURL + "/alerting/notifications", Icon: "comment-alt-share", @@ -203,7 +203,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto navTree = append(navTree, &dtos.NavLink{ Text: "Alerting", - SubTitle: "Alert rules & notifications", + SubTitle: "Alert rules and notifications", Id: "alerting", Icon: "bell", Url: hs.Cfg.AppSubURL + "/alerting/list", @@ -222,7 +222,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto if c.OrgRole == models.ROLE_ADMIN { configNodes = append(configNodes, &dtos.NavLink{ - Text: "Data Sources", + Text: "Data sources", Icon: "database", Description: "Add and configure data sources", Id: "datasources", @@ -264,7 +264,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto Url: hs.Cfg.AppSubURL + "/org", }) configNodes = append(configNodes, &dtos.NavLink{ - Text: "API Keys", + Text: "API keys", Id: "apikeys", Description: "Create & manage API keys", Icon: "key-skeleton-alt", @@ -300,7 +300,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto navTree = append(navTree, &dtos.NavLink{ Text: "Server Admin", - SubTitle: "Manage all users & orgs", + SubTitle: "Manage all users and orgs", HideFromTabs: true, Id: "admin", Icon: "shield", diff --git a/public/app/features/expressions/ExpressionQueryEditor.tsx b/public/app/features/expressions/ExpressionQueryEditor.tsx index 3111935c3f2..fead89d1d4b 100644 --- a/public/app/features/expressions/ExpressionQueryEditor.tsx +++ b/public/app/features/expressions/ExpressionQueryEditor.tsx @@ -41,7 +41,7 @@ const upsamplingTypes: Array> = [ ]; const mathPlaceholder = - 'Math operations on one more queries, you reference the query by ${refId} ie. $A, $B, $C etc\n' + + 'Math operations on one more queries, you reference the query by ${refId}, such as $A, $B, $C etc\n' + 'Example: $A + $B\n' + 'Available functions: abs(), log(), nan(), inf(), null()'; diff --git a/public/app/features/folders/components/NewDashboardsFolder.tsx b/public/app/features/folders/components/NewDashboardsFolder.tsx index c8cc39787a3..7130dec1a2b 100644 --- a/public/app/features/folders/components/NewDashboardsFolder.tsx +++ b/public/app/features/folders/components/NewDashboardsFolder.tsx @@ -46,7 +46,7 @@ export class NewDashboardsFolder extends PureComponent { return ( -

New Dashboard Folder

+

New dashboard folder

{({ register, errors }) => ( <>