Deprecation notice for {{user}} and {{system}}

docs/source/datastore.rst

@@ -111,9 +111,8 @@ or simply:
 
 This variable won't clash with the user variables under same name. Also, you can refer
 to user variables in actions or workflows. The jinja syntax to do so is
-``{{st2kv.user.date_cmd}}``. Until v2.1, this expression used to be ``{{user.date_cmd}}``. For
-backward compatibility, the older expression is still supported but will be deprecated in subsequent
-releases.
+``{{st2kv.user.date_cmd}}``. Until v2.1, this expression used to be ``{{user.date_cmd}}``
+but is now deprecated.
 
 Note that the notion of ``st2kv.user`` is available only when actions
 or workflows are run manually. The notion of ``st2kv.user`` is non-existent when automations

docs/source/reference/jinja.rst

@@ -13,10 +13,9 @@ For brevity, the jinja patterns are only documented. Usage of these patterns ins
 Accessing datastore items with Jinja
 ------------------------------------
 
-You can use ``{{st2kv.system.foo}}`` to access key ``foo`` from datastore. Note that until v2.1,
-the expression to access key ``foo`` from datastore used to be ``{{system.foo}}``.
-Though the older jinja expression is still supported, we'd be deprecating that usage
-in subsequent releases.
+You can use ``{{st2kv.system.foo}}`` to access key ``foo`` from datastore. Note that until
+v2.1, the expression to access key ``foo`` from datastore used to be ``{{system.foo}}``
+but is now deprecated.
 
 .. _applying-filters-with-jinja:
 

docs/source/upgrade_notes.rst

@@ -34,6 +34,11 @@ Upgrade Notes
   executions_v2, either use psql or install an older version of the python-mistralclient in a
   separate python virtual environment.
 
+* Jinja notations ``{{user.key}}`` and ``{{system.key}}`` to access datastore items under
+  ``user`` and ``system`` scopes are now deprecated. Please use ``{{st2kv.user.key}}`` and
+  ``{{st2kv.system.key}}`` notations instead.
+
+
 |st2| v2.1
 ----------