From 46257dae98b5d664794b1f835f79172fad1724d4 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 12 Dec 2019 06:28:44 +1100
Subject: [PATCH] Change language as suggested by Tim to denote the actual
 change that happened in 5.21

Co-Authored-By: Tim Otten <totten@civicrm.org>
---
 docs/framework/setting.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/framework/setting.md b/docs/framework/setting.md
index 1ba94d84..3b50f388 100644
--- a/docs/framework/setting.md
+++ b/docs/framework/setting.md
@@ -27,7 +27,7 @@ The "Settings" system developed incrementally:
 - v4.7 – Added `Civi::settings()` and refactored init system. Finished migrating data from `civicrm_domain` to `civicrm_setting`.
 - v5.7 - Added `Civi::contactSettings()` as a facade to allow for managing of Contact Settings rather than domain level settings.
 - v5.8 - Added Generic CiviCRM settings form.
-- v5.21 - Deprecated the usage of `CRM_Contact_BAO_Setting::setItem` in favour of the `Civi::settings` and `Civi::contactSettings` functionality and the Setting API to set settings
+- v5.21 - `CRM_Contact_BAO_Setting::setItem()` will now emit deprecation warnings. Use `Civi::settings()`, `Civi::contactSettings()`, or the Setting API instead.
 
 ## Settings Definition
 
@@ -221,4 +221,3 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting {
   );
 }
 ```
-
-- 
GitLab