diff --git a/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md b/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md
index ea92d1abaf81..83235e4b21d0 100644
--- a/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md
+++ b/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md
@@ -2,12 +2,9 @@
 
 ## 1.2.0 (2021-07-06)
 ### Features Added
-
-### Breaking Changes
-
-### Key Bugs Fixed
-
-### Fixed
+* Adds `FeatureFlagConfigurationSetting` and `SecretReferenceConfigurationSetting` models
+* `AzureAppConfigurationClient` can now be used as a context manager.
+* Adds `update_sync_token` to update sync tokens from Event Grid notifications.
 
 ## 1.2.0b2 (2021-06-08)
 
diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py
index d31fd0c0faf7..1e393128a3b9 100644
--- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py
+++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py
@@ -45,12 +45,12 @@
 
 
 class AzureAppConfigurationClient:
-    """Represents an client that calls restful API of Azure App Configuration service.
+    # pylint:disable=line-too-long
+    """Represents a client that calls restful API of Azure App Configuration service.
 
     :param str base_url: base url of the service
     :param credential: An object which can provide secrets for the app configuration service
-    :type credential: :class:`~azure.appconfiguration.AppConfigConnectionStringCredential`
-        or :class:`~azure.core.credentials.TokenCredential`
+    :type credential: :class:`~azure.appconfiguration.AppConfigConnectionStringCredential` or :class:`~azure.core.credentials.TokenCredential`
 
     """
 
@@ -223,7 +223,7 @@ def get_configuration_setting(
 
         :param key: key of the ConfigurationSetting
         :type key: str
-        :param label: label of the ConfigurationSetting
+        :param label: label used to identify the ConfigurationSetting. Default is `None`.
         :type label: str
         :param etag: check if the ConfigurationSetting is changed. Set None to skip checking etag
         :type etag: str or None
@@ -390,7 +390,7 @@ def delete_configuration_setting(self, key, label=None, **kwargs):
 
         :param key: key used to identify the ConfigurationSetting
         :type key: str
-        :param label: label used to identify the ConfigurationSetting
+        :param label: label used to identify the ConfigurationSetting. Default is `None`.
         :type label: str
         :keyword str etag: check if the ConfigurationSetting is changed. Set None to skip checking etag
         :keyword match_condition: The match condition to use upon the etag
diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py
index b2ee7f98dd24..7172e7d213f9 100644
--- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py
+++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py
@@ -46,12 +46,12 @@
 
 
 class AzureAppConfigurationClient:
-    """Represents an client that calls restful API of Azure App Configuration service.
+    # pylint:disable=line-too-long
+    """Represents a client that calls restful API of Azure App Configuration service.
 
         :param str base_url: base url of the service
         :param credential: An object which can provide secrets for the app configuration service
-        :type credential: :class:`azure.appconfiguration.AppConfigConnectionStringCredential` or
-            :class:`~azure.core.credentials_async.AsyncTokenCredential`
+        :type credential: :class:`azure.appconfiguration.AppConfigConnectionStringCredential` or :class:`~azure.core.credentials_async.AsyncTokenCredential`
 
     This is the async version of :class:`azure.appconfiguration.AzureAppConfigurationClient`
 
@@ -240,7 +240,7 @@ async def get_configuration_setting(
 
         :param key: key of the ConfigurationSetting
         :type key: str
-        :param label: label of the ConfigurationSetting
+        :param label: label used to identify the ConfigurationSetting. Default is `None`.
         :type label: str
         :param etag: check if the ConfigurationSetting is changed. Set None to skip checking etag
         :type etag: str or None
@@ -420,7 +420,7 @@ async def delete_configuration_setting(
 
         :param key: key used to identify the ConfigurationSetting
         :type key: str
-        :param label: label used to identify the ConfigurationSetting
+        :param label: label used to identify the ConfigurationSetting. Default is `None`.
         :type label: str
         :keyword str etag: check if the ConfigurationSetting is changed. Set None to skip checking etag
         :keyword match_condition: The match condition to use upon the etag