From bbcc5bdd9306462a65d20eb05bf3e92efe0084e3 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 23 Feb 2023 19:35:38 +0100
Subject: [PATCH] [v9.3.x] Docs: Disambiguate auto_assign_org_role
 configuration option descriptions (#63680)

Docs: Disambiguate auto_assign_org_role configuration option descriptions (#61827)

(cherry picked from commit 5687d23b52b8bd40dc5c076513cf0bdad8628c9b)

Co-authored-by: zsrv <95176387+zsrv@users.noreply.github.com>
---
 conf/sample.ini                                        | 2 +-
 docs/sources/setup-grafana/configure-grafana/_index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/sample.ini b/conf/sample.ini
index a32f9aab1db..710656bd5c9 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -388,7 +388,7 @@
 # Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
 ;auto_assign_org_id = 1
 
-# Default role new users will be automatically assigned (if disabled above is set to true)
+# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
 ;auto_assign_org_role = Viewer
 
 # Require email validation before sign up completes
diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md
index ccf8efc6336..87b49daaf90 100644
--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -725,7 +725,7 @@ that this organization already exists. Default is 1.
 ### auto_assign_org_role
 
 The role new users will be assigned for the main organization (if the
-above setting is set to true). Defaults to `Viewer`, other valid
+`auto_assign_org` setting is set to true). Defaults to `Viewer`, other valid
 options are `Admin` and `Editor`. e.g.:
 
 `auto_assign_org_role = Viewer`