diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md index a201659a47c..3538074f735 100755 --- a/docs/sources/installation/upgrading.md +++ b/docs/sources/installation/upgrading.md @@ -145,7 +145,7 @@ Read more [here]({{< relref "configuration/#disable-sanitize-html" >}}) about th ### Authentication and security -If your using Grafana's builtin, LDAP (without Auth Proxy) or OAuth authentication all users will be required to login upon the next visit after the upgrade. +If you are using Grafana's builtin, LDAP (without Auth Proxy) or OAuth authentication all users will be required to login upon the next visit after the upgrade. If you have `cookie_secure` set to `true` in the `session` section you probably want to change the `cookie_secure` to `true` in the `security` section as well. Ending up with a configuration like this: diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx index 8efc500745d..0e204ff01df 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx @@ -141,8 +141,8 @@ export class TransformationsEditor extends React.PureComponent {

Transformations allow you to join, calculate, re-order, hide and rename your query results before being visualized.
- Many transforms are not suitable if your using the Graph visualization as it currently only supports time - series.
+ Many transforms are not suitable if you're using the Graph visualization as it currently only supports + time series.
It can help to switch to Table visualization to understand what a transformation is doing.

Select one of the transformations below to start.